Skip to content

Commit 33511ee

Browse files
committed
CodeEditorStyle: fixed naming-varname selfcheck warnings
1 parent 967e618 commit 33511ee

File tree

2 files changed

+34
-52
lines changed

2 files changed

+34
-52
lines changed

gui/codeeditorstyle.cpp

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -22,40 +22,31 @@
2222
#include <QVariant>
2323

2424
CodeEditorStyle::CodeEditorStyle(
25-
// cppcheck-suppress naming-varname - TODO: fix this
26-
QColor CtrlFGColor, QColor CtrlBGColor,
27-
// cppcheck-suppress naming-varname - TODO: fix this
28-
QColor HiLiBGColor,
29-
// cppcheck-suppress naming-varname - TODO: fix this
30-
QColor LnNumFGColor, QColor LnNumBGColor,
31-
// cppcheck-suppress naming-varname - TODO: fix this
32-
QColor KeyWdFGColor, QFont::Weight KeyWdWeight,
33-
// cppcheck-suppress naming-varname - TODO: fix this
34-
QColor ClsFGColor, QFont::Weight ClsWeight,
35-
// cppcheck-suppress naming-varname - TODO: fix this
36-
QColor QteFGColor, QFont::Weight QteWeight,
37-
// cppcheck-suppress naming-varname - TODO: fix this
38-
QColor CmtFGColor, QFont::Weight CmtWeight,
39-
// cppcheck-suppress naming-varname - TODO: fix this
40-
QColor SymbFGColor, QColor SymbBGColor,
41-
// cppcheck-suppress naming-varname - TODO: fix this
42-
QFont::Weight SymbWeight) :
43-
widgetFGColor(CtrlFGColor),
44-
widgetBGColor(CtrlBGColor),
45-
highlightBGColor(HiLiBGColor),
46-
lineNumFGColor(LnNumFGColor),
47-
lineNumBGColor(LnNumBGColor),
48-
keywordColor(KeyWdFGColor),
49-
keywordWeight(KeyWdWeight),
50-
classColor(ClsFGColor),
51-
classWeight(ClsWeight),
52-
quoteColor(QteFGColor),
53-
quoteWeight(QteWeight),
54-
commentColor(CmtFGColor),
55-
commentWeight(CmtWeight),
56-
symbolFGColor(SymbFGColor),
57-
symbolBGColor(SymbBGColor),
58-
symbolWeight(SymbWeight)
25+
QColor ctrlFGColor, QColor ctrlBGColor,
26+
QColor hiLiBGColor,
27+
QColor lnNumFGColor, QColor lnNumBGColor,
28+
QColor keyWdFGColor, QFont::Weight keyWdWeight,
29+
QColor clsFGColor, QFont::Weight clsWeight,
30+
QColor qteFGColor, QFont::Weight qteWeight,
31+
QColor cmtFGColor, QFont::Weight cmtWeight,
32+
QColor symbFGColor, QColor symbBGColor,
33+
QFont::Weight symbWeight) :
34+
widgetFGColor(ctrlFGColor),
35+
widgetBGColor(ctrlBGColor),
36+
highlightBGColor(hiLiBGColor),
37+
lineNumFGColor(lnNumFGColor),
38+
lineNumBGColor(lnNumBGColor),
39+
keywordColor(keyWdFGColor),
40+
keywordWeight(keyWdWeight),
41+
classColor(clsFGColor),
42+
classWeight(clsWeight),
43+
quoteColor(qteFGColor),
44+
quoteWeight(qteWeight),
45+
commentColor(cmtFGColor),
46+
commentWeight(cmtWeight),
47+
symbolFGColor(symbFGColor),
48+
symbolBGColor(symbBGColor),
49+
symbolWeight(symbWeight)
5950
{}
6051

6152
bool CodeEditorStyle::operator==(const CodeEditorStyle& rhs) const

gui/codeeditorstyle.h

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,15 @@ class QSettings;
5151
class CodeEditorStyle {
5252
public:
5353
explicit CodeEditorStyle(
54-
// cppcheck-suppress naming-varname - TODO: fix this
55-
QColor CtrlFGColor, QColor CtrlBGColor,
56-
// cppcheck-suppress naming-varname - TODO: fix this
57-
QColor HiLiBGColor,
58-
// cppcheck-suppress naming-varname - TODO: fix this
59-
QColor LnNumFGColor, QColor LnNumBGColor,
60-
// cppcheck-suppress naming-varname - TODO: fix this
61-
QColor KeyWdFGColor, QFont::Weight KeyWdWeight,
62-
// cppcheck-suppress naming-varname - TODO: fix this
63-
QColor ClsFGColor, QFont::Weight ClsWeight,
64-
// cppcheck-suppress naming-varname - TODO: fix this
65-
QColor QteFGColor, QFont::Weight QteWeight,
66-
// cppcheck-suppress naming-varname - TODO: fix this
67-
QColor CmtFGColor, QFont::Weight CmtWeight,
68-
// cppcheck-suppress naming-varname - TODO: fix this
69-
QColor SymbFGColor, QColor SymbBGColor,
70-
// cppcheck-suppress naming-varname - TODO: fix this
71-
QFont::Weight SymbWeight);
54+
QColor ctrlFGColor, QColor ctrlBGColor,
55+
QColor hiLiBGColor,
56+
QColor lnNumFGColor, QColor lnNumBGColor,
57+
QColor keyWdFGColor, QFont::Weight keyWdWeight,
58+
QColor clsFGColor, QFont::Weight clsWeight,
59+
QColor qteFGColor, QFont::Weight qteWeight,
60+
QColor cmtFGColor, QFont::Weight cmtWeight,
61+
QColor symbFGColor, QColor symbBGColor,
62+
QFont::Weight symbWeight);
7263

7364
bool operator==(const CodeEditorStyle& rhs) const;
7465
bool operator!=(const CodeEditorStyle& rhs) const;

0 commit comments

Comments
 (0)