diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-02-03 23:48:57 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2015-02-18 09:53:25 +0000 |
commit | b6de2d1bd813055f77e6f43cfda9ff609d7b845d (patch) | |
tree | 17577afbd5ab45399bbfe14e24650154665af9d0 /src/plugins/qmljstools/qmljsmodelmanager.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 <Thomas.Hartmann@digia.com>
Diffstat (limited to 'src/plugins/qmljstools/qmljsmodelmanager.cpp')
-rw-r--r-- | src/plugins/qmljstools/qmljsmodelmanager.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp index 83698a91d39..fb8721fe217 100644 --- a/src/plugins/qmljstools/qmljsmodelmanager.cpp +++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp @@ -71,7 +71,7 @@ using namespace QmlJSTools; using namespace QmlJSTools::Internal; -ModelManagerInterface::ProjectInfo QmlJSTools::Internal::ModelManager::defaultProjectInfoForProject( +ModelManagerInterface::ProjectInfo ModelManager::defaultProjectInfoForProject( ProjectExplorer::Project *project) const { ModelManagerInterface::ProjectInfo projectInfo(project); @@ -171,9 +171,9 @@ void QmlJSTools::setupProjectInfoQmlBundles(ModelManagerInterface::ProjectInfo & } } -QHash<QString,QmlJS::Dialect> ModelManager::languageForSuffix() const +QHash<QString,Dialect> ModelManager::languageForSuffix() const { - QHash<QString,QmlJS::Dialect> res = ModelManagerInterface::languageForSuffix(); + QHash<QString,Dialect> res = ModelManagerInterface::languageForSuffix(); if (ICore::instance()) { Utils::MimeDatabase mdb; @@ -223,7 +223,7 @@ void ModelManager::delayedInitialization() connect(ProjectExplorer::SessionManager::instance(), &ProjectExplorer::SessionManager::startupProjectChanged, this, &ModelManager::updateDefaultProjectInfo); - QmlJS::ViewerContext qbsVContext; + ViewerContext qbsVContext; qbsVContext.language = Dialect::QmlQbs; qbsVContext.maybeAddPath(ICore::resourcePath() + QLatin1String("/qbs")); setDefaultVContext(qbsVContext); |