[vlc-commits] Qt4: use addCallback

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Apr 17 19:42:42 2012 +0300| [2fba1b055d246a4385159a7bd81fe6fd54d2891d] | committer: Rémi Denis-Courmont

Qt4: use addCallback

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2fba1b055d246a4385159a7bd81fe6fd54d2891d
---

 modules/gui/qt4/dialogs/external.cpp |   22 ++++++++++------------
 1 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/modules/gui/qt4/dialogs/external.cpp b/modules/gui/qt4/dialogs/external.cpp
index 5aef585..c251bb1 100644
--- a/modules/gui/qt4/dialogs/external.cpp
+++ b/modules/gui/qt4/dialogs/external.cpp
@@ -50,18 +50,16 @@ DialogHandler::DialogHandler (intf_thread_t *p_intf, QObject *_parent)
     connect (this, SIGNAL(error(const QString &, const QString &)),
              SLOT(displayError(const QString &, const QString &)));
 
-    connect (&critical, SIGNAL(pointerChanged(void *)),
-             SLOT(displayCritical(void *)),
-             Qt::BlockingQueuedConnection);
-    connect (&login, SIGNAL(pointerChanged(void *)),
-             SLOT(requestLogin(void *)),
-             Qt::BlockingQueuedConnection);
-    connect (&question, SIGNAL(pointerChanged(void *)),
-             SLOT(requestAnswer(void *)),
-             Qt::BlockingQueuedConnection);
-    connect (&progressBar, SIGNAL(pointerChanged(void *)),
-             SLOT(startProgressBar(void *)),
-             Qt::BlockingQueuedConnection);
+    critical.addCallback(this, SLOT(displayCritical(void *)),
+                         Qt::BlockingQueuedConnection);
+    login.addCallback(this, SLOT(requestLogin(void *)),
+                      Qt::BlockingQueuedConnection);
+    question.addCallback(this, SLOT(requestAnswer(void *)),
+                         Qt::BlockingQueuedConnection);
+    question.addCallback(this, SLOT(requestAnswer(void *)),
+                         Qt::BlockingQueuedConnection);
+    progressBar.addCallback(this, SLOT(startProgressBar(void *)),
+                            Qt::BlockingQueuedConnection);
     connect (this,
              SIGNAL(progressBarDestroyed(QWidget *)),
              SLOT(stopProgressBar(QWidget *)));