[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=5c69aae

The following commit has been merged in the master branch:
commit 5c69aaefa2d003f9ffda62779b50f697883b683a
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Dec 29 12:35:56 2011 +0100

    QLatin1String in plugins/salut
---
 plugins/salut/salut-account-ui-plugin.cpp       |  2 +-
 plugins/salut/salut-account-ui.cpp              | 12 ++++++------
 plugins/salut/salut-advanced-options-widget.cpp |  6 +++---
 plugins/salut/salut-main-options-widget.cpp     |  6 +++---
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/plugins/salut/salut-account-ui-plugin.cpp b/plugins/salut/salut-account-ui-plugin.cpp
index 7163eea..a6b7f38 100644
--- a/plugins/salut/salut-account-ui-plugin.cpp
+++ b/plugins/salut/salut-account-ui-plugin.cpp
@@ -32,7 +32,7 @@ SalutAccountUiPlugin::SalutAccountUiPlugin(QObject *parent, const QVariantList &
     : AbstractAccountUiPlugin(parent)
 {
     // Register supported cm/protocol combinations
-    registerProvidedProtocol("salut", "local-xmpp");
+    registerProvidedProtocol(QLatin1String("salut"), QLatin1String("local-xmpp"));
 }
 
 SalutAccountUiPlugin::~SalutAccountUiPlugin()
diff --git a/plugins/salut/salut-account-ui.cpp b/plugins/salut/salut-account-ui.cpp
index f02f5ec..1cba5a8 100644
--- a/plugins/salut/salut-account-ui.cpp
+++ b/plugins/salut/salut-account-ui.cpp
@@ -30,14 +30,14 @@ SalutAccountUi::SalutAccountUi(QObject *parent)
 {
     // Register supported parameters
     // Main Options
-    registerSupportedParameter("first-name", QVariant::String);
-    registerSupportedParameter("last-name",  QVariant::String);
-    registerSupportedParameter("nickname",   QVariant::String);
+    registerSupportedParameter(QLatin1String("first-name"), QVariant::String);
+    registerSupportedParameter(QLatin1String("last-name"),  QVariant::String);
+    registerSupportedParameter(QLatin1String("nickname"),   QVariant::String);
 
     // Advanced Options
-    registerSupportedParameter("published-name", QVariant::String);
-    registerSupportedParameter("email",          QVariant::String);
-    registerSupportedParameter("jid",            QVariant::String);
+    registerSupportedParameter(QLatin1String("published-name"), QVariant::String);
+    registerSupportedParameter(QLatin1String("email"),          QVariant::String);
+    registerSupportedParameter(QLatin1String("jid"),            QVariant::String);
 }
 
 SalutAccountUi::~SalutAccountUi()
diff --git a/plugins/salut/salut-advanced-options-widget.cpp b/plugins/salut/salut-advanced-options-widget.cpp
index 7734777..257ec4d 100644
--- a/plugins/salut/salut-advanced-options-widget.cpp
+++ b/plugins/salut/salut-advanced-options-widget.cpp
@@ -29,9 +29,9 @@ SalutAdvancedOptionsWidget::SalutAdvancedOptionsWidget(ParameterEditModel* model
     m_ui = new Ui::SalutAdvancedOptionsWidget;
     m_ui->setupUi(this);
 
-    handleParameter("published-name",  QVariant::String, m_ui->pubnameLineEdit, m_ui->pubnameLabel);
-    handleParameter("email", QVariant::String, m_ui->emailLineEdit, m_ui->emailLabel);
-    handleParameter("jid",   QVariant::String, m_ui->jidLineEdit,   m_ui->jidLabel);
+    handleParameter(QLatin1String("published-name"),  QVariant::String, m_ui->pubnameLineEdit, m_ui->pubnameLabel);
+    handleParameter(QLatin1String("email"), QVariant::String, m_ui->emailLineEdit, m_ui->emailLabel);
+    handleParameter(QLatin1String("jid"),   QVariant::String, m_ui->jidLineEdit,   m_ui->jidLabel);
 }
 
 SalutAdvancedOptionsWidget::~SalutAdvancedOptionsWidget()
diff --git a/plugins/salut/salut-main-options-widget.cpp b/plugins/salut/salut-main-options-widget.cpp
index 37e41e1..33d76a1 100644
--- a/plugins/salut/salut-main-options-widget.cpp
+++ b/plugins/salut/salut-main-options-widget.cpp
@@ -31,9 +31,9 @@ SalutMainOptionsWidget::SalutMainOptionsWidget(ParameterEditModel *model, QWidge
     m_ui = new Ui::SalutMainOptionsWidget;
     m_ui->setupUi(this);
 
-    handleParameter("first-name", QVariant::String, m_ui->firstnameLineEdit, m_ui->firstnameLabel);
-    handleParameter("last-name",  QVariant::String, m_ui->lastnameLineEdit,  m_ui->lastnameLabel);
-    handleParameter("nickname",   QVariant::String, m_ui->nicknameLineEdit,  m_ui->nicknameLabel);
+    handleParameter(QLatin1String("first-name"), QVariant::String, m_ui->firstnameLineEdit, m_ui->firstnameLabel);
+    handleParameter(QLatin1String("last-name"),  QVariant::String, m_ui->lastnameLineEdit,  m_ui->lastnameLabel);
+    handleParameter(QLatin1String("nickname"),   QVariant::String, m_ui->nicknameLineEdit,  m_ui->nicknameLabel);
 
     // if the first- and last-name are empty on startup we add them based on
     // the current users full name

-- 
ktp-accounts-kcm packaging