feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Remove unneeded qualifications

Browse Source 
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>
This commit is contained in:
Orgad Shaneh
2015-02-03 23:48:57 +02:00
committed by Orgad Shaneh
parent 42af154c77
commit b6de2d1bd8
55 changed files with 319 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmljstools/qmljsmodelmanager.cpp
View File

@@ -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);