vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Aug 20 15:55:32 2012 +0300| [f36c50b0a05478a64f9c8a9b2df657ab625812d9] | committer: Rémi Denis-Courmont
Qt4: simplify and hopefully fix progress bar deletion This should fix LP#947156. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f36c50b0a05478a64f9c8a9b2df657ab625812d9 --- modules/gui/qt4/dialogs/external.cpp | 6 ++---- modules/gui/qt4/dialogs/external.hpp | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/modules/gui/qt4/dialogs/external.cpp b/modules/gui/qt4/dialogs/external.cpp index c0876d0..86a234f 100644 --- a/modules/gui/qt4/dialogs/external.cpp +++ b/modules/gui/qt4/dialogs/external.cpp @@ -58,9 +58,6 @@ DialogHandler::DialogHandler (intf_thread_t *p_intf, QObject *_parent) Qt::BlockingQueuedConnection); progressBar.addCallback(this, SLOT(startProgressBar(void *)), Qt::BlockingQueuedConnection); - connect (this, - SIGNAL(progressBarDestroyed(QWidget *)), - SLOT(stopProgressBar(QWidget *))); dialog_Register (intf); } @@ -197,6 +194,7 @@ QVLCProgressDialog::QVLCProgressDialog (DialogHandler *parent, connect (this, SIGNAL(described(const QString&)), SLOT(setLabelText(const QString&))); connect (this, SIGNAL(canceled(void)), SLOT(saveCancel(void))); + connect (this, SIGNAL(released(void)), SLOT(deleteLater(void))); data->pf_update = update; data->pf_check = check; @@ -226,7 +224,7 @@ void QVLCProgressDialog::destroy (void *priv) { QVLCProgressDialog *self = static_cast<QVLCProgressDialog *>(priv); - emit self->handler->progressBarDestroyed (self); + emit self->released (); } void QVLCProgressDialog::saveCancel (void) diff --git a/modules/gui/qt4/dialogs/external.hpp b/modules/gui/qt4/dialogs/external.hpp index e2dfd1e..84a19b1 100644 --- a/modules/gui/qt4/dialogs/external.hpp +++ b/modules/gui/qt4/dialogs/external.hpp @@ -51,7 +51,6 @@ private: QVLCPointer question; QVLCPointer progressBar; signals: - void progressBarDestroyed (QWidget *); void error (const QString&, const QString&); private slots: @@ -85,7 +84,7 @@ private slots: signals: void progressed (int); void described (const QString&); - void destroyed (void); + void released (void); }; #endif _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
