summaryrefslogtreecommitdiff
path: root/src/plugins/ios/iosrunfactories.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2015-02-03 23:49:46 +0200
committerOrgad Shaneh <orgads@gmail.com>2015-02-05 16:40:42 +0000
commit2813643cfe45aa679045738e11be3aa05b508793 (patch)
treec2abe7e03593f1edc786958bfc2e28cb7ff44991 /src/plugins/ios/iosrunfactories.cpp
parent4e09ec98c7d0d757693717a276ec324d76c8daf1 (diff)
downloadqt-creator-2813643cfe45aa679045738e11be3aa05b508793.tar.gz
IOS: 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: I8ef73f4861069dcd7edf5e73b397d60609d4b476 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
Diffstat (limited to 'src/plugins/ios/iosrunfactories.cpp')
-rw-r--r--src/plugins/ios/iosrunfactories.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/ios/iosrunfactories.cpp b/src/plugins/ios/iosrunfactories.cpp
index 6757f1abf9..63bd81b3e7 100644
--- a/src/plugins/ios/iosrunfactories.cpp
+++ b/src/plugins/ios/iosrunfactories.cpp
@@ -132,8 +132,8 @@ bool IosRunConfigurationFactory::canHandle(Target *t) const
QList<RunConfiguration *> IosRunConfigurationFactory::runConfigurationsForNode(Target *t, const Node *n)
{
- QList<ProjectExplorer::RunConfiguration *> result;
- foreach (ProjectExplorer::RunConfiguration *rc, t->runConfigurations())
+ QList<RunConfiguration *> result;
+ foreach (RunConfiguration *rc, t->runConfigurations())
if (IosRunConfiguration *qt4c = qobject_cast<IosRunConfiguration *>(rc))
if (qt4c->profilePath() == n->path())
result << rc;
@@ -157,7 +157,7 @@ IosRunControlFactory::IosRunControlFactory(QObject *parent)
}
bool IosRunControlFactory::canRun(RunConfiguration *runConfiguration,
- ProjectExplorer::RunMode mode) const
+ RunMode mode) const
{
if (mode != NormalRunMode && mode != DebugRunMode && mode != QmlProfilerRunMode
&& mode != DebugRunModeWithBreakOnMain)
@@ -166,16 +166,16 @@ bool IosRunControlFactory::canRun(RunConfiguration *runConfiguration,
}
RunControl *IosRunControlFactory::create(RunConfiguration *runConfig,
- ProjectExplorer::RunMode mode, QString *errorMessage)
+ RunMode mode, QString *errorMessage)
{
Q_ASSERT(canRun(runConfig, mode));
IosRunConfiguration *rc = qobject_cast<IosRunConfiguration *>(runConfig);
Q_ASSERT(rc);
RunControl *res = 0;
- Core::Id devId = ProjectExplorer::DeviceKitInformation::deviceId(rc->target()->kit());
+ Core::Id devId = DeviceKitInformation::deviceId(rc->target()->kit());
// The device can only run an application at a time, if an app is running stop it.
if (m_activeRunControls.contains(devId)) {
- if (QPointer<ProjectExplorer::RunControl> activeRunControl = m_activeRunControls[devId])
+ if (QPointer<RunControl> activeRunControl = m_activeRunControls[devId])
activeRunControl->stop();
m_activeRunControls.remove(devId);
}