diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-02-03 23:59:04 +0200 |
|---|---|---|
| committer | hjk <hjk@theqtcompany.com> | 2015-02-06 12:06:22 +0000 |
| commit | 23b4dc128f1e3368398b8592d174886d2823d106 (patch) | |
| tree | 2e78c12990d7d803ee2f7479ee1718434b5464f8 /src/plugins/projectexplorer/customtoolchain.cpp | |
| parent | 779d6a8c4bf2a0d91a5188b4c5df6f9bb2638fb7 (diff) | |
ProjectExplorer: 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: I1d05d48b23f44e3d589cc2a790803714786b57d2
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Diffstat (limited to 'src/plugins/projectexplorer/customtoolchain.cpp')
| -rw-r--r-- | src/plugins/projectexplorer/customtoolchain.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index c9308689ac..8adf20aca2 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -177,7 +177,7 @@ void CustomToolChain::setPredefinedMacros(const QStringList &list) m_predefinedMacros = list; } -QList<HeaderPath> CustomToolChain::systemHeaderPaths(const QStringList &cxxFlags, const Utils::FileName &) const +QList<HeaderPath> CustomToolChain::systemHeaderPaths(const QStringList &cxxFlags, const FileName &) const { QList<HeaderPath> flagHeaderPaths; foreach (const QString &cxxFlag, cxxFlags) { @@ -251,7 +251,7 @@ void CustomToolChain::setMakeCommand(const FileName &path) toolChainUpdated(); } -QString CustomToolChain::makeCommand(const Utils::Environment &) const +QString CustomToolChain::makeCommand(const Environment &) const { return m_makeCommand.toString(); } @@ -272,7 +272,7 @@ const QStringList &CustomToolChain::cxx11Flags() const void CustomToolChain::setMkspecs(const QString &specs) { m_mkspecs = Utils::transform(specs.split(QLatin1Char(',')), - [](QString fn) { return Utils::FileName::fromString(fn); }); + [](QString fn) { return FileName::fromString(fn); }); } QString CustomToolChain::mkspecs() const @@ -585,7 +585,7 @@ void CustomToolChainConfigWidget::setFromToolchain() bool blocked = blockSignals(true); CustomToolChain *tc = static_cast<CustomToolChain *>(toolChain()); m_compilerCommand->setFileName(tc->compilerCommand()); - m_makeCommand->setFileName(FileName::fromString(tc->makeCommand(Utils::Environment()))); + m_makeCommand->setFileName(FileName::fromString(tc->makeCommand(Environment()))); m_abiWidget->setAbis(QList<Abi>(), tc->targetAbi()); m_predefinedMacros->setPlainText(tc->rawPredefinedMacros().join(QLatin1Char('\n'))); m_headerPaths->setPlainText(tc->headerPathsList().join(QLatin1Char('\n'))); @@ -601,7 +601,7 @@ bool CustomToolChainConfigWidget::isDirtyImpl() const CustomToolChain *tc = static_cast<CustomToolChain *>(toolChain()); Q_ASSERT(tc); return m_compilerCommand->fileName() != tc->compilerCommand() - || m_makeCommand->path() != tc->makeCommand(Utils::Environment()) + || m_makeCommand->path() != tc->makeCommand(Environment()) || m_abiWidget->currentAbi() != tc->targetAbi() || m_predefinedDetails->entries() != tc->rawPredefinedMacros() || m_headerDetails->entries() != tc->headerPathsList() |