[vlc-commits] Qt: take in account the SOUT params edited

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Oct  6 17:21:18 2013 +0200| [928b578fe6f38620999f6b1b1e99fb26261b6ee8] | committer: Jean-Baptiste Kempf

Qt: take in account the SOUT params edited

Close #9565

(cherry picked from commit 9f1950e32d2967239234c70a203000243a4b39c3)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=928b578fe6f38620999f6b1b1e99fb26261b6ee8
---

 modules/gui/qt4/dialogs/sout.cpp |   10 ++--------
 modules/gui/qt4/dialogs/sout.hpp |    4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/gui/qt4/dialogs/sout.cpp b/modules/gui/qt4/dialogs/sout.cpp
index eb6fab5..fbe3ed4 100644
--- a/modules/gui/qt4/dialogs/sout.cpp
+++ b/modules/gui/qt4/dialogs/sout.cpp
@@ -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()
diff --git a/modules/gui/qt4/dialogs/sout.hpp b/modules/gui/qt4/dialogs/sout.hpp
index b444f37..efbbe45 100644
--- a/modules/gui/qt4/dialogs/sout.hpp
+++ b/modules/gui/qt4/dialogs/sout.hpp
@@ -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();
 };