[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=eefce17

The following commit has been merged in the master branch:
commit eefce171ab596a72fac874aacc656d96fc1af344
Author: Florian Reinhard <florian.reinhard at googlemail.com>
Date:   Thu Feb 24 00:33:41 2011 +0100

    QLatin1String-ify comparisons to QString.
---
 butterfly/butterfly-account-ui-plugin.cpp | 2 +-
 gabble/gabble-account-ui-plugin.cpp       | 2 +-
 haze/haze-account-ui-plugin.cpp           | 4 ++--
 idle/idle-account-ui-plugin.cpp           | 2 +-
 rakia/rakia-account-ui-plugin.cpp         | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/butterfly/butterfly-account-ui-plugin.cpp b/butterfly/butterfly-account-ui-plugin.cpp
index ba40ce3..c3d605d 100644
--- a/butterfly/butterfly-account-ui-plugin.cpp
+++ b/butterfly/butterfly-account-ui-plugin.cpp
@@ -48,7 +48,7 @@ AbstractAccountUi* ButterflyAccountUiPlugin::accountUi(const QString &connection
     kDebug();
     
     // We only support butterfly/xmpp combination.
-    if ((connectionManager == "butterfly") && (protocol == "msn")) {
+    if ((connectionManager == QLatin1String("butterfly")) && (protocol == QLatin1String("msn"))) {
         return new ButterflyAccountUi;
     }
 
diff --git a/gabble/gabble-account-ui-plugin.cpp b/gabble/gabble-account-ui-plugin.cpp
index 12b58e5..087c2b9 100644
--- a/gabble/gabble-account-ui-plugin.cpp
+++ b/gabble/gabble-account-ui-plugin.cpp
@@ -50,7 +50,7 @@ AbstractAccountUi* GabbleAccountUiPlugin::accountUi(const QString &connectionMan
     kDebug();
 
     // We only support gabble/jabber combination.
-    if ((connectionManager == "gabble") && (protocol == "jabber")) {
+    if ((connectionManager == QLatin1String("gabble")) && (protocol == QLatin1String("jabber"))) {
         return new GabbleAccountUi;
     }
 
diff --git a/haze/haze-account-ui-plugin.cpp b/haze/haze-account-ui-plugin.cpp
index 47551fe..5cebd1a 100644
--- a/haze/haze-account-ui-plugin.cpp
+++ b/haze/haze-account-ui-plugin.cpp
@@ -50,10 +50,10 @@ AbstractAccountUi* HazeAccountUiPlugin::accountUi(const QString &connectionManag
     kDebug();
 
     // We only support haze/icq and yahoo combination so far
-    if ((connectionManager == "haze") && (protocol == "icq")) {
+    if ((connectionManager == QLatin1String("haze")) && (protocol == QLatin1String("icq"))) {
         return new HazeIcqAccountUi;
     }
-    if ((connectionManager == "haze") && (protocol == "yahoo")){
+    if ((connectionManager == QLatin1String("haze")) && (protocol == QLatin1String("yahoo"))){
       return new HazeYahooAccount;
     }
 
diff --git a/idle/idle-account-ui-plugin.cpp b/idle/idle-account-ui-plugin.cpp
index c3ff4a1..4ccba66 100644
--- a/idle/idle-account-ui-plugin.cpp
+++ b/idle/idle-account-ui-plugin.cpp
@@ -47,7 +47,7 @@ AbstractAccountUi* IdleAccountUiPlugin::accountUi(const QString &connectionManag
 
     kDebug();
 
-    if ((connectionManager == "idle") && (protocol == "irc")) {
+    if ((connectionManager == QLatin1String("idle")) && (protocol == QLatin1String("irc"))) {
         return new IdleAccountUi;
     }
 
diff --git a/rakia/rakia-account-ui-plugin.cpp b/rakia/rakia-account-ui-plugin.cpp
index f61bb4c..02b4ad7 100644
--- a/rakia/rakia-account-ui-plugin.cpp
+++ b/rakia/rakia-account-ui-plugin.cpp
@@ -52,8 +52,8 @@ AbstractAccountUi* RakiaAccountUiPlugin::accountUi(const QString &connectionMana
              ", servicename: " << serviceName;
 
     // We support rakia/sip and the renamed version rakia/sip combination.
-    if(((connectionManager == "rakia")    && (protocol == "sip")) ||
-            ((connectionManager == "sofiasip") && (protocol == "sip"))
+    if(((connectionManager == QLatin1String("rakia"))    && (protocol == QLatin1String("sip"))) ||
+       ((connectionManager == QLatin1String("sofiasip")) && (protocol == QLatin1String("sip")))
       ) {
         return new RakiaAccountUi;
     }

-- 
ktp-accounts-kcm packaging