[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=7307435

The following commit has been merged in the master branch:
commit 7307435e1de48dead5928e631cbf73d32d0bae6e
Author: Dario Freddi <dario.freddi at collabora.com>
Date:   Fri Nov 18 23:42:11 2011 +0100

    Enforce the use of QLatin1*
---
 models/accounts-model.cpp     |  4 ++--
 models/contact-model-item.cpp |  2 +-
 models/groups-model.cpp       |  8 ++++----
 text-parser.cpp               | 13 ++++++++-----
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/models/accounts-model.cpp b/models/accounts-model.cpp
index 00259d5..c161caf 100644
--- a/models/accounts-model.cpp
+++ b/models/accounts-model.cpp
@@ -311,7 +311,7 @@ QModelIndex AccountsModel::parent(const QModelIndex &index) const
 QStringList AccountsModel::mimeTypes() const
 {
     QStringList types;
-    types << "application/vnd.telepathy.contact";
+    types << QLatin1String("application/vnd.telepathy.contact");
     return types;
 }
 
@@ -330,7 +330,7 @@ QMimeData* AccountsModel::mimeData(const QModelIndexList& indexes) const
         }
     }
 
-    mimeData->setData("application/vnd.telepathy.contact", encodedData);
+    mimeData->setData(QLatin1String("application/vnd.telepathy.contact"), encodedData);
     return mimeData;
 }
 
diff --git a/models/contact-model-item.cpp b/models/contact-model-item.cpp
index 821ebfc..21dec3a 100644
--- a/models/contact-model-item.cpp
+++ b/models/contact-model-item.cpp
@@ -209,7 +209,7 @@ bool ContactModelItem::fileTransferCapability() const
 
 bool ContactModelItem::desktopSharingCapability() const
 {
-    bool contactCanHandleRfb = mPriv->mContact->capabilities().streamTubes("rfb");
+    bool contactCanHandleRfb = mPriv->mContact->capabilities().streamTubes(QLatin1String("rfb"));
     bool selfCanHandleRfb = s_krfbAvailableChecker->isAvailable();
     return contactCanHandleRfb && selfCanHandleRfb;
 }
diff --git a/models/groups-model.cpp b/models/groups-model.cpp
index 9d7f058..0c05d20 100644
--- a/models/groups-model.cpp
+++ b/models/groups-model.cpp
@@ -132,7 +132,7 @@ Qt::DropActions GroupsModel::supportedDropActions() const
 QStringList GroupsModel::mimeTypes() const
 {
     QStringList types;
-    types << "application/vnd.telepathy.contact";
+    types << QLatin1String("application/vnd.telepathy.contact");
     return types;
 }
 
@@ -151,7 +151,7 @@ QMimeData* GroupsModel::mimeData(const QModelIndexList& indexes) const
         }
     }
 
-    mimeData->setData("application/vnd.telepathy.contact", encodedData);
+    mimeData->setData(QLatin1String("application/vnd.telepathy.contact"), encodedData);
     return mimeData;
 }
 
@@ -161,7 +161,7 @@ bool GroupsModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int
         return true;
     }
 
-    if (!data->hasFormat("application/vnd.telepathy.contact")) {
+    if (!data->hasFormat(QLatin1String("application/vnd.telepathy.contact"))) {
         return false;
     }
 
@@ -169,7 +169,7 @@ bool GroupsModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int
         return false;
     }
 
-    QByteArray encodedData = data->data("application/vnd.telepathy.contact");
+    QByteArray encodedData = data->data(QLatin1String("application/vnd.telepathy.contact"));
     QDataStream stream(&encodedData, QIODevice::ReadOnly);
     QList<ContactModelItem*> contacts;
 
diff --git a/text-parser.cpp b/text-parser.cpp
index 510c2a5..14beb13 100644
--- a/text-parser.cpp
+++ b/text-parser.cpp
@@ -21,12 +21,15 @@
 
 #include "text-parser.h"
 
+#include <QtCore/QLatin1String>
+
 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)));
+static QRegExp s_urlPattern(QString(QLatin1String("\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)
@@ -65,12 +68,12 @@ TextUrlData TextParser::extractUrlData(const QString& text, bool doUrlFixup)
             protocol.clear();
             if (s_urlPattern.cap(2).isEmpty()) {
                 QString urlPatternCap1(s_urlPattern.cap(1));
-                if (urlPatternCap1.contains('@')) {
-                    protocol = "mailto:";
+                if (urlPatternCap1.contains(QLatin1Char('@'))) {
+                    protocol = QLatin1String("mailto:");
                 } else if (urlPatternCap1.startsWith(QLatin1String("ftp."), Qt::CaseInsensitive)) {
-                    protocol = "ftp://";
+                    protocol = QLatin1String("ftp://");
                 } else {
-                    protocol = "http://";
+                    protocol = QLatin1String("http://");
                 }
             }
 

-- 
ktp-common-internals packaging