d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-10-30 09:30:47 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use C++11 braced list style (#121)

Browse source
This commit is contained in:
Benjamin Saunders 2017-11-05 13:04:55 -08:00 committed by mujx
parent 4ccb5ed81f
commit 5bd5555a51
25 changed files with 1517 additions and 1515 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.clang-format
View file

@ -1,5 +1,6 @@
--- ---
Language: Cpp Language: Cpp
Standard: Cpp11
AccessModifierOffset: -8 AccessModifierOffset: -8
AlignAfterOpenBracket: Align AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: true AlignConsecutiveAssignments: true
@ -10,3 +11,4 @@ IndentCaseLabels: false
IndentWidth: 8 IndentWidth: 8
KeepEmptyLinesAtTheStartOfBlocks: false KeepEmptyLinesAtTheStartOfBlocks: false
PointerAlignment: Right PointerAlignment: Right
Cpp11BracedListStyle: true

15
src/EmojiProvider.cc
View file

@ -530,16 +530,11 @@ const QList<Emoji> EmojiProvider::activity = {
Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb4\xf0\x9f\x8f\xbe"), ":bicyclist_tone4:"}, Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb4\xf0\x9f\x8f\xbe"), ":bicyclist_tone4:"},
Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb4\xf0\x9f\x8f\xbf"), ":bicyclist_tone5:"}, Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb4\xf0\x9f\x8f\xbf"), ":bicyclist_tone5:"},
Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb5"), ":mountain_bicyclist:"}, Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb5"), ":mountain_bicyclist:"},
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbb"), Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbb"), ":mountain_bicyclist_tone1:"},
":mountain_bicyclist_tone1:" }, Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbc"), ":mountain_bicyclist_tone2:"},
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbc"), Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbd"), ":mountain_bicyclist_tone3:"},
":mountain_bicyclist_tone2:" }, Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbe"), ":mountain_bicyclist_tone4:"},
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbd"), Emoji{QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbf"), ":mountain_bicyclist_tone5:"},
":mountain_bicyclist_tone3:" },
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbe"),
":mountain_bicyclist_tone4:" },
Emoji{ QString::fromUtf8("\xf0\x9f\x9a\xb5\xf0\x9f\x8f\xbf"),
":mountain_bicyclist_tone5:" },
Emoji{QString::fromUtf8("\xf0\x9f\xa4\xb8"), ":cartwheel:"}, Emoji{QString::fromUtf8("\xf0\x9f\xa4\xb8"), ":cartwheel:"},
Emoji{QString::fromUtf8("\xf0\x9f\xa4\xb8\xf0\x9f\x8f\xbb"), ":cartwheel_tone1:"}, Emoji{QString::fromUtf8("\xf0\x9f\xa4\xb8\xf0\x9f\x8f\xbb"), ":cartwheel_tone1:"},
Emoji{QString::fromUtf8("\xf0\x9f\xa4\xb8\xf0\x9f\x8f\xbc"), ":cartwheel_tone2:"}, Emoji{QString::fromUtf8("\xf0\x9f\xa4\xb8\xf0\x9f\x8f\xbc"), ":cartwheel_tone2:"},

3
src/TimelineItem.cc
View file

@ -88,8 +88,7 @@ TimelineItem::TimelineItem(events::MessageEventType ty,
descriptionMsg_ = {"", userid, body, descriptiveTime(timestamp)}; descriptionMsg_ = {"", userid, body, descriptiveTime(timestamp)};
} else { } else {
descriptionMsg_ = { descriptionMsg_ = {
"You: ", userid, body, descriptiveTime(QDateTime::currentDateTime()) "You: ", userid, body, descriptiveTime(QDateTime::currentDateTime())};
};
} }
body = body.toHtmlEscaped(); body = body.toHtmlEscaped();

12
src/ui/Theme.cc
View file

@ -56,11 +56,17 @@ Theme::setColor(const QString &key, ui::Color color)
static const QColor palette[] = { static const QColor palette[] = {
QColor("#171919"), QColor("#171919"),
QColor("#EBEBEB"), QColor("#C9C9C9"), QColor("#929292"), QColor("#EBEBEB"),
QColor("#C9C9C9"),
QColor("#929292"),
QColor("#1C3133"), QColor("#577275"), QColor("#46A451"), QColor("#1C3133"),
QColor("#577275"),
QColor("#46A451"),
QColor("#5D6565"), QColor("#E22826"), QColor("#81B3A9"), QColor("#5D6565"),
QColor("#E22826"),
QColor("#81B3A9"),
rgba(0, 0, 0, 0), rgba(0, 0, 0, 0),
}; };