X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fclickable.cpp;h=59510011dbe61a9959da40c790da79c0544f2efd;hp=3b32f267960dc64b868246db80e6c474f879ce73;hb=edc55b1f86cf613a332eeeb5d85537a54120dfa5;hpb=ce26c3770b254362c7bd1e094ba8f8bf22133653

diff --git a/src/uisupport/clickable.cpp b/src/uisupport/clickable.cpp
index 3b32f267..59510011 100644
--- a/src/uisupport/clickable.cpp
+++ b/src/uisupport/clickable.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2014 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,15 +18,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include "clickable.h"
+
 #include <QDesktopServices>
 #include <QModelIndex>
 #include <QUrl>
 
 #include "buffermodel.h"
-#include "clickable.h"
 #include "client.h"
 
-void Clickable::activate(NetworkId networkId, const QString &text) const
+void Clickable::activate(NetworkId networkId, const QString& text) const
 {
     if (!isValid())
         return;
@@ -47,16 +48,15 @@ void Clickable::activate(NetworkId networkId, const QString &text) const
     }
 }
 
-
 // NOTE: This method is not threadsafe and not reentrant!
 //       (RegExps are not constant while matching, and they are static here for efficiency)
-ClickableList ClickableList::fromString(const QString &str)
+ClickableList ClickableList::fromString(const QString& str)
 {
     // For matching URLs
-    static QString scheme("(?:(?:mailto:|(?:[+.-]?\\w)+://)|www(?=\\.\\S+\\.))");
-    static QString authority("(?:(?:[,.;@:]?[-\\w]+)+\\.?|\\[[0-9a-f:.]+\\])(?::\\d+)?");
+    static QString scheme(R"((?:(?:mailto:|(?:[+.-]?\w)+://)|www(?=\.\S+\.)))");
+    static QString authority(R"((?:(?:[,.;@:]?[-\w]+)+\.?|\[[0-9a-f:.]+\])(?::\d+)?)");
     static QString urlChars("(?:[,.;:]*[\\w~@/?&=+$()!%#*-])");
-    static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)");
+    static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)");  // NOLINT(modernize-raw-string-literal)
 
     static QRegExp regExp[] = {
         // URL
@@ -65,18 +65,18 @@ ClickableList ClickableList::fromString(const QString &str)
 
         // Channel name
         // We don't match for channel names starting with + or &, because that gives us a lot of false positives.
-        QRegExp("((?:#|![A-Z0-9]{5})[^,:\\s]+(?::[^,:\\s]+)?)\\b", Qt::CaseInsensitive)
+        QRegExp(R"(((?:#|![A-Z0-9]{5})[^,:\s]+(?::[^,:\s]+)?)\b)", Qt::CaseInsensitive)
 
         // TODO: Nicks, we'll need a filtering for only matching known nicknames further down if we do this
     };
 
-    static const int regExpCount = 2; // number of regexps in the array above
+    static const int regExpCount = 2;  // number of regexps in the array above
 
-    qint16 matches[] = { 0, 0, 0 };
-    qint16 matchEnd[] = { 0, 0, 0 };
+    qint16 matches[] = {0, 0, 0};
+    qint16 matchEnd[] = {0, 0, 0};
 
     ClickableList result;
-    //QString str = data(ChatLineModel::DisplayRole).toString();
+    // QString str = data(ChatLineModel::DisplayRole).toString();
 
     qint16 idx = 0;
     qint16 minidx;
@@ -86,10 +86,12 @@ ClickableList ClickableList::fromString(const QString &str)
         type = -1;
         minidx = str.length();
         for (int i = 0; i < regExpCount; i++) {
-            if (matches[i] < 0 || matchEnd[i] > str.length()) continue;
+            if (matches[i] < 0 || matchEnd[i] > str.length())
+                continue;
             if (idx >= matchEnd[i]) {
                 matches[i] = regExp[i].indexIn(str, qMax(matchEnd[i], idx));
-                if (matches[i] >= 0) matchEnd[i] = matches[i] + regExp[i].cap(1).length();
+                if (matches[i] >= 0)
+                    matchEnd[i] = matches[i] + regExp[i].cap(1).length();
             }
             if (matches[i] >= 0 && matches[i] < minidx) {
                 minidx = matches[i];
@@ -99,7 +101,7 @@ ClickableList ClickableList::fromString(const QString &str)
         if (type >= 0) {
             idx = matchEnd[type];
             QString match = str.mid(matches[type], matchEnd[type] - matches[type]);
-            if (type == Clickable::Url && str.at(idx-1) == ')') { // special case: closing paren only matches if we had an open one
+            if (type == Clickable::Url && str.at(idx - 1) == ')') {  // special case: closing paren only matches if we had an open one
                 if (!match.contains('(')) {
                     matchEnd[type]--;
                     match.chop(1);
@@ -110,17 +112,15 @@ ClickableList ClickableList::fromString(const QString &str)
                 if (QRegExp("^#\\d+$").exactMatch(match))
                     continue;
             }
-            result.append(Clickable((Clickable::Type)type, matches[type], matchEnd[type] - matches[type]));
+            result.emplace_back((Clickable::Type)type, matches[type], matchEnd[type] - matches[type]);
         }
-    }
-    while (type >= 0);
+    } while (type >= 0);
     return result;
 }
 
-
 Clickable ClickableList::atCursorPos(int idx)
 {
-    foreach(const Clickable &click, *this) {
+    foreach (const Clickable& click, *this) {
         if (idx >= click.start() && idx < click.start() + click.length())
             return click;
     }