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

12
src/plugins/help/helpfindsupport.cpp
View File

@@ -41,7 +41,7 @@ HelpViewerFindSupport::HelpViewerFindSupport(HelpViewer *viewer)
{
}
Core::FindFlags HelpViewerFindSupport::supportedFindFlags() const
FindFlags HelpViewerFindSupport::supportedFindFlags() const
{
return FindBackward | FindCaseSensitively;
}
@@ -52,23 +52,23 @@ QString HelpViewerFindSupport::currentFindString() const
return m_viewer->selectedText();
}
Core::IFindSupport::Result HelpViewerFindSupport::findIncremental(const QString &txt,
Core::FindFlags findFlags)
IFindSupport::Result HelpViewerFindSupport::findIncremental(const QString &txt,
FindFlags findFlags)
{
QTC_ASSERT(m_viewer, return NotFound);
findFlags &= ~FindBackward;
return find(txt, findFlags, true) ? Found : NotFound;
}
Core::IFindSupport::Result HelpViewerFindSupport::findStep(const QString &txt,
Core::FindFlags findFlags)
IFindSupport::Result HelpViewerFindSupport::findStep(const QString &txt,
FindFlags findFlags)
{
QTC_ASSERT(m_viewer, return NotFound);
return find(txt, findFlags, false) ? Found : NotFound;
}
bool HelpViewerFindSupport::find(const QString &txt,
Core::FindFlags findFlags, bool incremental)
FindFlags findFlags, bool incremental)
{
QTC_ASSERT(m_viewer, return false);
bool wrapped = false;