diff options
13 files changed, 23 insertions, 33 deletions
diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h index de8b3d9014..eec0a5bc2f 100644 --- a/src/libs/utils/wizard.h +++ b/src/libs/utils/wizard.h @@ -50,7 +50,7 @@ class QTCREATOR_UTILS_EXPORT Wizard : public QWizard public: explicit Wizard(QWidget *parent = 0, Qt::WindowFlags flags = 0); - virtual ~Wizard(); + ~Wizard() override; bool isAutomaticProgressCreationEnabled() const; void setAutomaticProgressCreationEnabled(bool enabled); @@ -75,22 +75,19 @@ public: virtual QHash<QString, QVariant> variables() const; -public slots: void showVariables(); protected: virtual QString stringify(const QVariant &v) const; virtual QString evaluate(const QVariant &v) const; - bool event(QEvent *event); + bool event(QEvent *event) override; -private slots: +private: void _q_currentPageChanged(int pageId); void _q_pageAdded(int pageId); void _q_pageRemoved(int pageId); -private: Q_DECLARE_PRIVATE(Wizard) - class WizardPrivate *d_ptr; }; diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp index b69e43ee3b..69f8c51685 100644 --- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp +++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp @@ -97,7 +97,7 @@ void BaseProjectWizardDialog::init() d->introPageId = d->desiredIntroPageId; setPage(d->desiredIntroPageId, d->introPage); } - connect(this, SIGNAL(accepted()), this, SLOT(slotAccepted())); + connect(this, &QDialog::accepted, this, &BaseProjectWizardDialog::slotAccepted); } BaseProjectWizardDialog::~BaseProjectWizardDialog() diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h index f936ed0a81..300b15d8ba 100644 --- a/src/plugins/projectexplorer/baseprojectwizarddialog.h +++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h @@ -65,7 +65,6 @@ public: static QString uniqueProjectName(const QString &path); void addExtensionPages(const QList<QWizardPage *> &wizardPageList); -public slots: void setIntroDescription(const QString &d); void setPath(const QString &path); void setProjectName(const QString &name); @@ -84,11 +83,9 @@ protected: Core::FeatureSet requiredFeatures() const; void setRequiredFeatures(const Core::FeatureSet &featureSet); -private slots: - void slotAccepted(); - private: void init(); + void slotAccepted(); bool validateCurrentPage(); BaseProjectWizardDialogPrivate *d; diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp index 00fb0d1c68..c52bd20eab 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.cpp +++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp @@ -492,7 +492,8 @@ void CustomProjectWizard::initProjectWizardDialog(BaseProjectWizardDialog *w, w->setPath(defaultPath); w->setProjectName(BaseProjectWizardDialog::uniqueProjectName(defaultPath)); - connect(w, SIGNAL(projectParametersChanged(QString,QString)), this, SLOT(projectParametersChanged(QString,QString))); + connect(w, &BaseProjectWizardDialog::projectParametersChanged, + this, &CustomProjectWizard::projectParametersChanged); if (CustomWizardPrivate::verbose) qDebug() << "initProjectWizardDialog" << w << w->pageIds(); diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h index e67140190a..3b1fd13a97 100644 --- a/src/plugins/projectexplorer/customwizard/customwizard.h +++ b/src/plugins/projectexplorer/customwizard/customwizard.h @@ -138,15 +138,14 @@ public: static bool postGenerateOpen(const Core::GeneratedFiles &l, QString *errorMessage = 0); +signals: + void projectLocationChanged(const QString &path); + protected: Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters ¶meters) const override; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const override; -signals: - void projectLocationChanged(const QString &path); - -protected: bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage) const override; void initProjectWizardDialog(BaseProjectWizardDialog *w, const QString &defaultPath, diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp index 6952537f12..b4a99463ca 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.cpp @@ -62,7 +62,7 @@ CustomWidgetWizardDialog::CustomWidgetWizardDialog(const Core::BaseFileWizardFac m_pluginPageId = addPage(m_pluginPage); addExtensionPages(extensionPages()); - connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotCurrentIdChanged(int))); + connect(this, &QWizard::currentIdChanged, this, &CustomWidgetWizardDialog::slotCurrentIdChanged); } FileNamingParameters CustomWidgetWizardDialog::fileNamingParameters() const diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h index 868d0b9193..872b435315 100644 --- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h +++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizarddialog.h @@ -58,10 +58,9 @@ public: FileNamingParameters fileNamingParameters() const; void setFileNamingParameters(const FileNamingParameters &fnp); -private slots: - void slotCurrentIdChanged (int id); - private: + void slotCurrentIdChanged(int id); + CustomWidgetWidgetsWizardPage *m_widgetsPage; CustomWidgetPluginWizardPage *m_pluginPage; int m_pluginPageId; diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp index c34ea7bb54..fb952e8d92 100644 --- a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.cpp @@ -178,7 +178,7 @@ LibraryWizardDialog::LibraryWizardDialog(const Core::BaseFileWizardFactory *fact } } - connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotCurrentIdChanged(int))); + connect(this, &QWizard::currentIdChanged, this, &LibraryWizardDialog::slotCurrentIdChanged); addExtensionPages(extensionPages()); } diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h index 4d434fbda9..d53d68e04c 100644 --- a/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h +++ b/src/plugins/qmakeprojectmanager/wizards/librarywizarddialog.h @@ -59,16 +59,15 @@ public: static QString pluginInterface(const QString &baseClass); - virtual int nextId() const; + int nextId() const override; protected: - void initializePage(int id); - void cleanupPage(int id); + void initializePage(int id) override; + void cleanupPage(int id) override; -private slots: +private: void slotCurrentIdChanged(int); -private: QtProjectParameters::Type type() const; void setupFilesPage(); bool isModulesPageSkipped() const; diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp index 705c5fae4a..5835ec3bf8 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp @@ -184,8 +184,8 @@ void BaseQmakeProjectWizardDialog::init(bool showModulesPage) { if (showModulesPage) m_modulesPage = new ModulesPage; - connect(this, SIGNAL(projectParametersChanged(QString,QString)), - this, SLOT(generateProfileName(QString,QString))); + connect(this, &BaseProjectWizardDialog::projectParametersChanged, + this, &BaseQmakeProjectWizardDialog::generateProfileName); } int BaseQmakeProjectWizardDialog::addModulesPage(int id) diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h index c3d656992a..fb22a458b9 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h @@ -118,7 +118,7 @@ public: explicit BaseQmakeProjectWizardDialog(const Core::BaseFileWizardFactory *factory, bool showModulesPage, QWidget *parent, const Core::WizardDialogParameters ¶meters); - ~BaseQmakeProjectWizardDialog(); + ~BaseQmakeProjectWizardDialog() override; int addModulesPage(int id = -1); int addTargetSetupPage(int id = -1); diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.cpp b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.cpp index 54abe0fa19..df3f791fde 100644 --- a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.cpp +++ b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.cpp @@ -67,7 +67,7 @@ TestWizardDialog::TestWizardDialog(const Core::BaseFileWizardFactory *factory, addModulesPage(); m_testPageId = addPage(m_testPage); addExtensionPages(extensionPages()); - connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotCurrentIdChanged(int))); + connect(this, &QWizard::currentIdChanged, this, &TestWizardDialog::slotCurrentIdChanged); } void TestWizardDialog::slotCurrentIdChanged(int id) diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h index 1467d4badb..f3874266d6 100644 --- a/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h +++ b/src/plugins/qmakeprojectmanager/wizards/testwizarddialog.h @@ -71,10 +71,8 @@ public: TestWizardParameters testParameters() const; QtProjectParameters projectParameters() const; -private slots: - void slotCurrentIdChanged(int id); - private: + void slotCurrentIdChanged(int id); TestWizardPage *m_testPage; int m_testPageId; }; |