Qt: includes barrier fix.

diff --git a/modules/gui/qt4/actions_manager.hpp b/modules/gui/qt4/actions_manager.hpp
index 463edc5fa4c010df620d80a1c27687b50000b614..97870b3c979c20887b3d07b96ccb13ac5b90bfee 100644 (file)
--- a/modules/gui/qt4/actions_manager.hpp
+++ b/modules/gui/qt4/actions_manager.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _ACTIONS_MANAGER_H_
-#define _ACTIONS_MANAGER_H_
+#ifndef QVLC_ACTIONS_MANAGER_H_
+#define QVLC_ACTIONS_MANAGER_H_ 1
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

diff --git a/modules/gui/qt4/dialogs/bookmarks.hpp b/modules/gui/qt4/dialogs/bookmarks.hpp
index cbe2426cb1209ff9af8b31683d5888a69620330a..eb85f7ea8c1dceac91500f43a27312fffe26cf59 100644 (file)
--- a/modules/gui/qt4/dialogs/bookmarks.hpp
+++ b/modules/gui/qt4/dialogs/bookmarks.hpp
@@ -22,8 +22,8 @@
  *****************************************************************************/
 
 
-#ifndef _BOOKMARKS_H_
-#define _BOOKMARKS_H
+#ifndef QVLC_BOOKMARKS_H_
+#define QVLC_BOOKMARKS_H_ 1
 
 #include "util/qvlcframe.hpp"
 #include <QStandardItemModel>

diff --git a/modules/gui/qt4/dialogs/convert.hpp b/modules/gui/qt4/dialogs/convert.hpp
index a0ba1dc232d61bfbbb42a5674e22a750db8d4305..f0854d0fccf030c9d6b0eb0e4a44b466e88b4d62 100644 (file)
--- a/modules/gui/qt4/dialogs/convert.hpp
+++ b/modules/gui/qt4/dialogs/convert.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _CONVERT_DIALOG_H_
-#define _CONVERT_DIALOG_H_
+#ifndef QVLC_CONVERT_DIALOG_H_
+#define QVLC_CONVERT_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 

diff --git a/modules/gui/qt4/dialogs/errors.hpp b/modules/gui/qt4/dialogs/errors.hpp
index 002cc3d64ec7ad1375bb68229f8a6e8296962070..559094e7a0da6d5564cea625c8bc0a423bcfc023 100644 (file)
--- a/modules/gui/qt4/dialogs/errors.hpp
+++ b/modules/gui/qt4/dialogs/errors.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _ERRORS_DIALOG_H_
-#define _ERRORS_DIALOG_H_
+#ifndef QVLC_ERRORS_DIALOG_H_
+#define QVLC_ERRORS_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 

diff --git a/modules/gui/qt4/dialogs/extended.hpp b/modules/gui/qt4/dialogs/extended.hpp
index f884214034f66332dddeb2cd120a349b6fa2b7de..93a23fffbf26279507e82fb6d7d0f44a7ee65e46 100644 (file)
--- a/modules/gui/qt4/dialogs/extended.hpp
+++ b/modules/gui/qt4/dialogs/extended.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _EXTENDED_DIALOG_H_
-#define _EXTENDED_DIALOG_H_
+#ifndef QVLC_EXTENDED_DIALOG_H_
+#define QVLC_EXTENDED_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 

diff --git a/modules/gui/qt4/dialogs/external.hpp b/modules/gui/qt4/dialogs/external.hpp
index 513ead7f7fd5536b3ab74ddd9f0e43978aff337d..d2894ef883f0981a89f1596763fd570da6b65fe1 100644 (file)
--- a/modules/gui/qt4/dialogs/external.hpp
+++ b/modules/gui/qt4/dialogs/external.hpp
@@ -18,8 +18,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef VLC_QT4_DIALOGS_EXTERNAL_H_
-# define VLC_QT4_DIALOGS_EXTERNAL_H 1
+#ifndef QVLC_DIALOGS_EXTERNAL_H_
+#define QVLC_DIALOGS_EXTERNAL_H_ 1
 
 #include <QObject>
 #include <vlc_common.h>

diff --git a/modules/gui/qt4/dialogs/gototime.hpp b/modules/gui/qt4/dialogs/gototime.hpp
index da94bae18f625ed3ce8268169192a4c7b3b546c9..54698f6e268ff622645335a96e0769e6783a28ec 100644 (file)
--- a/modules/gui/qt4/dialogs/gototime.hpp
+++ b/modules/gui/qt4/dialogs/gototime.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _GOTOTIME_DIALOG_H_
-#define _GOTOTIME_DIALOG_H_
+#ifndef QVLC_GOTOTIME_DIALOG_H_
+#define QVLC_GOTOTIME_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 

