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

Target: Use Qt5-style connects

Browse Source 
Make the slots private now, remove protected as nothing inherits
from Target.

Change-Id: I4aaa4402ef6ee83a27dd6233f188a507e9de8169
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-16 16:57:54 +01:00
parent 3bb3ece568
commit 3be770eeae
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/plugins/projectexplorer/target.cpp
View File

@@ -127,18 +127,15 @@ Target::Target(Project *project, Kit *k) :
ProjectConfiguration(project, k->id()),
d(new TargetPrivate)
{
connect(DeviceManager::instance(), SIGNAL(updated()), this, SLOT(updateDeviceState()));
connect(DeviceManager::instance(), &DeviceManager::updated, this, &Target::updateDeviceState);
d->m_kit = k;
setDisplayName(d->m_kit->displayName());
setIcon(d->m_kit->icon());
QObject *km = KitManager::instance();
connect(km, SIGNAL(kitUpdated(ProjectExplorer::Kit*)),
this, SLOT(handleKitUpdates(ProjectExplorer::Kit*)));
connect(km, SIGNAL(kitRemoved(ProjectExplorer::Kit*)),
this, SLOT(handleKitRemoval(ProjectExplorer::Kit*)));
KitManager *km = KitManager::instance();
connect(km, &KitManager::kitUpdated, this, &Target::handleKitUpdates);
connect(km, &KitManager::kitRemoved, this, &Target::handleKitRemoval);
Utils::MacroExpander *expander = macroExpander();
expander->setDisplayName(tr("Target Settings"));
@@ -251,12 +248,12 @@ void Target::addBuildConfiguration(BuildConfiguration *configuration)
emit addedBuildConfiguration(configuration);
connect(configuration, SIGNAL(environmentChanged()),
SLOT(changeEnvironment()));
connect(configuration, SIGNAL(enabledChanged()),
this, SLOT(changeBuildConfigurationEnabled()));
connect(configuration, SIGNAL(buildDirectoryChanged()),
SLOT(onBuildDirectoryChanged()));
connect(configuration, &BuildConfiguration::environmentChanged,
this, &Target::changeEnvironment);
connect(configuration, &BuildConfiguration::enabledChanged,
this, &Target::changeBuildConfigurationEnabled);
connect(configuration, &BuildConfiguration::buildDirectoryChanged,
this, &Target::onBuildDirectoryChanged);
if (!activeBuildConfiguration())
setActiveBuildConfiguration(configuration);
@@ -326,7 +323,8 @@ void Target::addDeployConfiguration(DeployConfiguration *dc)
// add it
d->m_deployConfigurations.push_back(dc);
connect(dc, SIGNAL(enabledChanged()), this, SLOT(changeDeployConfigurationEnabled()));
connect(dc, &DeployConfiguration::enabledChanged,
this, &Target::changeDeployConfigurationEnabled);
emit addedDeployConfiguration(dc);
@@ -427,7 +425,8 @@ void Target::addRunConfiguration(RunConfiguration* runConfiguration)
d->m_runConfigurations.push_back(runConfiguration);
connect(runConfiguration, SIGNAL(enabledChanged()), this, SLOT(changeRunConfigurationEnabled()));
connect(runConfiguration, &RunConfiguration::enabledChanged,
this, &Target::changeRunConfigurationEnabled);
emit addedRunConfiguration(runConfiguration);