Commit 2a37d93c authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Qt4: simplify and hopefully fix progress bar deletion

This should fix LP#947156.
(cherry picked from commit f36c50b0a05478a64f9c8a9b2df657ab625812d9)

Conflicts:
	modules/gui/qt4/dialogs/external.cpp
parent 0fca9c10
......@@ -62,9 +62,6 @@ DialogHandler::DialogHandler (intf_thread_t *intf, QObject *_parent)
connect (&progressBar, SIGNAL(pointerChanged(vlc_object_t *, void *)),
SLOT(startProgressBar(vlc_object_t *, void *)),
Qt::BlockingQueuedConnection);
connect (this,
SIGNAL(progressBarDestroyed(QWidget *)),
SLOT(stopProgressBar(QWidget *)));
dialog_Register (intf);
}
......@@ -201,6 +198,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;
......@@ -230,7 +228,7 @@ void QVLCProgressDialog::destroy (void *priv)
{
QVLCProgressDialog *self = static_cast<QVLCProgressDialog *>(priv);
emit self->handler->progressBarDestroyed (self);
emit self->released ();
}
void QVLCProgressDialog::saveCancel (void)
......
......@@ -47,7 +47,6 @@ private:
QVLCPointer question;
QVLCPointer progressBar;
signals:
void progressBarDestroyed (QWidget *);
void error (const QString&, const QString&);
private slots:
......@@ -81,7 +80,7 @@ private slots:
signals:
void progressed (int);
void described (const QString&);
void destroyed (void);
void released (void);
};
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment