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

[Filip Roséen]

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

Qt: fixed include-guards for playlist

  * 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=66c586cebc2258c7bcec8adc0257de95df5d4d9b
---

 modules/gui/qt4/components/playlist/playlist.hpp       |    4 ++--
 modules/gui/qt4/components/playlist/playlist_item.hpp  |    4 ++--
 modules/gui/qt4/components/playlist/playlist_model.hpp |    4 ++--
 modules/gui/qt4/components/playlist/selector.hpp       |    4 ++--
 modules/gui/qt4/components/playlist/sorting.h          |    4 ++--
 modules/gui/qt4/components/playlist/standardpanel.hpp  |    4 ++--
 modules/gui/qt4/components/playlist/views.hpp          |    4 ++--
 modules/gui/qt4/components/playlist/vlc_model.hpp      |    4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist.hpp b/modules/gui/qt4/components/playlist/playlist.hpp
index 7c1af5f..642e538 100644
--- a/modules/gui/qt4/components/playlist/playlist.hpp
+++ b/modules/gui/qt4/components/playlist/playlist.hpp
@@ -23,8 +23,8 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PLAYLISTWIDGET_H_
-#define _PLAYLISTWIDGET_H_
+#ifndef VLC_QT_PLAYLIST_HPP_
+#define VLC_QT_PLAYLIST_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/playlist/playlist_item.hpp b/modules/gui/qt4/components/playlist/playlist_item.hpp
index 1aa7d06..0a40871 100644
--- a/modules/gui/qt4/components/playlist/playlist_item.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PLAYLIST_ITEM_H_
-#define _PLAYLIST_ITEM_H_
+#ifndef VLC_QT_PLAYLIST_ITEM_HPP_
+#define VLC_QT_PLAYLIST_ITEM_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index 96d3e6b..58b4005 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PLAYLIST_MODEL_H_
-#define _PLAYLIST_MODEL_H_
+#ifndef VLC_QT_PLAYLIST_MODEL_HPP
+#define VLC_QT_PLAYLIST_MODEL_HPP
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/playlist/selector.hpp b/modules/gui/qt4/components/playlist/selector.hpp
index 815774f..3dfa24c 100644
--- a/modules/gui/qt4/components/playlist/selector.hpp
+++ b/modules/gui/qt4/components/playlist/selector.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PLSEL_H_
-#define _PLSEL_H_
+#ifndef VLC_QT_SELECTOR_HPP_
+#define VLC_QT_SELECTOR_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/playlist/sorting.h b/modules/gui/qt4/components/playlist/sorting.h
index 37ecd79..13a6905 100644
--- a/modules/gui/qt4/components/playlist/sorting.h
+++ b/modules/gui/qt4/components/playlist/sorting.h
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _SORTING_H_
-#define _SORTING_H_
+#ifndef VLC_QT_SORTING_H_
+#define VLC_QT_SORTING_H_
 
 #include <vlc_media_library.h>
 #include <vlc_input_item.h>
diff --git a/modules/gui/qt4/components/playlist/standardpanel.hpp b/modules/gui/qt4/components/playlist/standardpanel.hpp
index 947da39..d44e9ab 100644
--- a/modules/gui/qt4/components/playlist/standardpanel.hpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PLPANELS_H_
-#define _PLPANELS_H_
+#ifndef VLC_QT_STANDARDPANEL_HPP_
+#define VLC_QT_STANDARDPANEL_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"
diff --git a/modules/gui/qt4/components/playlist/views.hpp b/modules/gui/qt4/components/playlist/views.hpp
index 9a2c91e..efc1066 100644
--- a/modules/gui/qt4/components/playlist/views.hpp
+++ b/modules/gui/qt4/components/playlist/views.hpp
@@ -21,8 +21,8 @@
  * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _ICON_VIEW_H_
-#define _ICON_VIEW_H_
+#ifndef VLC_QT_VIEWS_HPP_
+#define VLC_QT_VIEWS_HPP_
 
 #include <QStyledItemDelegate>
 #include <QListView>
diff --git a/modules/gui/qt4/components/playlist/vlc_model.hpp b/modules/gui/qt4/components/playlist/vlc_model.hpp
index b23b076..2538440 100644
--- a/modules/gui/qt4/components/playlist/vlc_model.hpp
+++ b/modules/gui/qt4/components/playlist/vlc_model.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLC_MODEL_H_
-#define _VLC_MODEL_H_
+#ifndef VLC_QT_VLC_MODEL_HPP_
+#define VLC_QT_VLC_MODEL_HPP_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"