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

TextEditor: 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: Ief087658e2adc337ee02c49f0fb406597114df07
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:46:35 +02:00
committed by hjk
parent 69ac7f8d1e
commit b556ba5002
22 changed files with 109 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/texteditor/codestylepool.cpp
View File

@@ -158,7 +158,7 @@ ICodeStylePreferences *CodeStylePool::createCodeStyle(const QByteArray &id, cons
if (!d->m_factory)
return 0;
TextEditor::ICodeStylePreferences *codeStyle = d->m_factory->createCodeStyle();
ICodeStylePreferences *codeStyle = d->m_factory->createCodeStyle();
codeStyle->setId(id);
codeStyle->setTabSettings(tabSettings);
codeStyle->setValue(codeStyleData);
@@ -230,7 +230,7 @@ void CodeStylePool::loadCustomCodeStyles()
ICodeStylePreferences *CodeStylePool::importCodeStyle(const Utils::FileName &fileName)
{
TextEditor::ICodeStylePreferences *codeStyle = loadCodeStyle(fileName);
ICodeStylePreferences *codeStyle = loadCodeStyle(fileName);
if (codeStyle)
saveCodeStyle(codeStyle);
return codeStyle;
@@ -238,7 +238,7 @@ ICodeStylePreferences *CodeStylePool::importCodeStyle(const Utils::FileName &fil
ICodeStylePreferences *CodeStylePool::loadCodeStyle(const Utils::FileName &fileName)
{
TextEditor::ICodeStylePreferences *codeStyle = 0;
ICodeStylePreferences *codeStyle = 0;
Utils::PersistentSettingsReader reader;
reader.load(fileName);
QVariantMap m = reader.restoreValues();