Qt4 - Fix previous commit.
authorJean-Baptiste Kempf <jb@videolan.org>
Sat, 22 Dec 2007 09:31:50 +0000 (09:31 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Sat, 22 Dec 2007 09:31:50 +0000 (09:31 +0000)
modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.hpp
modules/gui/qt4/dialogs_provider.cpp

index db546a2..e87c70b 100644 (file)
 #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 )
 {
index 371f5f4..f398a10 100644 (file)
@@ -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;
index d52c128..1617176 100644 (file)
@@ -446,7 +446,6 @@ void DialogsProvider::openThenTranscodingDialogs()
                                 ->showTab( 0 );
 }
 
-
 /****************************************************************************
  * Menus / Interaction
  ****************************************************************************/