From 312069209220083fcf83a749c8cfcb7db80dad8f Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 7 Jan 2016 17:33:21 +0100 Subject: [PATCH] ProjectExplorer: Use Qt5-style connects and clean up Clean up code a bit: Remove private slots, etc. Change-Id: I745925c76ed4e0be69a11ca911741309fc4286e7 Reviewed-by: hjk --- src/plugins/projectexplorer/project.cpp | 10 ++++------ src/plugins/projectexplorer/project.h | 6 ++---- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 73936993b94..30e1b18acc9 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -180,12 +180,10 @@ void Project::addTarget(Target *t) // add it d->m_targets.push_back(t); - connect(t, SIGNAL(environmentChanged()), - SLOT(changeEnvironment())); - connect(t, SIGNAL(buildConfigurationEnabledChanged()), - this, SLOT(changeBuildConfigurationEnabled())); - connect(t, SIGNAL(buildDirectoryChanged()), - this, SLOT(onBuildDirectoryChanged())); + connect(t, &Target::environmentChanged, this, &Project::changeEnvironment); + connect(t, &Target::buildConfigurationEnabledChanged, + this, &Project::changeBuildConfigurationEnabled); + connect(t, &Target::buildDirectoryChanged, this, &Project::onBuildDirectoryChanged); emit addedTarget(t); // check activeTarget: diff --git a/src/plugins/projectexplorer/project.h b/src/plugins/projectexplorer/project.h index b907a034433..6f08a7fe36f 100644 --- a/src/plugins/projectexplorer/project.h +++ b/src/plugins/projectexplorer/project.h @@ -61,8 +61,7 @@ class Target; class ProjectPrivate; // Documentation inside. -class PROJECTEXPLORER_EXPORT Project - : public QObject +class PROJECTEXPLORER_EXPORT Project : public QObject { friend class SessionManager; // for setActiveTarget Q_OBJECT @@ -180,12 +179,11 @@ protected: void removeProjectLanguage(Core::Id id); void setProjectLanguage(Core::Id id, bool enabled); -private slots: +private: void changeEnvironment(); void changeBuildConfigurationEnabled(); void onBuildDirectoryChanged(); -private: void setActiveTarget(Target *target); ProjectPrivate *d; };