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

Android: 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: I44745947f315b73f0b983d4362f884580dc2d94b
Reviewed-by: BogDan Vatra <bogdan@kde.org>
This commit is contained in:
Orgad Shaneh
2015-02-03 23:50:37 +02:00
committed by Orgad Shaneh
parent e02a9433dd
commit f7835eb5f2
12 changed files with 51 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidqtversion.cpp
View File

@@ -88,20 +88,20 @@ QString AndroidQtVersion::invalidReason() const
return tmp;
}
QList<ProjectExplorer::Abi> AndroidQtVersion::detectQtAbis() const
QList<Abi> AndroidQtVersion::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::AndroidLinuxFlavor,
Abi::AndroidLinuxFlavor,
abis.at(i).binaryFormat(),
abis.at(i).wordWidth());
}
return abis;
}
void AndroidQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const
void AndroidQtVersion::addToEnvironment(const Kit *k, Utils::Environment &env) const
{
// this env vars are used by qmake mkspecs to generate makefiles (check QTDIR/mkspecs/android-g++/qmake.conf for more info)
env.set(QLatin1String("ANDROID_NDK_HOST"), AndroidConfigurations::currentConfig().toolchainHost());