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

iosrunconfiguration: use more descriptive method/variables names

Browse Source 
removed use of shortened names

Change-Id: Icce8558a909e6fdd1c4d4f12ea273745fb21f5eb
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
This commit is contained in:
Fawzi Mohamed
2014-04-10 11:35:36 +02:00
parent 776b375540
commit b6a1aff2a1
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/ios/iosrunconfiguration.cpp
View File

@@ -166,7 +166,7 @@ void IosRunConfiguration::updateDisplayNames()
ProjectExplorer::DeviceKitInformation::device(target()->kit());
const QString devName = dev.isNull() ? IosDevice::name() : dev->displayName();
setDefaultDisplayName(tr("Run on %1").arg(devName));
setDisplayName(tr("Run %1 on %2").arg(appName()).arg(devName));
setDisplayName(tr("Run %1 on %2").arg(applicationName()).arg(devName));
}
IosDeployStep *IosRunConfiguration::deployStep() const
@@ -191,7 +191,7 @@ QString IosRunConfiguration::profilePath() const
return m_profilePath;
}
QString IosRunConfiguration::appName() const
QString IosRunConfiguration::applicationName() const
{
QmakeProject *pro = qobject_cast<QmakeProject *>(target()->project());
const QmakeProFileNode *node = 0;
@@ -207,7 +207,7 @@ QString IosRunConfiguration::appName() const
return QString();
}
Utils::FileName IosRunConfiguration::bundleDir() const
Utils::FileName IosRunConfiguration::bundleDirectory() const
{
Utils::FileName res;
Core::Id devType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(target()->kit());
@@ -251,13 +251,13 @@ Utils::FileName IosRunConfiguration::bundleDir() const
<< target()->activeBuildConfiguration()->buildType();
}
}
res.appendPath(appName() + QLatin1String(".app"));
res.appendPath(applicationName() + QLatin1String(".app"));
return res;
}
Utils::FileName IosRunConfiguration::exePath() const
Utils::FileName IosRunConfiguration::localExecutable() const
{
return bundleDir().appendPath(appName());
return bundleDirectory().appendPath(applicationName());
}
bool IosRunConfiguration::fromMap(const QVariantMap &map)
@@ -455,7 +455,7 @@ void IosRunConfigurationWidget::updateValues()
if (simulatedDevices[i] == m_runConfiguration->deviceType())
m_ui->deviceTypeComboBox->setCurrentIndex(i);
m_ui->argumentsLineEdit->setText(argsString);
m_ui->executableLineEdit->setText(m_runConfiguration->exePath().toUserOutput());
m_ui->executableLineEdit->setText(m_runConfiguration->localExecutable().toUserOutput());
}
} // namespace Internal