Qt4 - fix [24261]

diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
index 6aa2aa575c19febeb4f2a8d8b4dd6ca760c9ca4b..10e906d90b4f0a08c8b8bd7093aa54deb9f52227 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.cpp
+++ b/modules/gui/qt4/dialogs/vlm.cpp
@@ -23,9 +23,9 @@
  * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifdef ENABLE_VLM
-
 #include "dialogs/vlm.hpp"
+
+#ifdef ENABLE_VLM
 #include "dialogs/open.hpp"
 #include "dialogs/sout.hpp"
 
@@ -626,5 +626,4 @@ void VLMWrapper::EditVod( const QString name, const QString input,
         vlm_MessageDelete( message );
     }
 }
-
 #endif

diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp
index 4aed2f9783c39587693fb38c15357e08298fbb77..73e3defc00dd35642671e163a4fce0a03b624ce2 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.hpp
+++ b/modules/gui/qt4/dialogs/vlm.hpp
@@ -25,9 +25,9 @@
 #ifndef _VLM_DIALOG_H_
 #define _VLM_DIALOG_H_
 
-#ifdef ENABLE_VLM
-
 #include <vlc/vlc.h>
+
+#ifdef ENABLE_VLM
 #include <vlc_vlm.h>
 
 #include "ui/vlm.h"
@@ -199,5 +199,7 @@ private:
 
 };
 
-#endif /* ENABLE_VLM*/
 #endif
+
+#endif
+

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index 59a7fab3c866654e3b8cd43775bf9d172b8fd0b0..130a6d61a874f786c2ad7c088b0f0574d462ebfc 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -41,12 +41,12 @@
 #include "dialogs/mediainfo.hpp"
 #include "dialogs/messages.hpp"
 #include "dialogs/extended.hpp"
+#include "dialogs/vlm.hpp"
 #include "dialogs/sout.hpp"
 #include "dialogs/open.hpp"
 #include "dialogs/help.hpp"
 #include "dialogs/gototime.hpp"
 #include "dialogs/podcast_configuration.hpp"
-#include "dialogs/vlm.hpp"
 
 DialogsProvider* DialogsProvider::instance = NULL;