forked from qt-creator/qt-creator
C++: 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: I6fbe13ddc1485efe95c3156097bf41d90c0febac
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
f5225c0928
commit
65e7db42b8
@@ -217,7 +217,7 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName,
|
||||
*newLinesToAppend = false;
|
||||
|
||||
const QString pureIncludeFileName = newIncludeFileName.mid(1, newIncludeFileName.length() - 2);
|
||||
const CPlusPlus::Client::IncludeType newIncludeType =
|
||||
const Client::IncludeType newIncludeType =
|
||||
newIncludeFileName.startsWith(QLatin1Char('"')) ? Client::IncludeLocal
|
||||
: Client::IncludeGlobal;
|
||||
|
||||
@@ -391,11 +391,11 @@ QList<IncludeGroup> IncludeGroup::detectIncludeGroupsByIncludeType(const QList<I
|
||||
{
|
||||
// Create sub groups
|
||||
QList<IncludeGroup> result;
|
||||
CPlusPlus::Client::IncludeType lastIncludeType;
|
||||
Client::IncludeType lastIncludeType;
|
||||
QList<Include> currentIncludes;
|
||||
bool isFirst = true;
|
||||
foreach (const Include &include, includes) {
|
||||
const CPlusPlus::Client::IncludeType currentIncludeType = include.type();
|
||||
const Client::IncludeType currentIncludeType = include.type();
|
||||
|
||||
// First include...
|
||||
if (isFirst) {
|
||||
|
||||
Reference in New Issue
Block a user