diff --git a/modules/gui/qt4/dialogs/help.hpp b/modules/gui/qt4/dialogs/help.hpp
index cc6963d593d8699495518cc2eb2d5801067cb2b3..af4ea4fd9e82d7c41e860e841a832f02442d07a0 100644 (file)
--- a/modules/gui/qt4/dialogs/help.hpp
+++ b/modules/gui/qt4/dialogs/help.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _HELP_DIALOG_H_
-#define _HELP_DIALOG_H_
+#ifndef QVLC_HELP_DIALOG_H_
+#define QVLC_HELP_DIALOG_H_ 1
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"

diff --git a/modules/gui/qt4/dialogs/mediainfo.hpp b/modules/gui/qt4/dialogs/mediainfo.hpp
index bdfdd811178ed94808787b4e8f0feb37fcf0719b..98851d3ac1b0b0122878360d6defa7eea41a8167 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.hpp
+++ b/modules/gui/qt4/dialogs/mediainfo.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ******************************************************************************/
 
-#ifndef _MEDIAINFO_DIALOG_H_
-#define _MEDIAINFO_DIALOG_H_
+#ifndef QVLC_MEDIAINFO_DIALOG_H_
+#define QVLC_MEDIAINFO_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 #include "components/info_panels.hpp"

diff --git a/modules/gui/qt4/dialogs/messages.hpp b/modules/gui/qt4/dialogs/messages.hpp
index e723505a57492bc516ebf7fa20dee7542b0dab9b..3b311dbf5c96fed68e19016412c1fff5a7b16790 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.hpp
+++ b/modules/gui/qt4/dialogs/messages.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _MESSAGES_DIALOG_H_
-#define _MESSAGES_DIALOG_H_
+#ifndef QVLC_MESSAGES_DIALOG_H_
+#define QVLC_MESSAGES_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 

diff --git a/modules/gui/qt4/dialogs/open.hpp b/modules/gui/qt4/dialogs/open.hpp
index b624709960dbec1ed5a56bfc7aa71bed267ab60c..4b791e013b8f2a51264de9ae3cb3e0cdf245a274 100644 (file)
--- a/modules/gui/qt4/dialogs/open.hpp
+++ b/modules/gui/qt4/dialogs/open.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ******************************************************************************/
 
-#ifndef _OPEN_DIALOG_H_
-#define _OPEN_DIALOG_H_
+#ifndef QVLC_OPEN_DIALOG_H_
+#define QVLC_OPEN_DIALOG_H_ 1
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

diff --git a/modules/gui/qt4/dialogs/openurl.hpp b/modules/gui/qt4/dialogs/openurl.hpp
index 0a8dd1b644c60d9f41160929340cdf21d89eefd5..40bda54b46339e3ddc7d0b71d5ab93d6b9f8f5d5 100644 (file)
--- a/modules/gui/qt4/dialogs/openurl.hpp
+++ b/modules/gui/qt4/dialogs/openurl.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ******************************************************************************/
 
-#ifndef _OPEN_URL_H
-#define _OPEN_URL_H_
+#ifndef QVLC_OPEN_URL_H_
+#define QVLC_OPEN_URL_H_ 1
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

diff --git a/modules/gui/qt4/dialogs/playlist.hpp b/modules/gui/qt4/dialogs/playlist.hpp
index 3516c051f25e1ed977e15ea61c20d4fa8ecfa092..1aabccfca1e4c61b6d38a08186c690be0b9afd28 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.hpp
+++ b/modules/gui/qt4/dialogs/playlist.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PLAYLIST_DIALOG_H_
-#define _PLAYLIST_DIALOG_H_
+#ifndef QVLC_PLAYLIST_DIALOG_H_
+#define QVLC_PLAYLIST_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 #include "../components/playlist/playlist.hpp"

diff --git a/modules/gui/qt4/dialogs/plugins.hpp b/modules/gui/qt4/dialogs/plugins.hpp
index f5371a2ad6207d64b2fe387d7f089c3432e4602d..f862703fae37006e51aad387d7c292d47b3dfcfe 100644 (file)
--- a/modules/gui/qt4/dialogs/plugins.hpp
+++ b/modules/gui/qt4/dialogs/plugins.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PLUGIN_DIALOG_H_
-#define _PLUGIN_DIALOG_H_
+#ifndef QVLC_PLUGIN_DIALOG_H_
+#define QVLC_PLUGIN_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 

diff --git a/modules/gui/qt4/dialogs/podcast_configuration.hpp b/modules/gui/qt4/dialogs/podcast_configuration.hpp
index f119ed69b15cd620ef09e3247b338ee8598092e4..2779c564ea97b052fdc4806ad7a579b635de9fe6 100644 (file)
--- a/modules/gui/qt4/dialogs/podcast_configuration.hpp
+++ b/modules/gui/qt4/dialogs/podcast_configuration.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PODCAST_CONFIGURATION_DIALOG_H_
-#define _PODCAST_CONFIGURATION_DIALOG_H_
+#ifndef QVLC_PODCAST_CONFIGURATION_DIALOG_H_
+#define QVLC_PODCAST_CONFIGURATION_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 #include "ui/podcast_configuration.h"

