Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-31 14:57:35 (GMT) |
| commit | cfbdb43d2cadd40aa87338d41548e4bf89e146e6 (patch) | |
| tree | 18d94153a302445196fc0c18586abf44a1ce4a38 /Swift/Controllers/ChatMessageSummarizer.cpp | |
| parent | 1d545a4a7fb877f021508094b88c1f17b30d8b4e (diff) | |
| download | swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.zip swift-cfbdb43d2cadd40aa87338d41548e4bf89e146e6.tar.bz2 | |
Convert tabs to 4 spaces for all source files
Removed trailing spaces and whitespace on empty lines
in the process.
Changed CheckTabs.py tool to disallow hard tabs in source
files.
Test-Information:
Manually checked 30 random files that the conversion worked
as expected.
Change-Id: I874f99d617bd3d2bb55f02d58f22f58f9b094480
Diffstat (limited to 'Swift/Controllers/ChatMessageSummarizer.cpp')
| -rw-r--r-- | Swift/Controllers/ChatMessageSummarizer.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/Swift/Controllers/ChatMessageSummarizer.cpp b/Swift/Controllers/ChatMessageSummarizer.cpp index a0ae6d1..6b630e7 100644 --- a/Swift/Controllers/ChatMessageSummarizer.cpp +++ b/Swift/Controllers/ChatMessageSummarizer.cpp @@ -15,32 +15,32 @@ using namespace Swift; using namespace std; string ChatMessageSummarizer::getSummary(const string& current, const vector<UnreadPair>& unreads) { - vector<UnreadPair> others; - int currentUnread = 0; - int otherCount = 0; - foreach (UnreadPair unread, unreads) { - if (unread.first == current) { - currentUnread += unread.second; - } else { - if (unread.second > 0) { - otherCount += unread.second; - others.push_back(unread); - } - } - } - string myString(current); + vector<UnreadPair> others; + int currentUnread = 0; + int otherCount = 0; + foreach (UnreadPair unread, unreads) { + if (unread.first == current) { + currentUnread += unread.second; + } else { + if (unread.second > 0) { + otherCount += unread.second; + others.push_back(unread); + } + } + } + string myString(current); - if (currentUnread > 0) { - string result(QT_TRANSLATE_NOOP("", "%1% (%2%)")); - myString = str(format(result) % current % currentUnread); - } + if (currentUnread > 0) { + string result(QT_TRANSLATE_NOOP("", "%1% (%2%)")); + myString = str(format(result) % current % currentUnread); + } - if (others.size() > 1) { - string result(QT_TRANSLATE_NOOP("", "%1% and %2% others (%3%)")); - myString = str(format(result) % myString % others.size() % otherCount); - } else if (!others.empty()) { - string result(QT_TRANSLATE_NOOP("", "%1%; %2% (%3%)")); - myString = str(format(result) % myString % others[0].first % otherCount); - } - return myString; + if (others.size() > 1) { + string result(QT_TRANSLATE_NOOP("", "%1% and %2% others (%3%)")); + myString = str(format(result) % myString % others.size() % otherCount); + } else if (!others.empty()) { + string result(QT_TRANSLATE_NOOP("", "%1%; %2% (%3%)")); + myString = str(format(result) % myString % others[0].first % otherCount); + } + return myString; } |