[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=0438435

The following commit has been merged in the master branch:
commit 04384353faaf4505fc6c1fb2bafecdb62a025b7c
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Tue Aug 28 17:04:52 2012 +0200

    Use a QMap to store tags and QString to allow other tags longer than 1 char
---
 filters/formatting/format-filter.cpp | 37 +++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/filters/formatting/format-filter.cpp b/filters/formatting/format-filter.cpp
index 938d3d5..2eaf2c8 100644
--- a/filters/formatting/format-filter.cpp
+++ b/filters/formatting/format-filter.cpp
@@ -32,7 +32,7 @@ public:
     QString mainPattern;
     QString allTagsPattern;
 
-    void addTag (const char *markingCharacter, char htmlTag);
+    void addTag (QString markingCharacter, QString htmlTag);
     QString filterString(QString string);
 };
 
@@ -42,16 +42,27 @@ FormatFilter::FormatFilter (QObject* parent, const QVariantList&) :
 {
     d->mainPattern = QLatin1String("(^|\s)%1(\S|\S.*\S)%1(\s|$)");
 
-    d->allTagsPattern = QLatin1String("(") + QRegExp::escape(QLatin1String("_")) +
-                        QLatin1String("|") + QRegExp::escape(QLatin1String("*")) +
-                        QLatin1String("|") + QRegExp::escape(QLatin1String("-")) +
-                        QLatin1String("|") + QRegExp::escape(QLatin1String("/")) +
-                        QLatin1String(")");
+    QMap<QString, QString> tagsMap;
 
-    d->addTag("_", 'u');
-    d->addTag("\*", 'b');
-    d->addTag("-", 's');
-    d->addTag("/", 'i');
+    tagsMap[QLatin1String("_")] = QLatin1String("u");
+    tagsMap[QLatin1String("*")] = QLatin1String("b");
+    tagsMap[QLatin1String("-")] = QLatin1String("s");
+    tagsMap[QLatin1String("/")] = QLatin1String("i");
+
+    d->allTagsPattern = QLatin1String("(");
+
+    QMapIterator<QString, QString> i(tagsMap);
+    while (i.hasNext()) {
+        i.next();
+
+        d->allTagsPattern += QRegExp::escape(i.key());
+        if (i.hasNext())
+            d->allTagsPattern += QLatin1String("|");
+
+        d->addTag(i.key(), i.value());
+    }
+
+    d->allTagsPattern += QLatin1String(")");
 }
 
 FormatFilter::~FormatFilter()
@@ -82,12 +93,12 @@ QString FormatFilter::Private::filterString(QString string)
     return string;
 }
 
-void FormatFilter::Private::addTag (const char *markingCharacter, char htmlTag)
+void FormatFilter::Private::addTag (QString markingCharacter, QString htmlTag)
 {
     QString repl = QLatin1String("\1<%1>%2\2%2</%1>\3");
-    repl = repl.arg(htmlTag).arg(QLatin1String(markingCharacter));
+    repl = repl.arg(htmlTag).arg(markingCharacter);
 
-    QRegExp exp = QRegExp(mainPattern.arg(QLatin1String(markingCharacter)));
+    QRegExp exp = QRegExp(mainPattern.arg(QRegExp::escape(markingCharacter)));
     exp.setMinimal(true);
 
     tags.append(FormatTag(exp, repl));

-- 
ktp-text-ui packaging