[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=9d75682

The following commit has been merged in the master branch:
commit 9d75682d28d8787af6b714114825040ee606454b
Author: Lasath Fernando <kde at lasath.org>
Date:   Fri Feb 3 20:57:37 2012 +1100

    Change "Urls" property from QList<QString> to QList<KUrl>
---
 KTp/message-url-filter.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/KTp/message-url-filter.cpp b/KTp/message-url-filter.cpp
index 1990d18..3c86ad0 100644
--- a/KTp/message-url-filter.cpp
+++ b/KTp/message-url-filter.cpp
@@ -21,6 +21,7 @@
 
 #include <QImageReader>
 
+#include <KUrl>
 #include <KProtocolInfo>
 #include <KDebug>
 
@@ -32,7 +33,7 @@ UrlFilter::UrlFilter(QObject *parent)
 void UrlFilter::filterMessage(Message &info) {
     QString message = info.mainMessagePart();
     //FIXME: make "Urls" into a constant
-    QStringList urls = info.property("Urls").toStringList();
+    QVariantList urls = info.property("Urls").toList();
 
     // link detection
     QRegExp link(QLatin1String("\b(?:(\w+)://|(www\.))([^\s]+)"));
@@ -80,7 +81,7 @@ void UrlFilter::filterMessage(Message &info) {
                 fromIndex += realUrl.length();
             }
 
-            urls.append(realUrl);
+            urls.append(KUrl(realUrl));
         } else {
             fromIndex += link.matchedLength();
         }

-- 
ktp-common-internals packaging