From: Jean-Baptiste Kempf Date: Sun, 15 Mar 2009 01:00:54 +0000 (+0100) Subject: Qt: includes barrier fix. X-Git-Tag: 1.0.0-pre1~96 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b42755d7fd2a64ad8c9d4c881388685abee9c463;p=vlc Qt: includes barrier fix. --- diff --git a/modules/gui/qt4/actions_manager.hpp b/modules/gui/qt4/actions_manager.hpp index 463edc5fa4..97870b3c97 100644 --- 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 cbe2426cb1..eb85f7ea8c 100644 --- 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 diff --git a/modules/gui/qt4/dialogs/convert.hpp b/modules/gui/qt4/dialogs/convert.hpp index a0ba1dc232..f0854d0fcc 100644 --- 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 002cc3d64e..559094e7a0 100644 --- 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 f884214034..93a23fffbf 100644 --- 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 513ead7f7f..d2894ef883 100644 --- 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 #include diff --git a/modules/gui/qt4/dialogs/gototime.hpp b/modules/gui/qt4/dialogs/gototime.hpp index da94bae18f..54698f6e26 100644 --- 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 cc6963d593..af4ea4fd9e 100644 --- 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 bdfdd81117..98851d3ac1 100644 --- 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 e723505a57..3b311dbf5c 100644 --- 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 b624709960..4b791e013b 100644 --- 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 0a8dd1b644..40bda54b46 100644 --- 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 3516c051f2..1aabccfca1 100644 --- 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 f5371a2ad6..f862703fae 100644 --- 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 f119ed69b1..2779c564ea 100644 --- 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 5c2227908e..bcd1f49ef4 100644 --- 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 ded42303fa..1aade2983e 100644 --- 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 ab853b7669..d0d13d91f5 100644 --- 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 43c96b3ee7..3a13b7ac88 100644 --- 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 961d2d758a..0f81dab7a8 100644 --- 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 ff96d353e3..48aed59e48 100644 --- 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 3ab5ae08b6..253c84ee52 100644 --- 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 bfd8416648..62a26c5dfd 100644 --- 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 3a394f652e..d85051948e 100644 --- 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"