[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=169f9a6

The following commit has been merged in the master branch:
commit 169f9a6ec38164c3a15b01001026e5ef4f2870bc
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Tue Mar 19 23:30:06 2013 +0000

    Simplify extension matching in image filtering
    
    This also fixes a bug in which the filter would match
    urls that features .jpg or .png at any point in the filename not just at the end
    
    BUG: 304260
    REVIEW: 109596
---
 filters/images/images-filter.cpp | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/filters/images/images-filter.cpp b/filters/images/images-filter.cpp
index 1036d5b..dc34774 100644
--- a/filters/images/images-filter.cpp
+++ b/filters/images/images-filter.cpp
@@ -29,7 +29,7 @@
 
 class ImagesFilter::Private {
 public:
-    QRegExp imageRegex;
+    QList<QByteArray> formats;
 };
 
 static const KCatalogLoader loader(QLatin1String("ktp-filters"));
@@ -37,14 +37,7 @@ static const KCatalogLoader loader(QLatin1String("ktp-filters"));
 ImagesFilter::ImagesFilter (QObject* parent, const QVariantList&) :
     KTp::AbstractMessageFilter (parent), d(new Private)
 {
-    QString imagePattern = QLatin1String("\.(?:");
-    Q_FOREACH (const QByteArray &format, QImageReader::supportedImageFormats()) {
-        imagePattern = imagePattern % QString::fromAscii(format) % QLatin1String("|");
-    }
-    imagePattern.chop(1);
-    imagePattern += QLatin1String(")$");
-
-    d->imageRegex = QRegExp(imagePattern);
+    d->formats = QImageReader::supportedImageFormats();
 }
 
 ImagesFilter::~ImagesFilter()
@@ -60,7 +53,10 @@ void ImagesFilter::filterMessage(KTp::Message &message, const KTp::MessageContex
         const KUrl url = qvariant_cast<KUrl>(var);
         QString fileName = url.fileName().toLower();
 
-        if (!fileName.isNull() && fileName.contains(d->imageRegex)) {
+        //get everything after the . The +1 means we don't include the . character
+        QString extension = fileName.mid(fileName.lastIndexOf(QLatin1Char('.'))+1);
+
+        if (!fileName.isNull() && d->formats.contains(extension.toUtf8())) {
             QString href = QString::fromAscii(url.toEncoded());
             message.appendMessagePart(
                 QLatin1Literal("<br/><a href=\"") % href % QLatin1Literal("\">") %

-- 
ktp-text-ui packaging