From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 9 Sep 2018 22:11:38 +0000 (+0200)
Subject: modernize: Use ranged-for loops in some obvious cases
X-Git-Tag: test-travis-01~133
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=714b39660fe19e7f092880019429c8da76ee2bd5;ds=sidebyside

modernize: Use ranged-for loops in some obvious cases

Some old-style loops can be automatically converted by clang-tidy
to use ranged-for.
---

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 4a9165a3..c6d50c11 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -107,17 +107,17 @@ QString decodeString(const QByteArray &input, QTextCodec *codec)
     // Q_ASSERT(sizeof(const char) == sizeof(quint8));  // In God we trust...
     bool isUtf8 = true;
     int cnt = 0;
-    for (int i = 0; i < input.size(); i++) {
+    for (uchar c : input) {
         if (cnt) {
             // We check a part of a multibyte char. These need to be of the form 10yyyyyy.
-            if ((input[i] & 0xc0) != 0x80) { isUtf8 = false; break; }
+            if ((c & 0xc0) != 0x80) { isUtf8 = false; break; }
             cnt--;
             continue;
         }
-        if ((input[i] & 0x80) == 0x00) continue;  // 7 bit is always ok
-        if ((input[i] & 0xf8) == 0xf0) { cnt = 3; continue; } // 4-byte char 11110xxx 10yyyyyy 10zzzzzz 10vvvvvv
-        if ((input[i] & 0xf0) == 0xe0) { cnt = 2; continue; } // 3-byte char 1110xxxx 10yyyyyy 10zzzzzz
-        if ((input[i] & 0xe0) == 0xc0) { cnt = 1; continue; } // 2-byte char 110xxxxx 10yyyyyy
+        if ((c & 0x80) == 0x00) continue;  // 7 bit is always ok
+        if ((c & 0xf8) == 0xf0) { cnt = 3; continue; } // 4-byte char 11110xxx 10yyyyyy 10zzzzzz 10vvvvvv
+        if ((c & 0xf0) == 0xe0) { cnt = 2; continue; } // 3-byte char 1110xxxx 10yyyyyy 10zzzzzz
+        if ((c & 0xe0) == 0xc0) { cnt = 1; continue; } // 2-byte char 110xxxxx 10yyyyyy
         isUtf8 = false; break; // 8 bit char, but not utf8!
     }
     if (isUtf8 && cnt == 0) {
@@ -179,18 +179,17 @@ QString secondsToString(int timeInSeconds)
 
     if (timeInSeconds != 0) {
         QStringList returnString;
-        for (int i = 0; i < timeUnit.size(); i++) {
-            int n = timeInSeconds / timeUnit[i].first;
+        for (const auto &tu : timeUnit) {
+            int n = timeInSeconds / tu.first;
             if (n > 0) {
-                returnString += QString("%1 %2").arg(QString::number(n), timeUnit[i].second);
+                returnString += QString("%1 %2").arg(QString::number(n), tu.second);
             }
-            timeInSeconds = timeInSeconds % timeUnit[i].first;
+            timeInSeconds = timeInSeconds % tu.first;
         }
         return returnString.join(", ");
     }
-    else {
-        return QString("%1 %2").arg(QString::number(timeInSeconds), timeUnit.last().second);
-    }
+
+    return QString("%1 %2").arg(QString::number(timeInSeconds), timeUnit.last().second);
 }
 
 
diff --git a/src/core/corenetwork.cpp b/src/core/corenetwork.cpp
index f0a4e306..29f10f06 100644
--- a/src/core/corenetwork.cpp
+++ b/src/core/corenetwork.cpp
@@ -814,20 +814,20 @@ void CoreNetwork::updateIssuedModes(const QString &requestedModes)
     QString removeModes;
     bool addMode = true;
 
-    for (int i = 0; i < requestedModes.length(); i++) {
-        if (requestedModes[i] == '+') {
+    for (auto requestedMode : requestedModes) {
+        if (requestedMode == '+') {
             addMode = true;
             continue;
         }
-        if (requestedModes[i] == '-') {
+        if (requestedMode == '-') {
             addMode = false;
             continue;
         }
         if (addMode) {
-            addModes += requestedModes[i];
+            addModes += requestedMode;
         }
         else {
-            removeModes += requestedModes[i];
+            removeModes += requestedMode;
         }
     }
 
diff --git a/src/core/coresessioneventprocessor.cpp b/src/core/coresessioneventprocessor.cpp
index 31e7cf2f..e0fa8921 100644
--- a/src/core/coresessioneventprocessor.cpp
+++ b/src/core/coresessioneventprocessor.cpp
@@ -459,17 +459,17 @@ void CoreSessionEventProcessor::processIrcEventMode(IrcEvent *e)
         QString modes = e->params()[1];
         bool add = true;
         int paramOffset = 2;
-        for (int c = 0; c < modes.length(); c++) {
-            if (modes[c] == '+') {
+        for (auto mode : modes) {
+            if (mode == '+') {
                 add = true;
                 continue;
             }
-            if (modes[c] == '-') {
+            if (mode == '-') {
                 add = false;
                 continue;
             }
 
-            if (e->network()->prefixModes().contains(modes[c])) {
+            if (e->network()->prefixModes().contains(mode)) {
                 // user channel modes (op, voice, etc...)
                 if (paramOffset < e->params().count()) {
                     IrcUser *ircUser = e->network()->ircUser(e->params()[paramOffset]);
@@ -483,15 +483,15 @@ void CoreSessionEventProcessor::processIrcEventMode(IrcEvent *e)
                             foreach(Netsplit* n, _netsplits.value(e->network())) {
                                 handledByNetsplit = n->userAlreadyJoined(ircUser->hostmask(), channel->name());
                                 if (handledByNetsplit) {
-                                    n->addMode(ircUser->hostmask(), channel->name(), QString(modes[c]));
+                                    n->addMode(ircUser->hostmask(), channel->name(), QString(mode));
                                     break;
                                 }
                             }
                             if (!handledByNetsplit)
-                                channel->addUserMode(ircUser, QString(modes[c]));
+                                channel->addUserMode(ircUser, QString(mode));
                         }
                         else
-                            channel->removeUserMode(ircUser, QString(modes[c]));
+                            channel->removeUserMode(ircUser, QString(mode));
                     }
                 }
                 else {
@@ -502,7 +502,7 @@ void CoreSessionEventProcessor::processIrcEventMode(IrcEvent *e)
             else {
                 // regular channel modes
                 QString value;
-                Network::ChannelModeType modeType = e->network()->channelModeType(modes[c]);
+                Network::ChannelModeType modeType = e->network()->channelModeType(mode);
                 if (modeType == Network::A_CHANMODE || modeType == Network::B_CHANMODE || (modeType == Network::C_CHANMODE && add)) {
                     if (paramOffset < e->params().count()) {
                         value = e->params()[paramOffset];
@@ -514,9 +514,9 @@ void CoreSessionEventProcessor::processIrcEventMode(IrcEvent *e)
                 }
 
                 if (add)
-                    channel->addChannelMode(modes[c], value);
+                    channel->addChannelMode(mode, value);
                 else
-                    channel->removeChannelMode(modes[c], value);
+                    channel->removeChannelMode(mode, value);
             }
         }
     }
diff --git a/src/qtui/statusnotifieritemdbus.cpp b/src/qtui/statusnotifieritemdbus.cpp
index e13af94a..cd4c4cf9 100644
--- a/src/qtui/statusnotifieritemdbus.cpp
+++ b/src/qtui/statusnotifieritemdbus.cpp
@@ -85,8 +85,8 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, DBusImageStruct &
 const QDBusArgument &operator<<(QDBusArgument &argument, const DBusImageVector &iconVector)
 {
     argument.beginArray(qMetaTypeId<DBusImageStruct>());
-    for (int i = 0; i < iconVector.size(); ++i) {
-        argument << iconVector[i];
+    for (const auto &i : iconVector) {
+        argument << i;
     }
     argument.endArray();
     return argument;