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

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

    QLatin1String in plugins/butterfly
---
 plugins/butterfly/butterfly-account-ui-plugin.cpp | 2 +-
 plugins/butterfly/butterfly-account-ui.cpp        | 4 ++--
 plugins/butterfly/main-options-widget.cpp         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/butterfly/butterfly-account-ui-plugin.cpp b/plugins/butterfly/butterfly-account-ui-plugin.cpp
index b47b46b..7e22266 100644
--- a/plugins/butterfly/butterfly-account-ui-plugin.cpp
+++ b/plugins/butterfly/butterfly-account-ui-plugin.cpp
@@ -30,7 +30,7 @@ ButterflyAccountUiPlugin::ButterflyAccountUiPlugin(QObject *parent, const QVaria
  : AbstractAccountUiPlugin(parent)
 {
     // Register supported cm/protocol combinations
-    registerProvidedProtocol("butterfly", "msn");
+    registerProvidedProtocol(QLatin1String("butterfly"), QLatin1String("msn"));
 }
 
 ButterflyAccountUiPlugin::~ButterflyAccountUiPlugin()
diff --git a/plugins/butterfly/butterfly-account-ui.cpp b/plugins/butterfly/butterfly-account-ui.cpp
index fd7fbf3..bacc148 100644
--- a/plugins/butterfly/butterfly-account-ui.cpp
+++ b/plugins/butterfly/butterfly-account-ui.cpp
@@ -27,8 +27,8 @@ ButterflyAccountUi::ButterflyAccountUi(QObject *parent)
  : AbstractAccountUi(parent)
 {
     // Register supported parameters
-    registerSupportedParameter("account", QVariant::String);
-    registerSupportedParameter("password", QVariant::String);
+    registerSupportedParameter(QLatin1String("account"), QVariant::String);
+    registerSupportedParameter(QLatin1String("password"), QVariant::String);
 }
 
 ButterflyAccountUi::~ButterflyAccountUi()
diff --git a/plugins/butterfly/main-options-widget.cpp b/plugins/butterfly/main-options-widget.cpp
index 9c9364d..7e48007 100644
--- a/plugins/butterfly/main-options-widget.cpp
+++ b/plugins/butterfly/main-options-widget.cpp
@@ -28,8 +28,8 @@ MainOptionsWidget::MainOptionsWidget(ParameterEditModel *model,
     m_ui = new Ui::MainOptionsWidget;
     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