diff --git a/modules/gui/qt4/dialogs/preferences.hpp b/modules/gui/qt4/dialogs/preferences.hpp
index 5c2227908ea1b00524d4c5c4387137e20e7d55ce..bcd1f49ef4c1b6d5291519d45a4bb6b71bee39b4 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.hpp
+++ b/modules/gui/qt4/dialogs/preferences.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _PREFS_DIALOG_H_
-#define _PREFS_DIALOG_H_
+#ifndef QVLC_PREFS_DIALOG_H_
+#define QVLC_PREFS_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 #include "components/simple_preferences.hpp"

diff --git a/modules/gui/qt4/dialogs/sout.hpp b/modules/gui/qt4/dialogs/sout.hpp
index ded42303fab2913577c0675594a3f87ea2af1077..1aade2983e904ddffa910f84ea1464b667f2f3bd 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.hpp
+++ b/modules/gui/qt4/dialogs/sout.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _SOUT_DIALOG_H_
-#define _SOUT_DIALOG_H_
+#ifndef QVLC_SOUT_DIALOG_H_
+#define QVLC_SOUT_DIALOG_H_ 1
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

diff --git a/modules/gui/qt4/dialogs/toolbar.hpp b/modules/gui/qt4/dialogs/toolbar.hpp
index ab853b7669d9d7a2ffea912cb09709c48287eb01..d0d13d91f5d77c6ea39b386f6e419c450729912e 100644 (file)
--- a/modules/gui/qt4/dialogs/toolbar.hpp
+++ b/modules/gui/qt4/dialogs/toolbar.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _TOOLBAREDIT_DIALOG_H_
-#define _TOOLBAREDIT_DIALOG_H_
+#ifndef QVLC_TOOLBAREDIT_DIALOG_H_
+#define QVLC_TOOLBAREDIT_DIALOG_H_ 1
 
 #include "util/qvlcframe.hpp"
 #include "components/controller.hpp"

diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
index 43c96b3ee7b433b38af0a072319dce2469c86fe5..3a13b7ac88b3e277c58435f76c7949b619e58a38 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.hpp
+++ b/modules/gui/qt4/dialogs/vlm.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _VLM_DIALOG_H_
-#define _VLM_DIALOG_H_
+#ifndef QVLC_VLM_DIALOG_H_
+#define QVLC_VLM_DIALOG_H_ 1
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp
index 961d2d758aadef7b9a93acee07bc6332d6d7ea35..0f81dab7a84a4dff84c703650dbc3858666308af 100644 (file)
--- a/modules/gui/qt4/input_manager.hpp
+++ b/modules/gui/qt4/input_manager.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _INPUT_MANAGER_H_
-#define _INPUT_MANAGER_H_
+#ifndef QVLC_INPUT_MANAGER_H_
+#define QVLC_INPUT_MANAGER_H_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

diff --git a/modules/gui/qt4/main_interface.hpp b/modules/gui/qt4/main_interface.hpp
index ff96d353e336336ee82feacc75342413120c4aa2..48aed59e481819c3a408128f288cf1adc7e170ce 100644 (file)
--- a/modules/gui/qt4/main_interface.hpp
+++ b/modules/gui/qt4/main_interface.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _MAIN_INTERFACE_H_
-#define _MAIN_INTERFACE_H_
+#ifndef QVLC_MAIN_INTERFACE_H_
+#define QVLC_MAIN_INTERFACE_H_
 
 #include "qt4.hpp"
 

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 3ab5ae08b6f4c1eb90bca472fb33c50cd9a212f6..253c84ee52dc04e8c8b1d467f8c5f91d755ca693 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _MENUS_H_
-#define _MENUS_H_
+#ifndef QVLC_MENUS_H_
+#define QVLC_MENUS_H_
 
 #include "qt4.hpp"
 

diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp
index bfd84166481191513454e20573431b13c09f0908..62a26c5dfddb360775539feccb79fd0dec0eba64 100644 (file)
--- a/modules/gui/qt4/qt4.hpp
+++ b/modules/gui/qt4/qt4.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _QVLC_H_
-#define _QVLC_H_
+#ifndef QVLC_H_
+#define QVLC_H_
 
 #ifdef HAVE_CONFIG_H
 # include "config.h"

diff --git a/modules/gui/qt4/recents.hpp b/modules/gui/qt4/recents.hpp
index 3a394f652e0648e5f02bbff776d60f9a792de70d..d85051948e5e9139af2148cad3ab8a01837efd39 100644 (file)
--- a/modules/gui/qt4/recents.hpp
+++ b/modules/gui/qt4/recents.hpp
@@ -21,8 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _RECENTS_H_
-#define _RECENTS_H_
+#ifndef QVLC_RECENTS_H_
+#define QVLC_RECENTS_H_
 
 #include "qt4.hpp"