[vlc-devel] [PATCH 13/28] modules/gui/qt4/components: fixed include-guards

Filip Roséen filip at atch.se
Sat Feb 20 23:20:18 CET 2016


  * renamed include-guards to fix issues with reserved identifiers
---
 modules/gui/qt4/components/complete_preferences.hpp | 4 ++--
 modules/gui/qt4/components/controller_widget.hpp    | 4 ++--
 modules/gui/qt4/components/extended_panels.hpp      | 4 ++--
 modules/gui/qt4/components/info_panels.hpp          | 4 ++--
 modules/gui/qt4/components/interface_widgets.hpp    | 4 ++--
 modules/gui/qt4/components/open_panels.hpp          | 4 ++--
 modules/gui/qt4/components/preferences_widgets.hpp  | 4 ++--
 modules/gui/qt4/components/simple_preferences.hpp   | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/gui/qt4/components/complete_preferences.hpp b/modules/gui/qt4/components/complete_preferences.hpp
index be25c67..0738b38 100644
--- a/modules/gui/qt4/components/complete_preferences.hpp
+++ b/modules/gui/qt4/components/complete_preferences.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PREFSTREE_H_
-#define _PREFSTREE_H_
+#ifndef GUI__QT4__COMPONENTS__COMPLETE_PREFERENCES_HPP
+#define GUI__QT4__COMPONENTS__COMPLETE_PREFERENCES_HPP
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/controller_widget.hpp b/modules/gui/qt4/components/controller_widget.hpp
index 711f633..a1e8559 100644
--- a/modules/gui/qt4/components/controller_widget.hpp
+++ b/modules/gui/qt4/components/controller_widget.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _CONTROLLER_WIDGET_H_
-#define _CONTROLLER_WIDGET_H_
+#ifndef GUI__QT4__COMPONENTS__CONTROLLER_WIDGET_HPP_
+#define GUI__QT4__COMPONENTS__CONTROLLER_WIDGET_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/extended_panels.hpp b/modules/gui/qt4/components/extended_panels.hpp
index 006d602..57d24a2 100644
--- a/modules/gui/qt4/components/extended_panels.hpp
+++ b/modules/gui/qt4/components/extended_panels.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _EQUALIZER_H_
-#define _EQUALIZER_H_
+#ifndef GUI__QT4__COMPONTENTS__EXENTED_PANELS_HPP_
+#define GUI__QT4__COMPONTENTS__EXENTED_PANELS_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/info_panels.hpp b/modules/gui/qt4/components/info_panels.hpp
index e2b7ac0..7784074 100644
--- a/modules/gui/qt4/components/info_panels.hpp
+++ b/modules/gui/qt4/components/info_panels.hpp
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _INFOPANELS_H_
-#define _INFOPANELS_H_
+#ifndef GUI__QT4__COMPONENTS__INFO_PANELS_HPP_
+#define GUI__QT4__COMPONENTS__INFO_PANELS_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/interface_widgets.hpp b/modules/gui/qt4/components/interface_widgets.hpp
index c1a8e3c..73304d1 100644
--- a/modules/gui/qt4/components/interface_widgets.hpp
+++ b/modules/gui/qt4/components/interface_widgets.hpp
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _INTFWIDGETS_H_
-#define _INTFWIDGETS_H_
+#ifndef GUI__QT4__COMPONTENTS__INTERFACE_WIDGETS_HPP_
+#define GUI__QT4__COMPONTENTS__INTERFACE_WIDGETS_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp
index 015c142..d52cf0e 100644
--- a/modules/gui/qt4/components/open_panels.hpp
+++ b/modules/gui/qt4/components/open_panels.hpp
@@ -25,8 +25,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _OPENPANELS_H_
-#define _OPENPANELS_H_
+#ifndef GUI__QT4__COMPONENTS__OPEN_PANELS_HPP_
+#define GUI__QT4__COMPONENTS__OPEN_PANELS_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/preferences_widgets.hpp b/modules/gui/qt4/components/preferences_widgets.hpp
index ce671bb..8c725e4 100644
--- a/modules/gui/qt4/components/preferences_widgets.hpp
+++ b/modules/gui/qt4/components/preferences_widgets.hpp
@@ -23,8 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PREFERENCESWIDGETS_H_
-#define _PREFERENCESWIDGETS_H_
+#ifndef GUI__QT4__COMPONENTS__PREFERENCES_WIDGETS_HPP_
+#define GUI__QT4__COMPONENTS__PREFERENCES_WIDGETS_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 8b14323..fd9bbf8 100644
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _SIMPLEPREFS_H_
-#define _SIMPLEPREFS_H_
+#ifndef GUI__QT4__COMPONENTS__SIMPLE_PREFERENCES_HPP_
+#define GUI__QT4__COMPONENTS__SIMPLE_PREFERENCES_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
-- 
2.7.1



More information about the vlc-devel mailing list