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

C++: 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: I6fbe13ddc1485efe95c3156097bf41d90c0febac
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-04 17:01:07 +02:00
committed by Orgad Shaneh
parent f5225c0928
commit 65e7db42b8
54 changed files with 303 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/cpptools/cppcodeformatter.cpp
View File

@@ -703,7 +703,7 @@ int CodeFormatter::tokenCount() const
return m_tokens.size();
}
const CPlusPlus::Token &CodeFormatter::currentToken() const
const Token &CodeFormatter::currentToken() const
{
return m_currentToken;
}
@@ -1111,7 +1111,7 @@ void CodeFormatter::dump() const
namespace CppTools {
namespace Internal {
class CppCodeFormatterData: public TextEditor::CodeFormatterData
class CppCodeFormatterData: public CodeFormatterData
{
public:
CodeFormatter::BlockData m_data;
@@ -1123,7 +1123,7 @@ QtStyleCodeFormatter::QtStyleCodeFormatter()
{
}
QtStyleCodeFormatter::QtStyleCodeFormatter(const TextEditor::TabSettings &tabSettings,
QtStyleCodeFormatter::QtStyleCodeFormatter(const TabSettings &tabSettings,
const CppCodeStyleSettings &settings)
: m_tabSettings(tabSettings)
, m_styleSettings(settings)
@@ -1131,7 +1131,7 @@ QtStyleCodeFormatter::QtStyleCodeFormatter(const TextEditor::TabSettings &tabSet
setTabSize(tabSettings.m_tabSize);
}
void QtStyleCodeFormatter::setTabSettings(const TextEditor::TabSettings &tabSettings)
void QtStyleCodeFormatter::setTabSettings(const TabSettings &tabSettings)
{
m_tabSettings = tabSettings;
setTabSize(tabSettings.m_tabSize);