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

Misc: 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: I919da493d0629b719d328e5e71c96a29d230dfd1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-03 23:56:02 +02:00
committed by hjk
parent 2f1509aa58
commit 74ed591db3
61 changed files with 247 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qbsprojectmanager/qbsprojectmanagerplugin.cpp
View File

@@ -254,7 +254,7 @@ void QbsProjectManagerPlugin::updateContextActions()
&& m_selectedProject && !m_selectedProject->isParsing()
&& m_selectedNode && m_selectedNode->isEnabled();
bool isFile = m_selectedProject && m_selectedNode && (m_selectedNode->nodeType() == ProjectExplorer::FileNodeType);
bool isFile = m_selectedProject && m_selectedNode && (m_selectedNode->nodeType() == FileNodeType);
bool isProduct = m_selectedProject && m_selectedNode && dynamic_cast<QbsProductNode *>(m_selectedNode->projectNode());
QbsProjectNode *subproject = dynamic_cast<QbsProjectNode *>(m_selectedNode);
bool isSubproject = m_selectedProject && subproject && subproject != m_selectedProject->rootProjectNode();
@@ -318,7 +318,7 @@ void QbsProjectManagerPlugin::updateBuildActions()
m_buildSubproject->setParameter(subprojectName);
}
void QbsProjectManagerPlugin::buildStateChanged(ProjectExplorer::Project *project)
void QbsProjectManagerPlugin::buildStateChanged(Project *project)
{
if (project == m_currentProject)
updateReparseQbsAction();
@@ -445,7 +445,7 @@ void QbsProjectManagerPlugin::buildFiles(QbsProject *project, const QStringList
QTC_ASSERT(project, return);
QTC_ASSERT(!files.isEmpty(), return);
ProjectExplorer::Target *t = project->activeTarget();
Target *t = project->activeTarget();
if (!t)
return;
QbsBuildConfiguration *bc = qobject_cast<QbsBuildConfiguration *>(t->activeBuildConfiguration());
@@ -461,7 +461,7 @@ void QbsProjectManagerPlugin::buildFiles(QbsProject *project, const QStringList
const Core::Id buildStep = ProjectExplorer::Constants::BUILDSTEPS_BUILD;
const QString name = ProjectExplorer::ProjectExplorerPlugin::displayNameForStepId(buildStep);
const QString name = ProjectExplorerPlugin::displayNameForStepId(buildStep);
BuildManager::buildList(bc->stepList(buildStep), name);
bc->setChangedFiles(QStringList());
@@ -479,7 +479,7 @@ void QbsProjectManagerPlugin::buildProducts(QbsProject *project, const QStringLi
QTC_ASSERT(project, return);
QTC_ASSERT(!products.isEmpty(), return);
ProjectExplorer::Target *t = project->activeTarget();
Target *t = project->activeTarget();
if (!t)
return;
QbsBuildConfiguration *bc = qobject_cast<QbsBuildConfiguration *>(t->activeBuildConfiguration());