noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix code formatting (code wasn't clang-formatted)

Browse source 
Shorten "minute" to "m" etc
Fix space-adding inconsistency when adding "seconds"
This commit is contained in:
Rasmus Karlsson 2018-07-11 16:58:57 +02:00
parent 4ea1ed085f
commit 352da60d07
1 changed files with 13 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/messages/Message.cpp
View file

@ -54,18 +54,10 @@ MessagePtr Message::createMessage(const QString &text)
namespace { namespace {
QString makeDuration(int count, const QString &order) void appendDuration(int count, QChar &&order, QString &outString)
{ {
QString text; outString.append(QString::number(count));
outString.append(order);
text.append(QString::number(count));
text.append(" " + order);
if (count > 1) {
text.append("s");
}
return text;
} }
QString makeDuration(int timeoutSeconds) QString makeDuration(int timeoutSeconds)
@ -79,22 +71,25 @@ QString makeDuration(int timeoutSeconds)
int hours = timeoutHours % 24; int hours = timeoutHours % 24;
int days = timeoutHours / 24; int days = timeoutHours / 24;
if (days > 0) { if (days > 0) {
res.append(makeDuration(days, "day")); appendDuration(days, 'd', res);
} }
if (hours > 0) { if (hours > 0) {
if (!res.isEmpty() ) if (!res.isEmpty()) {
res.append(" "); res.append(" ");
res.append(makeDuration(hours, "hour")); }
appendDuration(hours, 'h', res);
} }
if (minutes > 0) { if (minutes > 0) {
if (!res.isEmpty() ) if (!res.isEmpty()) {
res.append(" "); res.append(" ");
res.append(makeDuration(minutes, "minute")); }
appendDuration(minutes, 'm', res);
} }
if (seconds > 0) { if (seconds > 0) {
if (!res.endsWith(" ")) if (!res.isEmpty()) {
res.append(" "); res.append(" ");
res.append(makeDuration(seconds, "second")); }
appendDuration(seconds, 's', res);
} }
return res; return res;
} }