From 74ed591db3369b925eb3319511beadab9a61f25a Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 3 Feb 2015 23:56:02 +0200 Subject: 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 Reviewed-by: hjk --- src/plugins/help/helpfindsupport.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/plugins/help/helpfindsupport.cpp') diff --git a/src/plugins/help/helpfindsupport.cpp b/src/plugins/help/helpfindsupport.cpp index a5c32c2948..253febab19 100644 --- a/src/plugins/help/helpfindsupport.cpp +++ b/src/plugins/help/helpfindsupport.cpp @@ -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; -- cgit v1.2.1