]> git.sesse.net Git - vlc/commitdiff
Qt: take in account the SOUT params edited
authorJean-Baptiste Kempf <jb@videolan.org>
Sun, 6 Oct 2013 15:21:18 +0000 (17:21 +0200)
committerJean-Baptiste Kempf <jb@videolan.org>
Sun, 6 Oct 2013 15:22:03 +0000 (17:22 +0200)
Close #9565

modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.hpp

index f2d6a93ca545eddb4656bd60ff07f8881a94d05a..b647bded8e00e78bd386e60c64cd1191dfb8c198 100644 (file)
@@ -155,16 +155,10 @@ void SoutDialog::addDest( )
     updateMRL();
 }
 
-void SoutDialog::ok()
+void SoutDialog::done( int r )
 {
     mrl = ui.mrlEdit->toPlainText();
-    accept();
-}
-
-void SoutDialog::cancel()
-{
-    mrl.clear();
-    reject();
+    QWizard::done(r);
 }
 
 void SoutDialog::updateMRL()
index b444f37182f7ba20a75ce8faabbe4f887bcf84ad..efbbe45e465268f408e53c27cba4c6bd25232d77 100644 (file)
@@ -120,6 +120,8 @@ public:
 
     QString getMrl(){ return mrl; }
 
+protected:
+    virtual void done( int );
 private:
     Ui::Sout ui;
 
@@ -132,8 +134,6 @@ public slots:
     void updateMRL();
 
 private slots:
-    void ok();
-    void cancel();
     void closeTab( int );
     void addDest();
 };