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

15
src/plugins/texteditor/syntaxhighlighter.cpp
View File

@@ -41,9 +41,9 @@
#include <math.h>
using namespace TextEditor;
namespace TextEditor {
class TextEditor::SyntaxHighlighterPrivate
class SyntaxHighlighterPrivate
{
SyntaxHighlighter *q_ptr;
Q_DECLARE_PUBLIC(SyntaxHighlighter)
@@ -74,7 +74,7 @@ public:
}
void applyFormatChanges(int from, int charsRemoved, int charsAdded);
void updateFormatsForCategories(const TextEditor::FontSettings &fontSettings);
void updateFormatsForCategories(const FontSettings &fontSettings);
QVector<QTextCharFormat> formatChanges;
QTextBlock currentBlock;
@@ -82,7 +82,7 @@ public:
bool inReformatBlocks;
TextDocumentLayout::FoldValidator foldValidator;
QVector<QTextCharFormat> formats;
QVector<TextEditor::TextStyle> formatCategories;
QVector<TextStyle> formatCategories;
};
static bool adjustRange(QTextLayout::FormatRange &range, int from, int charsRemoved, int charsAdded) {
@@ -735,13 +735,13 @@ QList<QColor> SyntaxHighlighter::generateColors(int n, const QColor &background)
return result;
}
void SyntaxHighlighter::setFontSettings(const TextEditor::FontSettings &fontSettings)
void SyntaxHighlighter::setFontSettings(const FontSettings &fontSettings)
{
Q_D(SyntaxHighlighter);
d->updateFormatsForCategories(fontSettings);
}
void SyntaxHighlighter::setTextFormatCategories(const QVector<TextEditor::TextStyle> &categories)
void SyntaxHighlighter::setTextFormatCategories(const QVector<TextStyle> &categories)
{
Q_D(SyntaxHighlighter);
d->formatCategories = categories;
@@ -756,10 +756,11 @@ QTextCharFormat SyntaxHighlighter::formatForCategory(int category) const
return d->formats.at(category);
}
void SyntaxHighlighterPrivate::updateFormatsForCategories(const TextEditor::FontSettings &fontSettings)
void SyntaxHighlighterPrivate::updateFormatsForCategories(const FontSettings &fontSettings)
{
formats = fontSettings.toTextCharFormats(formatCategories);
}
} // namespace TextEditor
#include "moc_syntaxhighlighter.cpp"