feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Autotools: Use Qt5 style connects

Browse Source 
* Get rid of "slots" from the headers

Change-Id: Ie12f5705a2ca92a431992a45f57193a72ea7032a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2016-02-10 14:24:19 +01:00
parent 8b46136b60
commit 5e81050450
12 changed files with 28 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/autotoolsprojectmanager/autogenstep.cpp
View File

@@ -242,10 +242,10 @@ AutogenStepConfigWidget::AutogenStepConfigWidget(AutogenStep *autogenStep) :
updateDetails(); updateDetails();
connect(m_additionalArguments, SIGNAL(textChanged(QString)), connect(m_additionalArguments, &QLineEdit::textChanged,
autogenStep, SLOT(setAdditionalArguments(QString))); autogenStep, &AutogenStep::setAdditionalArguments);
connect(autogenStep, SIGNAL(additionalArgumentsChanged(QString)), connect(autogenStep, &AutogenStep::additionalArgumentsChanged,
this, SLOT(updateDetails())); this, &AutogenStepConfigWidget::updateDetails);
} }
QString AutogenStepConfigWidget::displayName() const QString AutogenStepConfigWidget::displayName() const

4
src/plugins/autotoolsprojectmanager/autogenstep.h
View File

@@ -97,7 +97,6 @@ public:
QString additionalArguments() const; QString additionalArguments() const;
QVariantMap toMap() const override; QVariantMap toMap() const override;
public slots:
void setAdditionalArguments(const QString &list); void setAdditionalArguments(const QString &list);
signals: signals:
@@ -134,10 +133,9 @@ public:
QString displayName() const override; QString displayName() const override;
QString summaryText() const override; QString summaryText() const override;
private slots: private:
void updateDetails(); void updateDetails();
private:
AutogenStep *m_autogenStep; AutogenStep *m_autogenStep;
QString m_summaryText; QString m_summaryText;
QLineEdit *m_additionalArguments; QLineEdit *m_additionalArguments;

8
src/plugins/autotoolsprojectmanager/autoreconfstep.cpp
View File

@@ -237,10 +237,10 @@ AutoreconfStepConfigWidget::AutoreconfStepConfigWidget(AutoreconfStep *autorecon
updateDetails(); updateDetails();
connect(m_additionalArguments, SIGNAL(textChanged(QString)), connect(m_additionalArguments, &QLineEdit::textChanged,
autoreconfStep, SLOT(setAdditionalArguments(QString))); autoreconfStep, &AutoreconfStep::setAdditionalArguments);
connect(autoreconfStep, SIGNAL(additionalArgumentsChanged(QString)), connect(autoreconfStep, &AutoreconfStep::additionalArgumentsChanged,
this, SLOT(updateDetails())); this, &AutoreconfStepConfigWidget::updateDetails);
} }
QString AutoreconfStepConfigWidget::displayName() const QString AutoreconfStepConfigWidget::displayName() const

4
src/plugins/autotoolsprojectmanager/autoreconfstep.h
View File

@@ -97,7 +97,6 @@ public:
QString additionalArguments() const; QString additionalArguments() const;
QVariantMap toMap() const override; QVariantMap toMap() const override;
public slots:
void setAdditionalArguments(const QString &list); void setAdditionalArguments(const QString &list);
signals: signals:
@@ -134,10 +133,9 @@ public:
QString displayName() const override; QString displayName() const override;
QString summaryText() const override; QString summaryText() const override;
private slots: private:
void updateDetails(); void updateDetails();
private:
AutoreconfStep *m_autoreconfStep; AutoreconfStep *m_autoreconfStep;
QString m_summaryText; QString m_summaryText;
QLineEdit *m_additionalArguments; QLineEdit *m_additionalArguments;

3
src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.cpp
View File

@@ -66,7 +66,8 @@ AutotoolsBuildSettingsWidget::AutotoolsBuildSettingsWidget(AutotoolsBuildConfigu
m_pathChooser->setPath(m_buildConfiguration->rawBuildDirectory().toString()); m_pathChooser->setPath(m_buildConfiguration->rawBuildDirectory().toString());
setDisplayName(tr("Autotools Manager")); setDisplayName(tr("Autotools Manager"));
connect(bc, SIGNAL(environmentChanged()), this, SLOT(environmentHasChanged())); connect(bc, &BuildConfiguration::environmentChanged,
this, &AutotoolsBuildSettingsWidget::environmentHasChanged);
} }
void AutotoolsBuildSettingsWidget::buildDirectoryChanged() void AutotoolsBuildSettingsWidget::buildDirectoryChanged()

3
src/plugins/autotoolsprojectmanager/autotoolsbuildsettingswidget.h
View File

