[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:01:06 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=89146b0
The following commit has been merged in the master branch:
commit 89146b021f20ea4162f910ef3a598933602f8cc4
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Dec 29 12:35:30 2011 +0100
QLatin1String in plugins/haze
---
plugins/haze/aim-main-options-widget.cpp | 4 ++--
plugins/haze/aim-server-settings-widget.cpp | 12 ++++++------
plugins/haze/haze-account-ui-plugin.cpp | 12 ++++++------
plugins/haze/haze-aim-account.cpp | 16 ++++++++--------
plugins/haze/haze-icq-account.cpp | 16 ++++++++--------
plugins/haze/haze-msn-account.cpp | 4 ++--
plugins/haze/haze-myspaceim-account-ui.cpp | 8 ++++----
plugins/haze/haze-skype-account-ui.cpp | 12 ++++++------
plugins/haze/haze-yahoo-account.cpp | 18 +++++++++---------
plugins/haze/icq-main-options-widget.cpp | 4 ++--
plugins/haze/icq-server-settings-widget.cpp | 12 ++++++------
plugins/haze/msn-main-options-widget.cpp | 4 ++--
plugins/haze/myspaceim-advanced-settings-widget.cpp | 4 ++--
plugins/haze/myspaceim-main-options-widget.cpp | 4 ++--
plugins/haze/skype-advanced-settings-widget.cpp | 10 +++++-----
plugins/haze/skype-main-options-widget.cpp | 4 ++--
plugins/haze/yahoo-main-options-widget.cpp | 6 +++---
plugins/haze/yahoo-server-settings-widget.cpp | 14 +++++++-------
18 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/plugins/haze/aim-main-options-widget.cpp b/plugins/haze/aim-main-options-widget.cpp
index 392e508..bc19d9c 100644
--- a/plugins/haze/aim-main-options-widget.cpp
+++ b/plugins/haze/aim-main-options-widget.cpp
@@ -30,8 +30,8 @@ AimMainOptionsWidget::AimMainOptionsWidget(ParameterEditModel* model, QWidget* p
m_ui->setupUi(this);
//map the widgets to their data
- 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()));
}
diff --git a/plugins/haze/aim-server-settings-widget.cpp b/plugins/haze/aim-server-settings-widget.cpp
index 361b07b..58ee698 100644
--- a/plugins/haze/aim-server-settings-widget.cpp
+++ b/plugins/haze/aim-server-settings-widget.cpp
@@ -29,14 +29,14 @@ AimServerSettingsWidget::AimServerSettingsWidget(ParameterEditModel *model,
m_ui->setupUi(this);
//server
- handleParameter( "server" , QVariant::String ,m_ui->serverAddress ,m_ui->serverAddressLabel);
- handleParameter( "port" , QVariant::UInt ,m_ui->serverPort ,m_ui->serverPortLabel);
+ handleParameter(QLatin1String("server"), QVariant::String, m_ui->serverAddress, m_ui->serverAddressLabel);
+ handleParameter(QLatin1String("port"), QVariant::UInt, m_ui->serverPort, m_ui->serverPortLabel);
//security
- handleParameter( "encryption" , QVariant::String ,m_ui->encryption ,m_ui->encryptionLabel);
- handleParameter( "always-use-rv-proxy" , QVariant::Bool ,m_ui->rvProxy ,0);
+ handleParameter(QLatin1String("encryption"), QVariant::String, m_ui->encryption, m_ui->encryptionLabel);
+ handleParameter(QLatin1String("always-use-rv-proxy"), QVariant::Bool, m_ui->rvProxy, 0);
//other
- handleParameter( "use-clientlogin" , QVariant::Bool ,m_ui->clientLogin ,0);
- handleParameter( "allow-multiple-logins" , QVariant::Bool ,m_ui->multipleLogins ,0);
+ handleParameter(QLatin1String("use-clientlogin"), QVariant::Bool, m_ui->clientLogin, 0);
+ handleParameter(QLatin1String("allow-multiple-logins"), QVariant::Bool, m_ui->multipleLogins, 0);
}
AimServerSettingsWidget::~AimServerSettingsWidget()
diff --git a/plugins/haze/haze-account-ui-plugin.cpp b/plugins/haze/haze-account-ui-plugin.cpp
index 590b769..addfba2 100644
--- a/plugins/haze/haze-account-ui-plugin.cpp
+++ b/plugins/haze/haze-account-ui-plugin.cpp
@@ -35,12 +35,12 @@ HazeAccountUiPlugin::HazeAccountUiPlugin(QObject *parent, const QVariantList &)
: AbstractAccountUiPlugin(parent)
{
// Register supported cm/protocol combinations
- registerProvidedProtocol("haze", "icq");
- registerProvidedProtocol("haze", "myspace");
- registerProvidedProtocol("haze", "bigbrownchunx-skype-dbus");
- registerProvidedProtocol("haze", "yahoo");
- registerProvidedProtocol("haze", "aim");
- registerProvidedProtocol("haze", "msn");
+ registerProvidedProtocol(QLatin1String("haze"), QLatin1String("icq"));
+ registerProvidedProtocol(QLatin1String("haze"), QLatin1String("myspace"));
+ registerProvidedProtocol(QLatin1String("haze"), QLatin1String("bigbrownchunx-skype-dbus"));
+ registerProvidedProtocol(QLatin1String("haze"), QLatin1String("yahoo"));
+ registerProvidedProtocol(QLatin1String("haze"), QLatin1String("aim"));
+ registerProvidedProtocol(QLatin1String("haze"), QLatin1String("msn"));
}
HazeAccountUiPlugin::~HazeAccountUiPlugin()
diff --git a/plugins/haze/haze-aim-account.cpp b/plugins/haze/haze-aim-account.cpp
index 471f277..26b29b7 100644
--- a/plugins/haze/haze-aim-account.cpp
+++ b/plugins/haze/haze-aim-account.cpp
@@ -29,14 +29,14 @@ HazeAimAccount::HazeAimAccount(QObject *parent)
: AbstractAccountUi(parent)
{
// Register supported parameters
- registerSupportedParameter("account", QVariant::String);
- registerSupportedParameter("password", QVariant::String);
- registerSupportedParameter("server", QVariant::String);
- registerSupportedParameter("port", QVariant::UInt);
- registerSupportedParameter("encryption", QVariant::String);
- registerSupportedParameter("always-use-rv-proxy", QVariant::Bool);
- registerSupportedParameter("use-clientlogin", QVariant::Bool);
- registerSupportedParameter("allow-multiple-logins", QVariant::Bool);
+ registerSupportedParameter(QLatin1String("account"), QVariant::String);
+ registerSupportedParameter(QLatin1String("password"), QVariant::String);
+ registerSupportedParameter(QLatin1String("server"), QVariant::String);
+ registerSupportedParameter(QLatin1String("port"), QVariant::UInt);
+ registerSupportedParameter(QLatin1String("encryption"), QVariant::String);
+ registerSupportedParameter(QLatin1String("always-use-rv-proxy"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("use-clientlogin"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("allow-multiple-logins"), QVariant::Bool);
}
HazeAimAccount::~HazeAimAccount()
diff --git a/plugins/haze/haze-icq-account.cpp b/plugins/haze/haze-icq-account.cpp
index e17529a..037bbc9 100644
--- a/plugins/haze/haze-icq-account.cpp
+++ b/plugins/haze/haze-icq-account.cpp
@@ -29,16 +29,16 @@ HazeIcqAccountUi::HazeIcqAccountUi(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);
- registerSupportedParameter("port", QVariant::Int);
- registerSupportedParameter("server", QVariant::String);
+ registerSupportedParameter(QLatin1String("port"), QVariant::Int);
+ registerSupportedParameter(QLatin1String("server"), QVariant::String);
- registerSupportedParameter("use-ssl", QVariant::Bool);
- registerSupportedParameter("always-use-rv-proxy", QVariant::Bool);
- registerSupportedParameter("allow-multiple-logins", QVariant::Bool);
- registerSupportedParameter("charset", QVariant::String);
+ registerSupportedParameter(QLatin1String("use-ssl"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("always-use-rv-proxy"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("allow-multiple-logins"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("charset"), QVariant::String);
}
HazeIcqAccountUi::~HazeIcqAccountUi()
diff --git a/plugins/haze/haze-msn-account.cpp b/plugins/haze/haze-msn-account.cpp
index b74a317..fb18214 100644
--- a/plugins/haze/haze-msn-account.cpp
+++ b/plugins/haze/haze-msn-account.cpp
@@ -27,8 +27,8 @@ HazeMsnAccountUi::HazeMsnAccountUi(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);
}
HazeMsnAccountUi::~HazeMsnAccountUi()
diff --git a/plugins/haze/haze-myspaceim-account-ui.cpp b/plugins/haze/haze-myspaceim-account-ui.cpp
index ce589cd..3e95f93 100644
--- a/plugins/haze/haze-myspaceim-account-ui.cpp
+++ b/plugins/haze/haze-myspaceim-account-ui.cpp
@@ -28,12 +28,12 @@ HazeMySpaceIMAccountUi::HazeMySpaceIMAccountUi(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("server", QVariant::String);
- registerSupportedParameter("port", QVariant::UInt);
+ registerSupportedParameter(QLatin1String("server"), QVariant::String);
+ registerSupportedParameter(QLatin1String("port"), QVariant::UInt);
}
HazeMySpaceIMAccountUi::~HazeMySpaceIMAccountUi()
diff --git a/plugins/haze/haze-skype-account-ui.cpp b/plugins/haze/haze-skype-account-ui.cpp
index 1d4d116..076fc5b 100644
--- a/plugins/haze/haze-skype-account-ui.cpp
+++ b/plugins/haze/haze-skype-account-ui.cpp
@@ -28,14 +28,14 @@ HazeSkypeAccountUi::HazeSkypeAccountUi(QObject *parent)
{
// Register supported parameters
// Main Options
- registerSupportedParameter("account", QVariant::String);
+ registerSupportedParameter(QLatin1String("account"), QVariant::String);
// Advanced Options
- registerSupportedParameter("skypeout-online", QVariant::Bool);
- registerSupportedParameter("skype-sync", QVariant::Bool);
- registerSupportedParameter("check-for-updates", QVariant::Bool);
- registerSupportedParameter("reject-all-auths", QVariant::Bool);
- registerSupportedParameter("skype-autostart", QVariant::Bool);
+ registerSupportedParameter(QLatin1String("skypeout-online"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("skype-sync"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("check-for-updates"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("reject-all-auths"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("skype-autostart"), QVariant::Bool);
}
HazeSkypeAccountUi::~HazeSkypeAccountUi()
diff --git a/plugins/haze/haze-yahoo-account.cpp b/plugins/haze/haze-yahoo-account.cpp
index 282ad62..1c95b63 100644
--- a/plugins/haze/haze-yahoo-account.cpp
+++ b/plugins/haze/haze-yahoo-account.cpp
@@ -25,15 +25,15 @@ HazeYahooAccount::HazeYahooAccount(QObject* parent)
: AbstractAccountUi(parent)
{
//register that all options are supported
- registerSupportedParameter("account", QVariant::String);
- registerSupportedParameter("password", QVariant::String);
- registerSupportedParameter("port", QVariant::UInt);
- registerSupportedParameter("xfer-host", QVariant::String);
- registerSupportedParameter("xfer-port", QVariant::UInt);
- registerSupportedParameter("room-list-locale", QVariant::String);
- registerSupportedParameter("charset", QVariant::String);
- registerSupportedParameter("proxy-ssl", QVariant::Bool);
- registerSupportedParameter("ignore-invites", QVariant::Bool);
+ registerSupportedParameter(QLatin1String("account"), QVariant::String);
+ registerSupportedParameter(QLatin1String("password"), QVariant::String);
+ registerSupportedParameter(QLatin1String("port"), QVariant::UInt);
+ registerSupportedParameter(QLatin1String("xfer-host"), QVariant::String);
+ registerSupportedParameter(QLatin1String("xfer-port"), QVariant::UInt);
+ registerSupportedParameter(QLatin1String("room-list-locale"), QVariant::String);
+ registerSupportedParameter(QLatin1String("charset"), QVariant::String);
+ registerSupportedParameter(QLatin1String("proxy-ssl"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("ignore-invites"), QVariant::Bool);
}
HazeYahooAccount::~HazeYahooAccount()
diff --git a/plugins/haze/icq-main-options-widget.cpp b/plugins/haze/icq-main-options-widget.cpp
index c7843a9..b6dcbae 100644
--- a/plugins/haze/icq-main-options-widget.cpp
+++ b/plugins/haze/icq-main-options-widget.cpp
@@ -28,8 +28,8 @@ IcqMainOptionsWidget::IcqMainOptionsWidget(ParameterEditModel *model,
m_ui = new Ui::IcqMainOptionsWidget;
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()));
}
diff --git a/plugins/haze/icq-server-settings-widget.cpp b/plugins/haze/icq-server-settings-widget.cpp
index 50f39a9..5355dd0 100644
--- a/plugins/haze/icq-server-settings-widget.cpp
+++ b/plugins/haze/icq-server-settings-widget.cpp
@@ -28,12 +28,12 @@ IcqServerSettingsWidget::IcqServerSettingsWidget(ParameterEditModel *model,
m_ui = new Ui::IcqServerSettingsWidget;
m_ui->setupUi(this);
- handleParameter("server", QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
- handleParameter("port", QVariant::Int, m_ui->portSpinBox, m_ui->portLabel);
- handleParameter("use-ssl", QVariant::Bool, m_ui->useSslCheckBox, 0);
- handleParameter("allow-multiple-logins", QVariant::Bool, m_ui->allowMultipleLoginsCheckBox, 0);
- handleParameter("always-use-rv-proxy", QVariant::Bool, m_ui->alwaysUseRvProxyCheckBox, 0);
- handleParameter("charset", QVariant::String, m_ui->charsetComboBox, m_ui->charsetLabel);
+ handleParameter(QLatin1String("server"), QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
+ handleParameter(QLatin1String("port"), QVariant::Int, m_ui->portSpinBox, m_ui->portLabel);
+ handleParameter(QLatin1String("use-ssl"), QVariant::Bool, m_ui->useSslCheckBox, 0);
+ handleParameter(QLatin1String("allow-multiple-logins"), QVariant::Bool, m_ui->allowMultipleLoginsCheckBox, 0);
+ handleParameter(QLatin1String("always-use-rv-proxy"), QVariant::Bool, m_ui->alwaysUseRvProxyCheckBox, 0);
+ handleParameter(QLatin1String("charset"), QVariant::String, m_ui->charsetComboBox, m_ui->charsetLabel);
}
IcqServerSettingsWidget::~IcqServerSettingsWidget()
diff --git a/plugins/haze/msn-main-options-widget.cpp b/plugins/haze/msn-main-options-widget.cpp
index 0b9b897..3bab791 100644
--- a/plugins/haze/msn-main-options-widget.cpp
+++ b/plugins/haze/msn-main-options-widget.cpp
@@ -27,8 +27,8 @@ MsnMainOptionsWidget::MsnMainOptionsWidget(ParameterEditModel *model, QWidget *p
m_ui = new Ui::MsnMainOptionsWidget;
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()));
}
diff --git a/plugins/haze/myspaceim-advanced-settings-widget.cpp b/plugins/haze/myspaceim-advanced-settings-widget.cpp
index 5be5cba..07f184e 100644
--- a/plugins/haze/myspaceim-advanced-settings-widget.cpp
+++ b/plugins/haze/myspaceim-advanced-settings-widget.cpp
@@ -29,8 +29,8 @@ MySpaceIMAdvancedSettingsWidget::MySpaceIMAdvancedSettingsWidget(ParameterEditMo
m_ui->setupUi(this);
//server
- handleParameter("server", QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
- handleParameter("port", QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
+ handleParameter(QLatin1String("server"), QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
+ handleParameter(QLatin1String("port"), QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
}
MySpaceIMAdvancedSettingsWidget::~MySpaceIMAdvancedSettingsWidget()
diff --git a/plugins/haze/myspaceim-main-options-widget.cpp b/plugins/haze/myspaceim-main-options-widget.cpp
index dad681a..94e475d 100644
--- a/plugins/haze/myspaceim-main-options-widget.cpp
+++ b/plugins/haze/myspaceim-main-options-widget.cpp
@@ -29,8 +29,8 @@ MySpaceIMMainOptionsWidget::MySpaceIMMainOptionsWidget(ParameterEditModel *model
m_ui = new Ui::MySpaceIMMainOptionsWidget;
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);
}
MySpaceIMMainOptionsWidget::~MySpaceIMMainOptionsWidget()
diff --git a/plugins/haze/skype-advanced-settings-widget.cpp b/plugins/haze/skype-advanced-settings-widget.cpp
index ff2b7b5..7152911 100644
--- a/plugins/haze/skype-advanced-settings-widget.cpp
+++ b/plugins/haze/skype-advanced-settings-widget.cpp
@@ -28,11 +28,11 @@ SkypeAdvancedSettingsWidget::SkypeAdvancedSettingsWidget(ParameterEditModel *mod
m_ui->setupUi(this);
//server
- handleParameter("skypeout-online", QVariant::Bool, m_ui->skypeOutCheckBox, 0);
- handleParameter("skype-sync", QVariant::Bool, m_ui->syncCheckBox, 0);
- handleParameter("check-for-updates",QVariant::Bool, m_ui->updatesCheckBox, 0);
- handleParameter("reject-all-auths", QVariant::Bool, m_ui->authRequestsCheckBox, 0);
- handleParameter("skype-autostart", QVariant::Bool, m_ui->autostartCheckBox, 0);
+ handleParameter(QLatin1String("skypeout-online"), QVariant::Bool, m_ui->skypeOutCheckBox, 0);
+ handleParameter(QLatin1String("skype-sync"), QVariant::Bool, m_ui->syncCheckBox, 0);
+ handleParameter(QLatin1String("check-for-updates"),QVariant::Bool, m_ui->updatesCheckBox, 0);
+ handleParameter(QLatin1String("reject-all-auths"), QVariant::Bool, m_ui->authRequestsCheckBox, 0);
+ handleParameter(QLatin1String("skype-autostart"), QVariant::Bool, m_ui->autostartCheckBox, 0);
}
SkypeAdvancedSettingsWidget::~SkypeAdvancedSettingsWidget()
diff --git a/plugins/haze/skype-main-options-widget.cpp b/plugins/haze/skype-main-options-widget.cpp
index 6acdcf6..aef1ac1 100644
--- a/plugins/haze/skype-main-options-widget.cpp
+++ b/plugins/haze/skype-main-options-widget.cpp
@@ -31,12 +31,12 @@ SkypeMainOptionsWidget::SkypeMainOptionsWidget(ParameterEditModel *model, QWidge
m_ui = new Ui::SkypeMainOptionsWidget;
m_ui->setupUi(this);
- handleParameter("account", QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
#ifdef Q_WS_X11
// get autocomplete choices for the accountname
// Skype stores data for each account that has been used in $HOME/.Skype/<accountname>/
- QDir skypeConfigDir(QDir::home().filePath(".Skype"));
+ QDir skypeConfigDir(QDir::home().filePath(QLatin1String(".Skype")));
skypeConfigDir.setFilter(QDir::Dirs | QDir::NoDotAndDotDot);
QFileInfoList folderList = skypeConfigDir.entryInfoList();
diff --git a/plugins/haze/yahoo-main-options-widget.cpp b/plugins/haze/yahoo-main-options-widget.cpp
index d01bb29..a3e4f7c 100644
--- a/plugins/haze/yahoo-main-options-widget.cpp
+++ b/plugins/haze/yahoo-main-options-widget.cpp
@@ -30,8 +30,8 @@ YahooMainOptionsWidget::YahooMainOptionsWidget(ParameterEditModel* model, QWidge
m_ui->setupUi(this);
//map the widgets to their data
- 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()));
}
@@ -42,7 +42,7 @@ YahooMainOptionsWidget::~YahooMainOptionsWidget()
void YahooMainOptionsWidget::submit()
{
- Tp::ProtocolParameter parameter = parameterModel()->parameter("account");
+ Tp::ProtocolParameter parameter = parameterModel()->parameter(QLatin1String("account"));
QModelIndex index = parameterModel()->indexForParameter(parameter);
if (index.isValid()) {
QString account = m_ui->accountLineEdit->text();
diff --git a/plugins/haze/yahoo-server-settings-widget.cpp b/plugins/haze/yahoo-server-settings-widget.cpp
index 7e4c1ed..5e24b3d 100644
--- a/plugins/haze/yahoo-server-settings-widget.cpp
+++ b/plugins/haze/yahoo-server-settings-widget.cpp
@@ -28,16 +28,16 @@ YahooServerSettingsWidget::YahooServerSettingsWidget(ParameterEditModel *model,
m_ui = new Ui::YahooServerSettingsWidget;
m_ui->setupUi(this);
//server
- handleParameter("port", QVariant::UInt, m_ui->serverPort, m_ui->serverPortLabel);
+ handleParameter(QLatin1String("port"), QVariant::UInt, m_ui->serverPort, m_ui->serverPortLabel);
//file transfer
- handleParameter("xfer-host", QVariant::String, m_ui->xferHost, m_ui->xferHostLabel);
- handleParameter("xfer-port", QVariant::UInt, m_ui->xferPort, m_ui->xferPortLabel);
+ handleParameter(QLatin1String("xfer-host"), QVariant::String, m_ui->xferHost, m_ui->xferHostLabel);
+ handleParameter(QLatin1String("xfer-port"), QVariant::UInt, m_ui->xferPort, m_ui->xferPortLabel);
//locale
- handleParameter("room-list-locale", QVariant::String, m_ui->roomListLocale, m_ui->roomListLocaleLablel);
- handleParameter("charset", QVariant::String, m_ui->charsetComboBox, m_ui->charsetLabel);
+ handleParameter(QLatin1String("room-list-locale"), QVariant::String, m_ui->roomListLocale, m_ui->roomListLocaleLablel);
+ handleParameter(QLatin1String("charset"), QVariant::String, m_ui->charsetComboBox, m_ui->charsetLabel);
//other
- handleParameter("proxy-ssl", QVariant::Bool, m_ui->SslProxy, 0);
- handleParameter("ignore-invites", QVariant::Bool, m_ui->ignoreInvites, 0);
+ handleParameter(QLatin1String("proxy-ssl"), QVariant::Bool, m_ui->SslProxy, 0);
+ handleParameter(QLatin1String("ignore-invites"), QVariant::Bool, m_ui->ignoreInvites, 0);
}
YahooServerSettingsWidget::~YahooServerSettingsWidget()
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list