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

IOS: Remove unneeded qualifications

Browse Source 
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>
This commit is contained in:
Orgad Shaneh
2015-02-03 23:49:46 +02:00
committed by Orgad Shaneh
parent 4e09ec98c7
commit 2813643cfe
13 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/ios/iosbuildstep.cpp
View File

@@ -350,7 +350,7 @@ bool IosBuildStepFactory::canCreate(BuildStepList *parent, const Id id) const
&& parent->id() != ProjectExplorer::Constants::BUILDSTEPS_BUILD)
return false;
Kit *kit = parent->target()->kit();
Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(kit);
Id deviceType = DeviceTypeKitInformation::deviceTypeId(kit);
return ((deviceType == Constants::IOS_DEVICE_TYPE
|| deviceType == Constants::IOS_SIMULATOR_TYPE)
&& id == IOS_BUILD_STEP_ID);
@@ -403,7 +403,7 @@ BuildStep *IosBuildStepFactory::restore(BuildStepList *parent, const QVariantMap
QList<Id> IosBuildStepFactory::availableCreationIds(BuildStepList *parent) const
{
Kit *kit = parent->target()->kit();
Core::Id deviceType = DeviceTypeKitInformation::deviceTypeId(kit);
Id deviceType = DeviceTypeKitInformation::deviceTypeId(kit);
if (deviceType == Constants::IOS_DEVICE_TYPE
|| deviceType == Constants::IOS_SIMULATOR_TYPE)
return QList<Id>() << Id(IOS_BUILD_STEP_ID);