[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=9f89c21

The following commit has been merged in the master branch:
commit 9f89c21c9455f104e41b393ef8b7955c0790f07c
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Wed Nov 2 14:03:56 2011 +0100

    Fix compile issues
---
 text-parser.cpp | 7 ++++++-
 text-parser.h   | 5 -----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/text-parser.cpp b/text-parser.cpp
index a38ea9b..510c2a5 100644
--- a/text-parser.cpp
+++ b/text-parser.cpp
@@ -23,6 +23,11 @@
 
 TextParser* TextParser::s_instance = NULL;
 
+/**
+ * RegExp for url detection
+ */
+static QRegExp s_urlPattern(QString("\b((?:(?:([a-z][\w\.-]+:/{1,3})|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|\}\]|[^\s`!()\[\]{};:'\".,<>?%1%2%3%4%5%6])|[a-z0-9.\-+_]+@[a-z0-9.\-]+[.][a-z]{1,5}[^\s/`!()\[\]{};:'\".,<>?%1%2%3%4%5%6]))").arg(QChar(0x00AB)).arg(QChar(0x00BB)).arg(QChar(0x201C)).arg(QChar(0x201D)).arg(QChar(0x2018)).arg(QChar(0x2019)));
+
 TextParser::TextParser(QObject* parent = 0)
     : QObject(parent)
 {
@@ -37,7 +42,7 @@ TextParser* TextParser::instance()
     return s_instance;
 }
 
-TextUrlData TextParser::extractUrlData(const QString& text, bool doUrlFixup = true)
+TextUrlData TextParser::extractUrlData(const QString& text, bool doUrlFixup)
 {
     TextUrlData data;
     QString htmlText(text);
diff --git a/text-parser.h b/text-parser.h
index e5a17b8..7790b14 100644
--- a/text-parser.h
+++ b/text-parser.h
@@ -83,11 +83,6 @@ private:
      * @var TextParser
      */
     static TextParser *s_instance;
-
-    /**
-     * @var QRegExp
-     */
-    static QRegExp s_urlPattern(QString("\b((?:(?:([a-z][\w\.-]+:/{1,3})|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|\}\]|[^\s`!()\[\]{};:'\".,<>?%1%2%3%4%5%6])|[a-z0-9.\-+_]+@[a-z0-9.\-]+[.][a-z]{1,5}[^\s/`!()\[\]{};:'\".,<>?%1%2%3%4%5%6]))").arg(QChar(0x00AB)).arg(QChar(0x00BB)).arg(QChar(0x201C)).arg(QChar(0x201D)).arg(QChar(0x2018)).arg(QChar(0x2019)));
 };
 
 #endif // TEXT_PARSER_H

-- 
ktp-common-internals packaging