[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=298295d

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

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

diff --git a/plugins/idle/advanced-options-widget.cpp b/plugins/idle/advanced-options-widget.cpp
index 1e6856d..2aaa5ea 100644
--- a/plugins/idle/advanced-options-widget.cpp
+++ b/plugins/idle/advanced-options-widget.cpp
@@ -29,11 +29,11 @@ AdvancedOptionsWidget::AdvancedOptionsWidget(
     m_ui = new Ui::AdvancedOptionsWidget;
     m_ui->setupUi(this);
 
-    handleParameter("port", QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
-    handleParameter("username", QVariant::String, m_ui->usernameLineEdit, m_ui->usernameLabel);
-    handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
-    handleParameter("use-ssl", QVariant::Bool, m_ui->useSslCheckBox, m_ui->useSslLabel);
-    handleParameter("charset", QVariant::String, m_ui->charsetLineEdit, m_ui->charsetLabel);
+    handleParameter(QLatin1String("port"), QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
+    handleParameter(QLatin1String("username"), QVariant::String, m_ui->usernameLineEdit, m_ui->usernameLabel);
+    handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
+    handleParameter(QLatin1String("use-ssl"), QVariant::Bool, m_ui->useSslCheckBox, m_ui->useSslLabel);
+    handleParameter(QLatin1String("charset"), QVariant::String, m_ui->charsetLineEdit, m_ui->charsetLabel);
 }
 
 AdvancedOptionsWidget::~AdvancedOptionsWidget()
diff --git a/plugins/idle/idle-account-ui-plugin.cpp b/plugins/idle/idle-account-ui-plugin.cpp
index 2ceecb0..3bc3c8c 100644
--- a/plugins/idle/idle-account-ui-plugin.cpp
+++ b/plugins/idle/idle-account-ui-plugin.cpp
@@ -30,7 +30,7 @@ IdleAccountUiPlugin::IdleAccountUiPlugin(QObject *parent, const QVariantList &)
  : AbstractAccountUiPlugin(parent)
 {
     // Register supported cm/protocol combinations
-    registerProvidedProtocol("idle", "irc");
+    registerProvidedProtocol(QLatin1String("idle"), QLatin1String("irc"));
 }
 
 IdleAccountUiPlugin::~IdleAccountUiPlugin()
diff --git a/plugins/idle/idle-account-ui.cpp b/plugins/idle/idle-account-ui.cpp
index 0742611..3c962dd 100644
--- a/plugins/idle/idle-account-ui.cpp
+++ b/plugins/idle/idle-account-ui.cpp
@@ -28,15 +28,15 @@ IdleAccountUi::IdleAccountUi(QObject *parent)
  : AbstractAccountUi(parent)
 {
     // Register supported parameters
-    registerSupportedParameter("account", QVariant::String);
-    registerSupportedParameter("server", QVariant::String);
-    registerSupportedParameter("port", QVariant::UInt);
-    registerSupportedParameter("username", QVariant::String);
-    registerSupportedParameter("password", QVariant::String);
-    registerSupportedParameter("fullname", QVariant::String);
-    registerSupportedParameter("use-ssl", QVariant::Bool);
-    registerSupportedParameter("charset", QVariant::String);
-//     registerSupportedParameter("quit-message", QVariant::String);
+    registerSupportedParameter(QLatin1String("account"), QVariant::String);
+    registerSupportedParameter(QLatin1String("server"), QVariant::String);
+    registerSupportedParameter(QLatin1String("port"), QVariant::UInt);
+    registerSupportedParameter(QLatin1String("username"), QVariant::String);
+    registerSupportedParameter(QLatin1String("password"), QVariant::String);
+    registerSupportedParameter(QLatin1String("fullname"), QVariant::String);
+    registerSupportedParameter(QLatin1String("use-ssl"), QVariant::Bool);
+    registerSupportedParameter(QLatin1String("charset"), QVariant::String);
+//     registerSupportedParameter(QLatin1String("quit-message"), QVariant::String);
 }
 
 IdleAccountUi::~IdleAccountUi()
diff --git a/plugins/idle/main-options-widget.cpp b/plugins/idle/main-options-widget.cpp
index 77ebcb9..f8aeb4b 100644
--- a/plugins/idle/main-options-widget.cpp
+++ b/plugins/idle/main-options-widget.cpp
@@ -29,9 +29,9 @@ MainOptionsWidget::MainOptionsWidget(
     m_ui = new Ui::MainOptionsWidget;
     m_ui->setupUi(this);
 
-    handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
-    handleParameter("server", QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
-    handleParameter("fullname", QVariant::String, m_ui->fullnameLineEdit, m_ui->fullnameLabel);
+    handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+    handleParameter(QLatin1String("server"), QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
+    handleParameter(QLatin1String("fullname"), QVariant::String, m_ui->fullnameLineEdit, m_ui->fullnameLabel);
     QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus()));
 }
 

-- 
ktp-accounts-kcm packaging