From 65e7db42b85cfbc7e41d249ee757b45c84daae59 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 4 Feb 2015 17:01:07 +0200
Subject: C++: 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: I6fbe13ddc1485efe95c3156097bf41d90c0febac
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
---
 src/plugins/cpptools/cpptoolssettings.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/plugins/cpptools/cpptoolssettings.cpp')

diff --git a/src/plugins/cpptools/cpptoolssettings.cpp b/src/plugins/cpptools/cpptoolssettings.cpp
index 366769b3d7..efc20ca8f4 100644
--- a/src/plugins/cpptools/cpptoolssettings.cpp
+++ b/src/plugins/cpptools/cpptoolssettings.cpp
@@ -84,13 +84,13 @@ CppToolsSettings::CppToolsSettings(QObject *parent)
 
     qRegisterMetaType<CppTools::CppCodeStyleSettings>("CppTools::CppCodeStyleSettings");
 
-    QSettings *s = Core::ICore::settings();
+    QSettings *s = ICore::settings();
     d->m_commentsSettings.fromSettings(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP), s);
     d->m_completionSettingsPage = new CompletionSettingsPage(this);
     ExtensionSystem::PluginManager::addObject(d->m_completionSettingsPage);
 
     // code style factory
-    ICodeStylePreferencesFactory *factory = new CppTools::CppCodeStylePreferencesFactory();
+    ICodeStylePreferencesFactory *factory = new CppCodeStylePreferencesFactory();
     TextEditorSettings::registerCodeStyleFactory(factory);
 
     // code style pool
@@ -206,7 +206,7 @@ CppToolsSettings::CppToolsSettings(QObject *parent)
             // create custom code style out of old settings
             QVariant v;
             v.setValue(legacyCodeStyleSettings);
-            TextEditor::ICodeStylePreferences *oldCreator = pool->createCodeStyle(
+            ICodeStylePreferences *oldCreator = pool->createCodeStyle(
                      "legacy", legacyTabSettings, v, tr("Old Creator"));
 
             // change the current delegate and save
@@ -261,7 +261,7 @@ void CppToolsSettings::setCommentsSettings(const CommentsSettings &commentsSetti
 
     d->m_commentsSettings = commentsSettings;
     d->m_commentsSettings.toSettings(QLatin1String(Constants::CPPTOOLS_SETTINGSGROUP),
-                                     Core::ICore::settings());
+                                     ICore::settings());
 }
 
 static QString sortEditorDocumentOutlineKey()
-- 
cgit v1.2.1