[vlc-commits] Qt: fixed include-guards for components

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Mon Feb 22 01:12:54 2016 +0100| [d0c1938231a0bf9c772f49c700a280f78d6a60ca] | committer: Jean-Baptiste Kempf

Qt: fixed include-guards for components

  * renamed include-guards to fix issues with reserved identifiers

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d0c1938231a0bf9c772f49c700a280f78d6a60ca
---

 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..5c3bfa7 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 VLC_QT_COMPLETE_PREFERENCES_HPP_
+#define VLC_QT_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..d16e943 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 VLC_QT_CONTROLLER_WIDGET_HPP_
+#define VLC_QT_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..0c70d0e 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 VLC_QT_EXTENDED_PANELS_HPP_
+#define VLC_QT_EXTENDED_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..e5de65c 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 VLC_QT_INFO_PANELS_HPP_
+#define VLC_QT_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..38b761c 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 VLC_QT_INTERFACE_WIDGETS_HPP_
+#define VLC_QT_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..d124a25 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 VLC_QT_OPEN_PANELS_HPP_
+#define VLC_QT_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..4cb7627 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 VLC_QT_PREFERENCES_WIDGETS_HPP_
+#define VLC_QT_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..6390b21 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 VLC_QT_SIMPLE_PREFERENCES_HPP_
+#define VLC_QT_SIMPLE_PREFERENCES_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"