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

improve static initializers

Browse Source 
Change-Id: I304fdd6627f01fc216c84930da607127c52409d9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tim Jenssen
2016-09-23 15:46:41 +02:00
parent 669d04a686
commit d915b22db9
15 changed files with 119 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/plugins/git/githighlighters.cpp
View File

@@ -37,9 +37,7 @@ static const char CHANGE_PATTERN[] = "\\b[a-f0-9]{7,40}\\b";
GitSubmitHighlighter::GitSubmitHighlighter(QTextEdit * parent) :
TextEditor::SyntaxHighlighter(parent)
{
static QVector<TextEditor::TextStyle> categories;
if (categories.isEmpty())
categories << TextEditor::C_COMMENT;
static const QVector<TextEditor::TextStyle> categories({TextEditor::C_COMMENT});
setTextFormatCategories(categories);
m_keywordPattern.setPattern("^[\\w-]+:");
@@ -98,18 +96,17 @@ GitRebaseHighlighter::GitRebaseHighlighter(QTextDocument *parent) :
m_hashChar('#'),
m_changeNumberPattern(CHANGE_PATTERN)
{
static QVector<TextEditor::TextStyle> categories;
if (categories.isEmpty()) {
categories << TextEditor::C_COMMENT
<< TextEditor::C_DOXYGEN_COMMENT
<< TextEditor::C_STRING
<< TextEditor::C_KEYWORD
<< TextEditor::C_FIELD
<< TextEditor::C_TYPE
<< TextEditor::C_ENUMERATION
<< TextEditor::C_NUMBER
<< TextEditor::C_LABEL;
}
static const QVector<TextEditor::TextStyle> categories({
TextEditor::C_COMMENT,
TextEditor::C_DOXYGEN_COMMENT,
TextEditor::C_STRING,
TextEditor::C_KEYWORD,
TextEditor::C_FIELD,
TextEditor::C_TYPE,
TextEditor::C_ENUMERATION,
TextEditor::C_NUMBER,
TextEditor::C_LABEL
});
setTextFormatCategories(categories);
m_actions << RebaseAction("^(p|pick)\\b", Format_Pick);