X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Futil.cpp;h=695ca4ad87b273087aaf19436453b7cf8239a129;hp=8b1139e9475cb0005cd4b2f54b145edcf118685e;hb=b06a827aea68b050bf23c37e0162189a94595ee9;hpb=41686743dca5b254a6f53a4a9e8f8b8d91acd041

diff --git a/src/common/util.cpp b/src/common/util.cpp
index 8b1139e9..695ca4ad 100644
--- a/src/common/util.cpp
+++ b/src/common/util.cpp
@@ -20,57 +20,59 @@
 
 #include "util.h"
 
+#include <algorithm>
+#include <array>
+#include <utility>
+
 #include <QCoreApplication>
+#include <QDateTime>
 #include <QDebug>
-#include <QFile>
 #include <QTextCodec>
+#include <QVector>
 
 #include "quassel.h"
 
-class QMetaMethod;
-
 // MIBenum values from http://www.iana.org/assignments/character-sets/character-sets.xml#table-character-sets-1
 static QList<int> utf8DetectionBlacklist = QList<int>()
     << 39 /* ISO-2022-JP */;
 
-QString nickFromMask(QString mask)
+QString nickFromMask(const QString &mask)
 {
-    return mask.section('!', 0, 0);
+    return mask.left(mask.indexOf('!'));
 }
 
 
-QString userFromMask(QString mask)
+QString userFromMask(const QString &mask)
 {
-    QString userhost = mask.section('!', 1);
-    if (userhost.isEmpty()) return QString();
-    return userhost.section('@', 0, 0);
+    const int offset = mask.indexOf('!') + 1;
+    if (offset <= 0)
+        return {};
+    const int length = mask.indexOf('@', offset) - offset;
+    return mask.mid(offset, length >= 0 ? length : -1);
 }
 
 
-QString hostFromMask(QString mask)
+QString hostFromMask(const QString &mask)
 {
-    QString userhost = mask.section('!', 1);
-    if (userhost.isEmpty()) return QString();
-    return userhost.section('@', 1);
+    const int excl = mask.indexOf('!');
+    if (excl < 0)
+        return {};
+    const int offset = mask.indexOf('@', excl + 1) + 1;
+    return offset > 0 && offset < mask.size() ? mask.mid(offset) : QString{};
 }
 
 
-bool isChannelName(QString str)
+bool isChannelName(const QString &str)
 {
-    return QString("#&!+").contains(str[0]);
+    static constexpr std::array<QChar, 4> prefixes{{'#', '&', '!', '+'}};
+    return std::any_of(prefixes.cbegin(), prefixes.cend(), [&str](QChar c) { return c == str[0]; });
 }
 
 
-QString stripFormatCodes(QString str)
+QString stripFormatCodes(QString message)
 {
-    str.remove(QRegExp("\x03(\\d\\d?(,\\d\\d?)?)?"));
-    str.remove('\x02');
-    str.remove('\x0f');
-    str.remove('\x12');
-    str.remove('\x16');
-    str.remove('\x1d');
-    str.remove('\x1f');
-    return str;
+    static QRegExp regEx{"\x03(\\d\\d?(,\\d\\d?)?)?|[\x02\x0f\x12\x16\x1d\x1f]"};
+    return message.remove(regEx);
 }
 
 
@@ -165,12 +167,13 @@ uint editingDistance(const QString &s1, const QString &s2)
 
 QString secondsToString(int timeInSeconds)
 {
-    QList<QPair<int, QString> > timeUnit;
-    timeUnit.append(qMakePair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")));
-    timeUnit.append(qMakePair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")));
-    timeUnit.append(qMakePair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")));
-    timeUnit.append(qMakePair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")));
-    timeUnit.append(qMakePair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec")));
+    static QVector<std::pair<int, QString>> timeUnit {
+        std::make_pair(365*24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "year")),
+        std::make_pair(24*60*60, QCoreApplication::translate("Quassel::secondsToString()", "day")),
+        std::make_pair(60*60, QCoreApplication::translate("Quassel::secondsToString()", "h")),
+        std::make_pair(60, QCoreApplication::translate("Quassel::secondsToString()", "min")),
+        std::make_pair(1, QCoreApplication::translate("Quassel::secondsToString()", "sec"))
+    };
 
     if (timeInSeconds != 0) {
         QStringList returnString;