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>
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

View File

@@ -89,20 +89,20 @@ QString IosQtVersion::invalidReason() const
return tmp;
}
QList<ProjectExplorer::Abi> IosQtVersion::detectQtAbis() const
QList<Abi> IosQtVersion::detectQtAbis() const
{
QList<ProjectExplorer::Abi> abis = qtAbisFromLibrary(qtCorePaths(versionInfo(), qtVersionString()));
QList<Abi> abis = qtAbisFromLibrary(qtCorePaths(versionInfo(), qtVersionString()));
for (int i = 0; i < abis.count(); ++i) {
abis[i] = Abi(abis.at(i).architecture(),
abis.at(i).os(),
ProjectExplorer::Abi::GenericMacFlavor,
Abi::GenericMacFlavor,
abis.at(i).binaryFormat(),
abis.at(i).wordWidth());
}
return abis;
}
void IosQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const
void IosQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const
{
Q_UNUSED(k);
Q_UNUSED(env);