Commit f36c50b0 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.
parent 29de0421
...@@ -58,9 +58,6 @@ DialogHandler::DialogHandler (intf_thread_t *p_intf, QObject *_parent) ...@@ -58,9 +58,6 @@ DialogHandler::DialogHandler (intf_thread_t *p_intf, QObject *_parent)
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
progressBar.addCallback(this, SLOT(startProgressBar(void *)), progressBar.addCallback(this, SLOT(startProgressBar(void *)),
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
connect (this,
SIGNAL(progressBarDestroyed(QWidget *)),
SLOT(stopProgressBar(QWidget *)));
dialog_Register (intf); dialog_Register (intf);
} }
...@@ -197,6 +194,7 @@ QVLCProgressDialog::QVLCProgressDialog (DialogHandler *parent, ...@@ -197,6 +194,7 @@ QVLCProgressDialog::QVLCProgressDialog (DialogHandler *parent,
connect (this, SIGNAL(described(const QString&)), connect (this, SIGNAL(described(const QString&)),
SLOT(setLabelText(const QString&))); SLOT(setLabelText(const QString&)));
connect (this, SIGNAL(canceled(void)), SLOT(saveCancel(void))); connect (this, SIGNAL(canceled(void)), SLOT(saveCancel(void)));
connect (this, SIGNAL(released(void)), SLOT(deleteLater(void)));
data->pf_update = update; data->pf_update = update;
data->pf_check = check; data->pf_check = check;
...@@ -226,7 +224,7 @@ void QVLCProgressDialog::destroy (void *priv) ...@@ -226,7 +224,7 @@ void QVLCProgressDialog::destroy (void *priv)
{ {
QVLCProgressDialog *self = static_cast<QVLCProgressDialog *>(priv); QVLCProgressDialog *self = static_cast<QVLCProgressDialog *>(priv);
emit self->handler->progressBarDestroyed (self); emit self->released ();
} }
void QVLCProgressDialog::saveCancel (void) void QVLCProgressDialog::saveCancel (void)
......
...@@ -51,7 +51,6 @@ private: ...@@ -51,7 +51,6 @@ private:
QVLCPointer question; QVLCPointer question;
QVLCPointer progressBar; QVLCPointer progressBar;
signals: signals:
void progressBarDestroyed (QWidget *);
void error (const QString&, const QString&); void error (const QString&, const QString&);
private slots: private slots:
...@@ -85,7 +84,7 @@ private slots: ...@@ -85,7 +84,7 @@ private slots:
signals: signals:
void progressed (int); void progressed (int);
void described (const QString&); void described (const QString&);
void destroyed (void); void released (void);
}; };
#endif #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