Qt4 - #include cleaning (2)

diff --git a/modules/gui/qt4/dialogs/errors.cpp b/modules/gui/qt4/dialogs/errors.cpp
index 6d1bc8c605b22f59702e6ae0f64ceb264deb3745..fa0a4868f4193713abbe4ee3451eafde2e7de7b4 100644 (file)
--- a/modules/gui/qt4/dialogs/errors.cpp
+++ b/modules/gui/qt4/dialogs/errors.cpp
@@ -22,7 +22,6 @@
  *****************************************************************************/
 
 #include "dialogs/errors.hpp"
-#include "qt4.hpp"
 
 #include <QTextCursor>
 #include <QTextEdit>

diff --git a/modules/gui/qt4/dialogs/gototime.cpp b/modules/gui/qt4/dialogs/gototime.cpp
index c3aba13e8ba99d91aa0e718ec3ff07ba96a0ca2e..e8a77d570b1d8d6c0ad041183cc1b6f515d0c4f4 100644 (file)
--- a/modules/gui/qt4/dialogs/gototime.cpp
+++ b/modules/gui/qt4/dialogs/gototime.cpp
@@ -25,8 +25,6 @@
 
 #include "dialogs_provider.hpp"
 #include "main_interface.hpp"
-#include "util/qvlcframe.hpp"
-#include "qt4.hpp"
 #include "input_manager.hpp"
 
 #include <QTabWidget>

diff --git a/modules/gui/qt4/dialogs/help.cpp b/modules/gui/qt4/dialogs/help.cpp
index be7932fb5f2bbc20a75fc9eb5fff144d6e4750e1..43c11d69e3fba1123238ccef46083248138f57ff 100644 (file)
--- a/modules/gui/qt4/dialogs/help.cpp
+++ b/modules/gui/qt4/dialogs/help.cpp
@@ -21,12 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "dialogs/about.hpp"
 #include "dialogs/help.hpp"
+#include "dialogs/about.hpp"
 
 #include "dialogs_provider.hpp"
-#include "util/qvlcframe.hpp"
-#include "qt4.hpp"
 
 #include <QTextBrowser>
 #include <QTabWidget>
@@ -36,7 +34,7 @@
 
 HelpDialog *HelpDialog::instance = NULL;
 
-HelpDialog::HelpDialog( intf_thread_t *_p_intf) :  QVLCFrame( _p_intf )
+HelpDialog::HelpDialog( intf_thread_t *_p_intf) : QVLCFrame( _p_intf )
 {
     setWindowTitle( qtr( "Help" ) );
     resize( 600, 560 );

diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp
index 792db1d903808375adc414b02c7b73cd34646162..359cdfef23cfdc3f5e01f481b2e04b242452c428 100644 (file)
--- a/modules/gui/qt4/dialogs/interaction.cpp
+++ b/modules/gui/qt4/dialogs/interaction.cpp
@@ -21,10 +21,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "qt4.hpp"
 #include "dialogs/errors.hpp"
 #include "dialogs/interaction.hpp"
-#include "util/qvlcframe.hpp"
 
 #include <QLabel>
 #include <QLineEdit>

diff --git a/modules/gui/qt4/dialogs/mediainfo.cpp b/modules/gui/qt4/dialogs/mediainfo.cpp
index 1d3b96b6b5a0eed1a864b9ebb0ad004585efa119..b03a3d3b890cdaefc2e8f2d3e6b2e7f4f3ec1ff3 100644 (file)
--- a/modules/gui/qt4/dialogs/mediainfo.cpp
+++ b/modules/gui/qt4/dialogs/mediainfo.cpp
@@ -23,11 +23,9 @@
  ******************************************************************************/
 
 #include "dialogs/mediainfo.hpp"
+#include "components/infopanels.hpp"
 #include "input_manager.hpp"
 #include "dialogs_provider.hpp"
-#include "util/qvlcframe.hpp"
-#include "components/infopanels.hpp"
-#include "qt4.hpp"
 
 #include <QTabWidget>
 #include <QGridLayout>

diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp
index 8cf91cb6551010bc4e74c94024f76609556c1b9b..801d793f9eb719139b86f3f3f91a30fc41cd56b8 100644 (file)
--- a/modules/gui/qt4/dialogs/messages.cpp
+++ b/modules/gui/qt4/dialogs/messages.cpp
@@ -23,8 +23,7 @@
 
 #include "dialogs/messages.hpp"
 #include "dialogs_provider.hpp"
-#include "util/qvlcframe.hpp"
-#include "qt4.hpp"
+
 #include <QSpacerItem>
 #include <QSpinBox>
 #include <QLabel>

diff --git a/modules/gui/qt4/dialogs/open.cpp b/modules/gui/qt4/dialogs/open.cpp
index a7736bb196a95a36814be5c78e039321bf266365..1f52e342c3749e462b14acdacd9e632ff4abc035 100644 (file)
--- a/modules/gui/qt4/dialogs/open.cpp
+++ b/modules/gui/qt4/dialogs/open.cpp
@@ -21,8 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include "qt4.hpp"
-#include "util/qvlcframe.hpp"
 #include "input_manager.hpp"
 
 #include "dialogs/open.hpp"

diff --git a/modules/gui/qt4/dialogs/playlist.cpp b/modules/gui/qt4/dialogs/playlist.cpp
index 0ad19d21f52bc874c081307a19cd018a2ee3644c..66159503b151e33123af023929a49f4e06ea5d79 100644 (file)
--- a/modules/gui/qt4/dialogs/playlist.cpp
+++ b/modules/gui/qt4/dialogs/playlist.cpp
@@ -23,9 +23,7 @@
 
 #include "dialogs/playlist.hpp"
 
-#include "qt4.hpp"
 #include "main_interface.hpp"
-#include "util/qvlcframe.hpp"
 #include "components/interface_widgets.hpp"
 #include "dialogs_provider.hpp"
 #include "menus.hpp"

diff --git a/modules/gui/qt4/dialogs/preferences.cpp b/modules/gui/qt4/dialogs/preferences.cpp
index 204ad43aae50c2f48f80acc1cf60e26c12447886..aa2101648d94aab16c14ba7188f73840c9c3a4b2 100644 (file)
--- a/modules/gui/qt4/dialogs/preferences.cpp
+++ b/modules/gui/qt4/dialogs/preferences.cpp
@@ -28,7 +28,6 @@
 
 #include "components/complete_preferences.hpp"
 #include "components/simple_preferences.hpp"
-#include "qt4.hpp"
 
 #include <QHBoxLayout>
 #include <QGroupBox>

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index 7840df6d709dc49f5c51812a4455d246efafd3e2..a5e84fd9ae918ed1d45df6352b35d49a6e00dfbc 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -24,7 +24,6 @@
  *****************************************************************************/
 
 #include "dialogs/sout.hpp"
-#include "qt4.hpp"
 #include <vlc_streaming.h>
 
 #include <iostream>

diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp
index 3c972a8525c80ebe5a71f2519fc6ed650036c988..1e130d4aa97b076273e1d36ab8e902a5e45f5db5 100644 (file)
--- a/modules/gui/qt4/dialogs/vlm.cpp
+++ b/modules/gui/qt4/dialogs/vlm.cpp
@@ -24,7 +24,6 @@
  *****************************************************************************/
 
 #include "dialogs/vlm.hpp"
-#include "qt4.hpp"
 #include <vlc_streaming.h>
 
 #include <iostream>

diff --git a/modules/gui/qt4/ui/sout.ui b/modules/gui/qt4/ui/sout.ui
index d8f4fc5a86ad4ad608c04fa6db3c6d2f57371c25..9d937bfd90fd016bfb639b98f7a682337210f49f 100644 (file)
--- a/modules/gui/qt4/ui/sout.ui
+++ b/modules/gui/qt4/ui/sout.ui
@@ -1,4 +1,5 @@
 <ui version="4.0" >
+ <author>Jean-Baptiste Kempf</author>
  <class>Sout</class>
  <widget class="QWidget" name="Sout" >
   <property name="geometry" >