X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fclickable.cpp;h=851e1caa7d434f22323635ce671290c88bd300e1;hp=27dfd69d2ecaf032b396daffa3658f1b3254571e;hb=8582c2ad5708a1972c85bea1cf8d81ad3ece4814;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/uisupport/clickable.cpp b/src/uisupport/clickable.cpp
index 27dfd69d..851e1caa 100644
--- a/src/uisupport/clickable.cpp
+++ b/src/uisupport/clickable.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include <QDesktopServices>
@@ -53,10 +53,10 @@ void Clickable::activate(NetworkId networkId, const QString &text) const
 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 urlChars("(?:[,.;:]*[\\w~@/?&=+$()!%#*{}\\[\\]\\|'^-])");
-    static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)");
+    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|$)");  // NOLINT(modernize-raw-string-literal)
 
     static QRegExp regExp[] = {
         // URL
@@ -65,7 +65,7 @@ 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
     };
@@ -110,7 +110,7 @@ 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);