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>
This commit is contained in:
Orgad Shaneh
2015-02-03 23:51:12 +02:00
committed by hjk
parent b001e54599
commit b1c17b39bc
11 changed files with 70 additions and 71 deletions

View File

@@ -58,14 +58,14 @@ QString QnxUtils::addQuotes(const QString &string)
return QLatin1Char('"') + string + QLatin1Char('"');
}
Qnx::QnxArchitecture QnxUtils::cpudirToArch(const QString &cpuDir)
QnxArchitecture QnxUtils::cpudirToArch(const QString &cpuDir)
{
if (cpuDir == QLatin1String("x86"))
return Qnx::X86;
return X86;
else if (cpuDir == QLatin1String("armle-v7"))
return Qnx::ArmLeV7;
return ArmLeV7;
else
return Qnx::UnknownArch;
return UnknownArch;
}
QStringList QnxUtils::searchPaths(QnxAbstractQtVersion *qtVersion)