[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konsole/KDE/4.9] src: Update 'UrlFilter' regular expression.
From:       Francesco Cecconi <francesco.cecconi () gmail ! com>
Date:       2012-11-16 20:04:13
Message-ID: 20121116200413.B082DA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 1e9cbb90c002e70e895dd3f5bec2023c34cd9886 by Francesco Cecconi.
Committed on 16/11/2012 at 20:59.
Pushed by cecconi into branch 'KDE/4.9'.

Update 'UrlFilter' regular expression.

Fix issues with URLs that end with ')' and ':'.

BUG: 210871
FIXED-IN: 4.9.4

REVIEW: 107340

M  +2    -2    src/Filter.cpp

http://commits.kde.org/konsole/1e9cbb90c002e70e895dd3f5bec2023c34cd9886

diff --git a/src/Filter.cpp b/src/Filter.cpp
index 475085f..001364c 100644
--- a/src/Filter.cpp
+++ b/src/Filter.cpp
@@ -434,8 +434,8 @@ void UrlFilter::HotSpot::activate(QObject* object)
 =

 //regexp matches:
 // full url:
-// protocolname:// or www. followed by anything other than whitespaces, <,=
 >, ' or ", and ends before whitespaces, <, >, ', ", ], !, comma and dot
-const QRegExp UrlFilter::FullUrlRegExp("(www\\.(?!\\.)|[a-z][a-z0-9+.-]*:/=
/)[^\\s<>'\"]+[^!,\\.\\s<>'\"\\]]");
+// protocolname:// or www. followed by anything other than whitespaces, <,=
 >, ' or ", and ends before whitespaces, <, >, ', ", ], !, ), :, comma and =
dot
+const QRegExp UrlFilter::FullUrlRegExp("(www\\.(?!\\.)|[a-z][a-z0-9+.-]*:/=
/)[^\\s<>'\"]+[^!,\\.\\s<>'\"\\]\\)\\:]");
 // email address:
 // [word chars, dots or dashes]@[word chars, dots or dashes].[word chars]
 const QRegExp UrlFilter::EmailAddressRegExp("\\b(\\w|\\.|-)+@(\\w|\\.|-)+\=
\.\\w+\\b");
[prev in list] [next in list] [prev in thread] [next in thread]