From e2743dbaf2c4aec93ffd5453e0eb8efe99be9995 Mon Sep 17 00:00:00 2001 From: Jari Jarvi Date: Mon, 5 Jul 2010 10:09:43 +0300 Subject: [PATCH] Bugfix, two connection dialogs opened when opening select remote dlg --- src/aboutdlg.h | 2 +- src/advsettingsdlg.h | 2 +- src/selectremotedlg.h | 2 +- src/settingsdlg.cpp | 7 +++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/aboutdlg.h b/src/aboutdlg.h index 0ff7305..00b796a 100644 --- a/src/aboutdlg.h +++ b/src/aboutdlg.h @@ -9,7 +9,7 @@ class AboutDlg : public QDialog { Q_OBJECT public: - AboutDlg(QWidget *parent); + AboutDlg(QWidget *parent = 0); }; #endif diff --git a/src/advsettingsdlg.h b/src/advsettingsdlg.h index b7b779d..6a311e0 100644 --- a/src/advsettingsdlg.h +++ b/src/advsettingsdlg.h @@ -14,7 +14,7 @@ class AdvSettingsDlg : public QDialog Q_OBJECT public: - AdvSettingsDlg(QWidget *parent); + AdvSettingsDlg(QWidget *parent = 0); ~AdvSettingsDlg(); private: diff --git a/src/selectremotedlg.h b/src/selectremotedlg.h index f64eb52..dc4e77c 100644 --- a/src/selectremotedlg.h +++ b/src/selectremotedlg.h @@ -23,7 +23,7 @@ class SelectRemoteDlg : public QDialog Q_OBJECT public: - SelectRemoteDlg(QWidget *parent); + SelectRemoteDlg(QWidget *parent = 0); ~SelectRemoteDlg(); private slots: diff --git a/src/settingsdlg.cpp b/src/settingsdlg.cpp index 1be79bb..c88da36 100644 --- a/src/settingsdlg.cpp +++ b/src/settingsdlg.cpp @@ -67,7 +67,6 @@ SettingsDlg::SettingsDlg(QWidget *parent) enableRateBtns(false); } else { setRemote(selectedRemote); - m_remote.updateInfo(); setBusy(); } } @@ -94,13 +93,13 @@ void SettingsDlg::setBusy(bool busy) void SettingsDlg::showAdvSettingsDlg() { - AdvSettingsDlg dlg(this); + AdvSettingsDlg dlg; dlg.exec(); } void SettingsDlg::showSelectRemoteDlg() { - SelectRemoteDlg dlg(this); + SelectRemoteDlg dlg; connect(&dlg, SIGNAL(remoteChanged(Remote)), this, SLOT(setRemote(Remote))); dlg.exec(); @@ -108,7 +107,7 @@ void SettingsDlg::showSelectRemoteDlg() void SettingsDlg::showAboutDlg() { - AboutDlg dlg(this); + AboutDlg dlg; dlg.exec(); } -- 1.7.9.5