X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fclickable.cpp;h=1f5720ef9a66124f96f123f0e68da6543836fa44;hp=733829176aa37fa1b04e650bd303a7de6b01c8f0;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=04315f46a16fc3627218377071e008b6b9744992 diff --git a/src/uisupport/clickable.cpp b/src/uisupport/clickable.cpp index 73382917..1f5720ef 100644 --- a/src/uisupport/clickable.cpp +++ b/src/uisupport/clickable.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2013 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 * @@ -55,7 +55,7 @@ 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 urlChars("(?:[,.;:]*[\\w~@/?&=+$()!%#*-])"); static QString urlEnd("(?:>|[,.;:\"]*\\s|\\b|$)"); static QRegExp regExp[] = { @@ -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);