summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2011-08-15 13:32:23 +0200
committerhjk <qthjk@ovi.com>2011-08-15 15:13:03 +0200
commit8dca6649019df47c851a86766f06ef461ab08cdf (patch)
tree4beece903343fa1206841a0e92da3b2437ce1b99 /src
parent077f5039587e52fa924ebebafb8032852521dbe9 (diff)
downloadqt-creator-8dca6649019df47c851a86766f06ef461ab08cdf.tar.gz
debugger: reduce namespace line noise
Change-Id: I8e4cabd8bd4a4378590daf92a647ecbbe7d0a28b Reviewed-on: http://codereview.qt.nokia.com/2970 Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/debugger/cdb/cdbengine.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index c771848441..8decc0c9f6 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -352,24 +352,24 @@ bool isCdbEngineEnabled()
#endif
}
-static inline QString msgNoCdbBinaryForToolChain(const ProjectExplorer::Abi &tc)
+static inline QString msgNoCdbBinaryForToolChain(const Abi &tc)
{
return CdbEngine::tr("There is no CDB binary available for binaries in format '%1'").arg(tc.toString());
}
-static inline bool isMSVC_Flavor(ProjectExplorer::Abi::OSFlavor osf)
+static inline bool isMsvcFlavor(Abi::OSFlavor osf)
{
- return osf == ProjectExplorer::Abi::WindowsMsvc2005Flavor
- || osf == ProjectExplorer::Abi::WindowsMsvc2008Flavor
- || osf == ProjectExplorer::Abi::WindowsMsvc2010Flavor;
+ return osf == Abi::WindowsMsvc2005Flavor
+ || osf == Abi::WindowsMsvc2008Flavor
+ || osf == Abi::WindowsMsvc2010Flavor;
}
static QString cdbBinary(const DebuggerStartParameters &sp)
{
if (!sp.debuggerCommand.isEmpty()) {
// Do not use a GDB binary if we got started for a project with MinGW runtime.
- const bool abiMatch = sp.toolChainAbi.os() == ProjectExplorer::Abi::WindowsOS
- && isMSVC_Flavor(sp.toolChainAbi.osFlavor());
+ const bool abiMatch = sp.toolChainAbi.os() == Abi::WindowsOS
+ && isMsvcFlavor(sp.toolChainAbi.osFlavor());
if (abiMatch)
return sp.debuggerCommand;
}
@@ -398,15 +398,15 @@ bool checkCdbConfiguration(const DebuggerStartParameters &sp, ConfigurationCheck
return false;
}
- if (sp.startMode == AttachCore && !isMSVC_Flavor(sp.toolChainAbi.osFlavor())) {
+ if (sp.startMode == AttachCore && !isMsvcFlavor(sp.toolChainAbi.osFlavor())) {
check->errorDetails.push_back(CdbEngine::tr("The CDB debug engine cannot debug gdb core files."));
return false;
}
if (cdbBinary(sp).isEmpty()) {
check->errorDetails.push_back(msgNoCdbBinaryForToolChain(sp.toolChainAbi));
- check->settingsCategory = QLatin1String(ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_CATEGORY);
- check->settingsPage = QLatin1String(ProjectExplorer::Constants::TOOLCHAIN_SETTINGS_CATEGORY);
+ check->settingsCategory = QLatin1String(Constants::TOOLCHAIN_SETTINGS_CATEGORY);
+ check->settingsPage = QLatin1String(Constants::TOOLCHAIN_SETTINGS_CATEGORY);
return false;
}