@@ -52,11 +52,10 @@ class AutotoolsBuildSettingsWidget : public ProjectExplorer::NamedWidget
public: public:
AutotoolsBuildSettingsWidget(AutotoolsBuildConfiguration *bc); AutotoolsBuildSettingsWidget(AutotoolsBuildConfiguration *bc);
private slots: private:
void buildDirectoryChanged(); void buildDirectoryChanged();
void environmentHasChanged(); void environmentHasChanged();
private:
Utils::PathChooser *m_pathChooser; Utils::PathChooser *m_pathChooser;
AutotoolsBuildConfiguration *m_buildConfiguration; AutotoolsBuildConfiguration *m_buildConfiguration;
}; };

3
src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h
View File

@@ -64,10 +64,9 @@ class BuildPathPage : public QWizardPage
public: public:
explicit BuildPathPage(AutotoolsOpenProjectWizard *wizard); explicit BuildPathPage(AutotoolsOpenProjectWizard *wizard);
private slots: private:
void buildDirectoryChanged(); void buildDirectoryChanged();
private:
Utils::PathChooser *m_pc; Utils::PathChooser *m_pc;
}; };

12
src/plugins/autotoolsprojectmanager/configurestep.cpp
View File

@@ -259,12 +259,12 @@ ConfigureStepConfigWidget::ConfigureStepConfigWidget(ConfigureStep *configureSte
updateDetails(); updateDetails();
connect(m_additionalArguments, SIGNAL(textChanged(QString)), connect(m_additionalArguments, &QLineEdit::textChanged,
configureStep, SLOT(setAdditionalArguments(QString))); configureStep, &ConfigureStep::setAdditionalArguments);
connect(configureStep, SIGNAL(additionalArgumentsChanged(QString)), connect(configureStep, &ConfigureStep::additionalArgumentsChanged,
this, SLOT(updateDetails())); this, &ConfigureStepConfigWidget::updateDetails);
connect(configureStep, SIGNAL(buildDirectoryChanged()), connect(configureStep, &ConfigureStep::buildDirectoryChanged,
this, SLOT(updateDetails())); this, &ConfigureStepConfigWidget::updateDetails);
} }
QString ConfigureStepConfigWidget::displayName() const QString ConfigureStepConfigWidget::displayName() const

4
src/plugins/autotoolsprojectmanager/configurestep.h
View File

@@ -96,7 +96,6 @@ public:
QString additionalArguments() const; QString additionalArguments() const;
QVariantMap toMap() const override; QVariantMap toMap() const override;
public slots:
void setAdditionalArguments(const QString &list); void setAdditionalArguments(const QString &list);
void notifyBuildDirectoryChanged(); void notifyBuildDirectoryChanged();
@@ -135,10 +134,9 @@ public:
QString displayName() const override; QString displayName() const override;
QString summaryText() const override; QString summaryText() const override;
private slots: private:
void updateDetails(); void updateDetails();
private:
ConfigureStep *m_configureStep; ConfigureStep *m_configureStep;
QString m_summaryText; QString m_summaryText;
QLineEdit *m_additionalArguments; QLineEdit *m_additionalArguments;

1
src/plugins/autotoolsprojectmanager/makefileparserthread.h
View File

@@ -110,7 +110,6 @@ public:
*/ */
bool isCanceled() const; bool isCanceled() const;
public slots:
/** /**
* Cancels the parsing of the makefile. MakefileParser::hasError() will * Cancels the parsing of the makefile. MakefileParser::hasError() will
* return true in this case. * return true in this case.

11
src/plugins/autotoolsprojectmanager/makestep.cpp
View File

@@ -271,11 +271,12 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) :
updateDetails(); updateDetails();
connect(m_additionalArguments, SIGNAL(textChanged(QString)), connect(m_additionalArguments, &QLineEdit::textChanged,
makeStep, SLOT(setAdditionalArguments(QString))); makeStep, &MakeStep::setAdditionalArguments);
connect(makeStep, SIGNAL(additionalArgumentsChanged(QString)), connect(makeStep, &MakeStep::additionalArgumentsChanged,
this, SLOT(updateDetails())); this, &MakeStepConfigWidget::updateDetails);
connect(m_makeStep->project(), SIGNAL(environmentChanged()), this, SLOT(updateDetails())); connect(m_makeStep->project(), &Project::environmentChanged,
this, &MakeStepConfigWidget::updateDetails);
} }
QString MakeStepConfigWidget::displayName() const QString MakeStepConfigWidget::displayName() const

4
src/plugins/autotoolsprojectmanager/makestep.h
View File

@@ -97,7 +97,6 @@ public:
QString additionalArguments() const; QString additionalArguments() const;
QVariantMap toMap() const override; QVariantMap toMap() const override;
public slots:
void setAdditionalArguments(const QString &list); void setAdditionalArguments(const QString &list);
signals: signals:
@@ -135,10 +134,9 @@ public:
QString displayName() const override; QString displayName() const override;
QString summaryText() const override; QString summaryText() const override;
private slots: private:
void updateDetails(); void updateDetails();
private:
MakeStep *m_makeStep; MakeStep *m_makeStep;
QString m_summaryText; QString m_summaryText;
QLineEdit *m_additionalArguments; QLineEdit *m_additionalArguments;