Qt4 - Fix previous commit.

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index db546a233d1263453b4a61cbd73550c95d9416d8..e87c70bcb51ced61ec20576727268fabaa5a2e48 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -30,10 +30,11 @@
 #include "dialogs/sout.hpp"
 #include <vlc_streaming.h>
 
-#include <iostream>
 #include <QString>
 #include <QFileDialog>
 
+SoutDialog* SoutDialog::instance = NULL;
+
 SoutDialog::SoutDialog( QWidget *parent, intf_thread_t *_p_intf,
                      bool _transcode_only ) : QVLCDialog( parent,  _p_intf )
 {

diff --git a/modules/gui/qt4/dialogs/sout.hpp b/modules/gui/qt4/dialogs/sout.hpp
index 371f5f4420b227c1c976fd1eb79a70b19654bb10..f398a1017dc419f160959631b1c60a0356aede1b 100644 (file)
--- a/modules/gui/qt4/dialogs/sout.hpp
+++ b/modules/gui/qt4/dialogs/sout.hpp
@@ -39,9 +39,8 @@ class SoutDialog : public QVLCDialog
 {
     Q_OBJECT;
 public:
-    static SoutDialog * getInstance( QWidget *parent,
-                                     intf_thread_t *p_intf,
-                                     bool transcode_only )
+    static SoutDialog* getInstance( QWidget *parent, intf_thread_t *p_intf,
+                                    bool transcode_only )
     {
         if( !instance )
             instance = new SoutDialog( parent, p_intf, transcode_only );
@@ -55,18 +54,17 @@ public:
             }
         }
         return instance;
-    };
+    }
 
-    virtual ~SoutDialog();
+    virtual ~SoutDialog(){}
 
     QString getMrl(){ return mrl; }
 
 private:
+    Ui::Sout ui;
+    static SoutDialog *instance;
     SoutDialog( QWidget* parent, intf_thread_t *,
                 bool _transcode_only = false );
-    static SoutDialog *instance;
-
-    Ui::Sout ui;
     QPushButton *okButton;
     QString mrl;
     bool b_transcode_only;

diff --git a/modules/gui/qt4/dialogs_provider.cpp b/modules/gui/qt4/dialogs_provider.cpp
index d52c12850bc2d9b3fc5cd53101913986c1ee7682..1617176e803e6ff5085c1f0631461d511c31dfbc 100644 (file)
--- a/modules/gui/qt4/dialogs_provider.cpp
+++ b/modules/gui/qt4/dialogs_provider.cpp
@@ -446,7 +446,6 @@ void DialogsProvider::openThenTranscodingDialogs()
                                 ->showTab( 0 );
 }
 
-
 /****************************************************************************
  * Menus / Interaction
  ****************************************************************************/