diff options
author | Orgad Shaneh <[email protected]> | 2015-02-03 23:48:57 +0200 |
---|---|---|
committer | Orgad Shaneh <[email protected]> | 2015-02-18 09:53:25 +0000 |
commit | b6de2d1bd813055f77e6f43cfda9ff609d7b845d (patch) | |
tree | 17577afbd5ab45399bbfe14e24650154665af9d0 /src/libs/qmljs/qmljslink.cpp | |
parent | 42af154c77aba5163e18405e7179b89aa684123b (diff) |
QmlDesigner: 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: I492792bb9e5655c55795e938031efc557c9a462f
Reviewed-by: Thomas Hartmann <[email protected]>
Diffstat (limited to 'src/libs/qmljs/qmljslink.cpp')
-rw-r--r-- | src/libs/qmljs/qmljslink.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljslink.cpp b/src/libs/qmljs/qmljslink.cpp index e885a6114e0..83f82f81546 100644 --- a/src/libs/qmljs/qmljslink.cpp +++ b/src/libs/qmljs/qmljslink.cpp @@ -41,9 +41,10 @@ #include <QDir> using namespace LanguageUtils; -using namespace QmlJS; using namespace QmlJS::AST; +namespace QmlJS { + namespace { class ImportCacheKey { @@ -76,8 +77,7 @@ bool operator==(const ImportCacheKey &i1, const ImportCacheKey &i2) } } - -class QmlJS::LinkPrivate +class LinkPrivate { public: Snapshot snapshot; @@ -602,3 +602,5 @@ void LinkPrivate::loadImplicitDefaultImports(Imports *imports) imports->append(import); } } + +} // namespace QmlJS |