summaryrefslogtreecommitdiff
path: root/src/plugins/qnx/qnxruncontrolfactory.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2015-02-03 23:51:12 +0200
committerhjk <hjk@theqtcompany.com>2015-02-04 08:56:01 +0000
commitb1c17b39bcd89021a1b31040b64d74b2b48e30df (patch)
treedd202e211d392ca7a6be430ffad99db0c5965d28 /src/plugins/qnx/qnxruncontrolfactory.cpp
parentb001e54599679d0bbb03f28564f446f88d6b19a9 (diff)
downloadqt-creator-b1c17b39bcd89021a1b31040b64d74b2b48e30df.tar.gz
Qnx: Remove unneeded qualifications
Mostly done using the following ruby script: Dir.glob('**/*.cpp').each { |file| next if file =~ %r{src/shared/qbs|/qmljs/} s = File.read(file) s.scan(/^using namespace (.*);$/) { ns = $1 t = s.gsub(/^(.*)\b#{ns}::((?!Const)[A-Z])/) { |m| before = $1 char = $2 if before =~ /"|\/\/|\\|using|SIGNAL|SLOT|Q_/ m else before + char end } if t != s puts file File.open(file, 'w').write(t) end } } Change-Id: I78a70180927d085822e215ffb2b8ad256301e4a7 Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/qnx/qnxruncontrolfactory.cpp')
-rw-r--r--src/plugins/qnx/qnxruncontrolfactory.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/qnx/qnxruncontrolfactory.cpp b/src/plugins/qnx/qnxruncontrolfactory.cpp
index 8bf7d4547e..e4a7430b41 100644
--- a/src/plugins/qnx/qnxruncontrolfactory.cpp
+++ b/src/plugins/qnx/qnxruncontrolfactory.cpp
@@ -88,8 +88,8 @@ static DebuggerStartParameters createDebuggerStartParameters(const QnxRunConfigu
params.closeMode = KillAtClose;
params.processArgs = runConfig->arguments().join(QLatin1Char(' '));
- Debugger::DebuggerRunConfigurationAspect *aspect
- = runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
+ DebuggerRunConfigurationAspect *aspect
+ = runConfig->extraAspect<DebuggerRunConfigurationAspect>();
if (aspect->useQmlDebugger()) {
params.languages |= QmlLanguage;
params.qmlServerAddress = device->sshParameters().host;
@@ -97,13 +97,13 @@ static DebuggerStartParameters createDebuggerStartParameters(const QnxRunConfigu
}
if (aspect->useCppDebugger())
- params.languages |= Debugger::CppLanguage;
+ params.languages |= CppLanguage;
- if (const ProjectExplorer::Project *project = runConfig->target()->project()) {
+ if (const Project *project = runConfig->target()->project()) {
params.projectSourceDirectory = project->projectDirectory().toString();
- if (const ProjectExplorer::BuildConfiguration *buildConfig = runConfig->target()->activeBuildConfiguration())
+ if (const BuildConfiguration *buildConfig = runConfig->target()->activeBuildConfiguration())
params.projectBuildDirectory = buildConfig->buildDirectory().toString();
- params.projectSourceFiles = project->files(ProjectExplorer::Project::ExcludeGeneratedFiles);
+ params.projectSourceFiles = project->files(Project::ExcludeGeneratedFiles);
}
QnxQtVersion *qtVersion =