[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=2e5979a

The following commit has been merged in the master branch:
commit 2e5979a0f27f50ef0f01961d87ec1ad049703198
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Dec 29 12:36:05 2011 +0100

    QLatin1String in plugins/sunshine
---
 plugins/sunshine/sunshine-account-ui-plugin.cpp       |  2 +-
 plugins/sunshine/sunshine-account-ui.cpp              | 16 ++++++++--------
 plugins/sunshine/sunshine-advanced-options-widget.cpp | 10 +++++-----
 plugins/sunshine/sunshine-main-options-widget.cpp     |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/plugins/sunshine/sunshine-account-ui-plugin.cpp b/plugins/sunshine/sunshine-account-ui-plugin.cpp
index 5c3a936..d1dfbb5 100644
--- a/plugins/sunshine/sunshine-account-ui-plugin.cpp
+++ b/plugins/sunshine/sunshine-account-ui-plugin.cpp
@@ -31,7 +31,7 @@ SunshineAccountUiPlugin::SunshineAccountUiPlugin(QObject *parent, const QVariant
     : AbstractAccountUiPlugin(parent)
 {
     // Register supported cm/protocol combinations
-    registerProvidedProtocol("sunshine", "gadugadu");
+    registerProvidedProtocol(QLatin1String("sunshine"), QLatin1String("gadugadu"));
 }
 
 SunshineAccountUiPlugin::~SunshineAccountUiPlugin()
diff --git a/plugins/sunshine/sunshine-account-ui.cpp b/plugins/sunshine/sunshine-account-ui.cpp
index ef432d8..3b2cc33 100644
--- a/plugins/sunshine/sunshine-account-ui.cpp
+++ b/plugins/sunshine/sunshine-account-ui.cpp
@@ -29,19 +29,19 @@ SunshineAccountUi::SunshineAccountUi(QObject *parent)
 {
     // Register supported parameters
     // Main Options
-    registerSupportedParameter("account", QVariant::String);
-    registerSupportedParameter("password", QVariant::String);
+    registerSupportedParameter(QLatin1String("account"), QVariant::String);
+    registerSupportedParameter(QLatin1String("password"), QVariant::String);
 
     // Advanced Options
-    registerSupportedParameter("use-specified-server", QVariant::Bool);
-    registerSupportedParameter("server", QVariant::String);
-    registerSupportedParameter("port", QVariant::UInt);
-    registerSupportedParameter("use-ssl", QVariant::Bool);
-    registerSupportedParameter("export-contacts", QVariant::Bool);
+    registerSupportedParameter(QLatin1String("use-specified-server"), QVariant::Bool);
+    registerSupportedParameter(QLatin1String("server"), QVariant::String);
+    registerSupportedParameter(QLatin1String("port"), QVariant::UInt);
+    registerSupportedParameter(QLatin1String("use-ssl"), QVariant::Bool);
+    registerSupportedParameter(QLatin1String("export-contacts"), QVariant::Bool);
     // People using telepathy-sunshine from master (past 0.1.8 versions) will need this line insead
     // of export-contacts. See the commit for further details:
     // http://git.collabora.co.uk/?p=telepathy-sunshine.git;a=commit;h=83963893c34c6069f7202cf7d55add2d334581b5
-    // registerSupportedParameter("synchronize-contacts-with-server", QVariant::Bool);
+    // registerSupportedParameter(QLatin1String("synchronize-contacts-with-server"), QVariant::Bool);
 }
 
 SunshineAccountUi::~SunshineAccountUi()
diff --git a/plugins/sunshine/sunshine-advanced-options-widget.cpp b/plugins/sunshine/sunshine-advanced-options-widget.cpp
index 7a00a3f..d77c2f8 100644
--- a/plugins/sunshine/sunshine-advanced-options-widget.cpp
+++ b/plugins/sunshine/sunshine-advanced-options-widget.cpp
@@ -29,19 +29,19 @@ SunshineAdvancedOptionsWidget::SunshineAdvancedOptionsWidget(ParameterEditModel*
     m_ui = new Ui::SunshineAdvancedOptionsWidget;
     m_ui->setupUi(this);
 
-    handleParameter("use-specified-server", QVariant::Bool,
+    handleParameter(QLatin1String("use-specified-server"), QVariant::Bool,
                     m_ui->serverGroupBox,
                     0);
-    handleParameter("server", QVariant::String,
+    handleParameter(QLatin1String("server"), QVariant::String,
                     m_ui->serverLineEdit,
                     m_ui->serverLabel);
-    handleParameter("port", QVariant::UInt,
+    handleParameter(QLatin1String("port"), QVariant::UInt,
                     m_ui->portSpinBox,
                     m_ui->portLabel);
-    handleParameter("use-ssl", QVariant::Bool,
+    handleParameter(QLatin1String("use-ssl"), QVariant::Bool,
                     m_ui->sslCheckBox,
                     m_ui->sslLabel);
-    handleParameter("export-contacts", QVariant::Bool,
+    handleParameter(QLatin1String("export-contacts"), QVariant::Bool,
                     m_ui->exportContactsCheckBox,
                     m_ui->exportContactsLabel);
 }
diff --git a/plugins/sunshine/sunshine-main-options-widget.cpp b/plugins/sunshine/sunshine-main-options-widget.cpp
index 8021ad7..21a74b7 100644
--- a/plugins/sunshine/sunshine-main-options-widget.cpp
+++ b/plugins/sunshine/sunshine-main-options-widget.cpp
@@ -29,8 +29,8 @@ SunshineMainOptionsWidget::SunshineMainOptionsWidget(ParameterEditModel *model,
     m_ui = new Ui::SunshineMainOptionsWidget;
     m_ui->setupUi(this);
 
-    handleParameter("account",  QVariant::String, m_ui->accountLineEdit,  m_ui->accountLabel);
-    handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
+    handleParameter(QLatin1String("account"),  QVariant::String, m_ui->accountLineEdit,  m_ui->accountLabel);
+    handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
 
     QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus()));
 }

-- 
ktp-accounts-kcm packaging