[vlc-devel] [PATCH 10/28] modules/gui/qt4/util: fixed include-guards

[Filip Roséen]

  * renamed include-guards to fix issues with reserved identifiers
  * replaced comments at `#endif` corresponding to include-guards
---
 modules/gui/qt4/util/customwidgets.hpp  | 4 ++--
 modules/gui/qt4/util/input_slider.hpp   | 4 ++--
 modules/gui/qt4/util/qmenuview.hpp      | 4 ++--
 modules/gui/qt4/util/qt_dirs.hpp        | 4 ++--
 modules/gui/qt4/util/qvlcapp.hpp        | 4 ++--
 modules/gui/qt4/util/qvlcframe.hpp      | 4 ++--
 modules/gui/qt4/util/searchlineedit.hpp | 4 ++--
 modules/gui/qt4/util/singleton.hpp      | 6 +++---
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/modules/gui/qt4/util/customwidgets.hpp b/modules/gui/qt4/util/customwidgets.hpp
index 5893704..c6c7a7a 100644
--- a/modules/gui/qt4/util/customwidgets.hpp
+++ b/modules/gui/qt4/util/customwidgets.hpp
@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _CUSTOMWIDGETS_H_
-#define _CUSTOMWIDGETS_H_
+#ifndef GUI__QT4__UTIL__CUSTOMWIDGETS_HPP_
+#define GUI__QT4__UTIL__CUSTOMWIDGETS_HPP_
 
 #include <QLineEdit>
 #include <QPushButton>
diff --git a/modules/gui/qt4/util/input_slider.hpp b/modules/gui/qt4/util/input_slider.hpp
index 50d8586..a7ec030 100644
--- a/modules/gui/qt4/util/input_slider.hpp
+++ b/modules/gui/qt4/util/input_slider.hpp
@@ -23,8 +23,8 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _INPUTSLIDER_H_
-#define _INPUTSLIDER_H_
+#ifndef GUI__QT4__UTIL__INPUT_SLIDER_H_
+#define GUI__QT4__UTIL__INPUT_SLIDER_H_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/util/qmenuview.hpp b/modules/gui/qt4/util/qmenuview.hpp
index 76330cc..a88d4b8 100644
--- a/modules/gui/qt4/util/qmenuview.hpp
+++ b/modules/gui/qt4/util/qmenuview.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _QMENU_VIEW_H_
-#define _QMENU_VIEW_H_
+#ifndef GUI__QT4__UTIL__QMENUVIEW_HPP_
+#define GUI__QT4__UTIL__QMENUVIEW_HPP_
 
 #include <QMenu>
 #include <QAbstractItemModel>
diff --git a/modules/gui/qt4/util/qt_dirs.hpp b/modules/gui/qt4/util/qt_dirs.hpp
index 82da4bf..b1b9982 100644
--- a/modules/gui/qt4/util/qt_dirs.hpp
+++ b/modules/gui/qt4/util/qt_dirs.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _QT_DIR_H_
-#define _QT_DIR_H_
+#ifndef GUI__QT4__UTIL__QT_DIR_HPP_
+#define GUI__QT4__UTIL__QT_DIR_HPP_
 
 #include <QString>
 #include <QDir>
diff --git a/modules/gui/qt4/util/qvlcapp.hpp b/modules/gui/qt4/util/qvlcapp.hpp
index 652b700..f22fb82 100644
--- a/modules/gui/qt4/util/qvlcapp.hpp
+++ b/modules/gui/qt4/util/qvlcapp.hpp
@@ -22,8 +22,8 @@
  *****************************************************************************/
 
 
-#ifndef _QVLC_APP_H_
-#define _QVLC_APP_H_
+#ifndef QUI_QT4__UTIL__QVLCAPP_HPP_
+#define QUI_QT4__UTIL__QVLCAPP_HPP_
 
 #include <QApplication>
 #include <QEvent>
diff --git a/modules/gui/qt4/util/qvlcframe.hpp b/modules/gui/qt4/util/qvlcframe.hpp
index 13b21fb..b6c0802 100644
--- a/modules/gui/qt4/util/qvlcframe.hpp
+++ b/modules/gui/qt4/util/qvlcframe.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _QVLCFRAME_H_
-#define _QVLCFRAME_H_
+#ifndef GUI__QT4__UTIL__QVLCFRAME_HPP_
+#define GUI__QT4__UTIL__QVLCFRAME_HPP_
 
 #include <QWidget>
 #include <QDialog>
diff --git a/modules/gui/qt4/util/searchlineedit.hpp b/modules/gui/qt4/util/searchlineedit.hpp
index 7134fb2..5acfa9b 100644
--- a/modules/gui/qt4/util/searchlineedit.hpp
+++ b/modules/gui/qt4/util/searchlineedit.hpp
@@ -24,8 +24,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _SEARCHLINEEDIT_H_
-#define _SEARCHLINEEDIT_H_
+#ifndef GUI__QT4__UTIL__SEARCHLINEEDIT_HPP_
+#define GUI__QT4__UTIL__SEARCHLINEEDIT_HPP_
 
 #ifdef __APPLE__
 #include "../qt4.hpp"
diff --git a/modules/gui/qt4/util/singleton.hpp b/modules/gui/qt4/util/singleton.hpp
index 1276e2c..28a5563 100644
--- a/modules/gui/qt4/util/singleton.hpp
+++ b/modules/gui/qt4/util/singleton.hpp
@@ -20,8 +20,8 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _SINGLETON_HPP_
-#define _SINGLETON_HPP_
+#ifndef GUI__QT4__UTIL__SINGLETON_HPP_
+#define GUI__QT4__UTIL__SINGLETON_HPP_
 
 #include <stdlib.h>
 #include <vlc_threads.h>
@@ -68,4 +68,4 @@ T*  Singleton<T>::m_instance = NULL;
 template <typename T>
 vlc_mutex_t Singleton<T>::m_mutex = VLC_STATIC_MUTEX;
 
-#endif // _SINGLETON_HPP_
+#endif // include-guard
-- 
2.7.1