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

ProjectExplorer: Remove redundant namespace qualifications

Browse Source 
Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Orgad Shaneh
2014-10-13 22:37:28 +03:00
committed by hjk
parent c86ef46f6f
commit c884f3e0ef
70 changed files with 334 additions and 326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/projectexplorer/projectmacroexpander.cpp
View File

@@ -46,42 +46,42 @@ bool ProjectMacroExpander::resolveProjectMacro(const QString &name, QString *ret
{
QString result;
bool found = false;
if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTPROJECT_NAME)) {
if (name == QLatin1String(Constants::VAR_CURRENTPROJECT_NAME)) {
if (!m_projectName.isEmpty()) {
result = m_projectName;
found = true;
}
} else if (m_kit && name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTKIT_NAME)) {
} else if (m_kit && name == QLatin1String(Constants::VAR_CURRENTKIT_NAME)) {
result = m_kit->displayName();
found = true;
} else if (m_kit && name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTKIT_FILESYSTEMNAME)) {
} else if (m_kit && name == QLatin1String(Constants::VAR_CURRENTKIT_FILESYSTEMNAME)) {
result = m_kit->fileSystemFriendlyName();
found = true;
} else if (m_kit && name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTKIT_ID)) {
} else if (m_kit && name == QLatin1String(Constants::VAR_CURRENTKIT_ID)) {
result = m_kit->id().toString();
found = true;
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTBUILD_NAME)) {
} else if (name == QLatin1String(Constants::VAR_CURRENTBUILD_NAME)) {
result = m_bcName;
found = true;
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_HOSTADDRESS)) {
} else if (name == QLatin1String(Constants::VAR_CURRENTDEVICE_HOSTADDRESS)) {
const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
if (device) {
result = device->sshParameters().host;
found = true;
}
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_SSHPORT)) {
} else if (name == QLatin1String(Constants::VAR_CURRENTDEVICE_SSHPORT)) {
const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
if (device) {
result = QString::number(device->sshParameters().port);
found = true;
}
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_USERNAME)) {
} else if (name == QLatin1String(Constants::VAR_CURRENTDEVICE_USERNAME)) {
const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
if (device) {
result = device->sshParameters().userName;
found = true;
}
} else if (name == QLatin1String(ProjectExplorer::Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE)) {
} else if (name == QLatin1String(Constants::VAR_CURRENTDEVICE_PRIVATEKEYFILE)) {
const IDevice::ConstPtr device = DeviceKitInformation::device(m_kit);
if (device) {
result = device->sshParameters().privateKeyFile;