Misc: 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: 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

View File

@@ -48,10 +48,10 @@ CallgrindRunControl::CallgrindRunControl(const AnalyzerStartParameters &sp,
: ValgrindRunControl(sp, runConfiguration)
, m_markAsPaused(false)
{
connect(&m_runner, &Valgrind::Callgrind::CallgrindRunner::finished,
connect(&m_runner, &Callgrind::CallgrindRunner::finished,
this, &CallgrindRunControl::slotFinished);
connect(m_runner.parser(), SIGNAL(parserDataReady()), this, SLOT(slotFinished()));
connect(&m_runner, &Valgrind::Callgrind::CallgrindRunner::statusMessage,
connect(&m_runner, &Callgrind::CallgrindRunner::statusMessage,
this, &CallgrindRunControl::showStatusMessage);
}
@@ -93,7 +93,7 @@ QString CallgrindRunControl::progressTitle() const
return tr("Profiling");
}
Valgrind::ValgrindRunner * CallgrindRunControl::runner()
ValgrindRunner * CallgrindRunControl::runner()
{
return &m_runner;
}
@@ -106,7 +106,7 @@ bool CallgrindRunControl::startEngine()
void CallgrindRunControl::dump()
{
m_runner.controller()->run(Valgrind::Callgrind::CallgrindController::Dump);
m_runner.controller()->run(Callgrind::CallgrindController::Dump);
}
void CallgrindRunControl::setPaused(bool paused)
@@ -135,20 +135,20 @@ void CallgrindRunControl::setToggleCollectFunction(const QString &toggleCollectF
void CallgrindRunControl::reset()
{
m_runner.controller()->run(Valgrind::Callgrind::CallgrindController::ResetEventCounters);
m_runner.controller()->run(Callgrind::CallgrindController::ResetEventCounters);
}
void CallgrindRunControl::pause()
{
m_runner.controller()->run(Valgrind::Callgrind::CallgrindController::Pause);
m_runner.controller()->run(Callgrind::CallgrindController::Pause);
}
void CallgrindRunControl::unpause()
{
m_runner.controller()->run(Valgrind::Callgrind::CallgrindController::UnPause);
m_runner.controller()->run(Callgrind::CallgrindController::UnPause);
}
Valgrind::Callgrind::ParseData *CallgrindRunControl::takeParserData()
Callgrind::ParseData *CallgrindRunControl::takeParserData()
{
return m_runner.parser()->takeData();
}