projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
modernize: Use braced-init list when returning types
[quassel.git]
/
src
/
uisupport
/
qssparser.cpp
diff --git
a/src/uisupport/qssparser.cpp
b/src/uisupport/qssparser.cpp
index
ff47c05
..
61679d9
100644
(file)
--- a/
src/uisupport/qssparser.cpp
+++ b/
src/uisupport/qssparser.cpp
@@
-293,6
+293,8
@@
std::pair<UiStyle::FormatType, UiStyle::MessageLabel> QssParser::parseFormatType
label |= MessageLabel::Highlight;
else if (condValue == "selected")
label |= MessageLabel::Selected;
label |= MessageLabel::Highlight;
else if (condValue == "selected")
label |= MessageLabel::Selected;
+ else if (condValue == "hovered")
+ label |= MessageLabel::Hovered;
else {
qWarning() << Q_FUNC_INFO << tr("Invalid message label: %1").arg(condValue);
return invalid;
else {
qWarning() << Q_FUNC_INFO << tr("Invalid message label: %1").arg(condValue);
return invalid;
@@
-628,7
+630,7
@@
QColor QssParser::parseColor(const QString &str)
if (str.startsWith("rgba")) {
ColorTuple tuple = parseColorTuple(str.mid(4));
if (tuple.count() == 4)
if (str.startsWith("rgba")) {
ColorTuple tuple = parseColorTuple(str.mid(4));
if (tuple.count() == 4)
- return QColor(tuple.at(0), tuple.at(1), tuple.at(2), tuple.at(3));
+ return QColor(tuple.at(0), tuple.at(1), tuple.at(2), tuple.at(3));
// NOLINT(modernize-return-braced-init-list)
}
else if (str.startsWith("rgb")) {
ColorTuple tuple = parseColorTuple(str.mid(3));
}
else if (str.startsWith("rgb")) {
ColorTuple tuple = parseColorTuple(str.mid(3));