[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:05 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=befd33d
The following commit has been merged in the master branch:
commit befd33d8aa6170c8320b54d6baaefb6bcfed5fbf
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Dec 29 12:35:22 2011 +0100
QLatin1String in plugins/gabble
---
plugins/gabble/gabble-account-ui-plugin.cpp | 2 +-
plugins/gabble/gabble-account-ui.cpp | 38 +++++++++++------------
plugins/gabble/main-options-widget-facebook.cpp | 12 +++----
plugins/gabble/main-options-widget-googletalk.cpp | 4 +--
plugins/gabble/main-options-widget.cpp | 6 ++--
plugins/gabble/proxy-settings-widget.cpp | 16 +++++-----
plugins/gabble/server-settings-widget.cpp | 18 +++++------
7 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/plugins/gabble/gabble-account-ui-plugin.cpp b/plugins/gabble/gabble-account-ui-plugin.cpp
index 627d778..b9566c1 100644
--- a/plugins/gabble/gabble-account-ui-plugin.cpp
+++ b/plugins/gabble/gabble-account-ui-plugin.cpp
@@ -29,7 +29,7 @@ GabbleAccountUiPlugin::GabbleAccountUiPlugin(QObject *parent, const QVariantList
: AbstractAccountUiPlugin(parent)
{
// Register supported cm/protocol combinations
- registerProvidedProtocol("gabble", "jabber");
+ registerProvidedProtocol(QLatin1String("gabble"), QLatin1String("jabber"));
}
GabbleAccountUiPlugin::~GabbleAccountUiPlugin()
diff --git a/plugins/gabble/gabble-account-ui.cpp b/plugins/gabble/gabble-account-ui.cpp
index 357a099..0e86c0f 100644
--- a/plugins/gabble/gabble-account-ui.cpp
+++ b/plugins/gabble/gabble-account-ui.cpp
@@ -36,25 +36,25 @@ GabbleAccountUi::GabbleAccountUi(const QString &serviceName, QObject *parent)
m_serviceName(serviceName)
{
// Register supported parameters
- registerSupportedParameter("account", QVariant::String);
- registerSupportedParameter("password", QVariant::String);
+ registerSupportedParameter(QLatin1String("account"), QVariant::String);
+ registerSupportedParameter(QLatin1String("password"), QVariant::String);
- registerSupportedParameter("port", QVariant::UInt);
- registerSupportedParameter("server", QVariant::String);
- registerSupportedParameter("require-encryption", QVariant::Bool);
- registerSupportedParameter("old-ssl", QVariant::Bool);
- registerSupportedParameter("low-bandwidth", QVariant::Bool);
- registerSupportedParameter("ignore-ssl-errors", QVariant::Bool);
- registerSupportedParameter("keepalive-interval", QVariant::UInt);
+ registerSupportedParameter(QLatin1String("port"), QVariant::UInt);
+ registerSupportedParameter(QLatin1String("server"), QVariant::String);
+ registerSupportedParameter(QLatin1String("require-encryption"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("old-ssl"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("low-bandwidth"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("ignore-ssl-errors"), QVariant::Bool);
+ registerSupportedParameter(QLatin1String("keepalive-interval"), QVariant::UInt);
- registerSupportedParameter("stun-server", QVariant::String);
- registerSupportedParameter("stun-port", QVariant::UInt);
- registerSupportedParameter("fallback-stun-server", QVariant::String);
- registerSupportedParameter("fallback-stun-port", QVariant::UInt);
- registerSupportedParameter("https-proxy-server", QVariant::String);
- registerSupportedParameter("https-proxy-port", QVariant::UInt);
- registerSupportedParameter("fallback-socks5-proxies", QVariant::StringList);
- registerSupportedParameter("fallback-conference-server", QVariant::String);
+ registerSupportedParameter(QLatin1String("stun-server"), QVariant::String);
+ registerSupportedParameter(QLatin1String("stun-port"), QVariant::UInt);
+ registerSupportedParameter(QLatin1String("fallback-stun-server"), QVariant::String);
+ registerSupportedParameter(QLatin1String("fallback-stun-port"), QVariant::UInt);
+ registerSupportedParameter(QLatin1String("https-proxy-server"), QVariant::String);
+ registerSupportedParameter(QLatin1String("https-proxy-port"), QVariant::UInt);
+ registerSupportedParameter(QLatin1String("fallback-socks5-proxies"), QVariant::StringList);
+ registerSupportedParameter(QLatin1String("fallback-conference-server"), QVariant::String);
}
GabbleAccountUi::~GabbleAccountUi()
@@ -88,9 +88,9 @@ AbstractAccountParametersWidget *GabbleAccountUi::advancedOptionsWidget(
GenericAdvancedOptionsWidget *widget = new GenericAdvancedOptionsWidget(model, parent);
AbstractAccountParametersWidget* serverSettingsWidget = new ServerSettingsWidget(model, widget);
- widget->addTab(serverSettingsWidget, "Server");
+ widget->addTab(serverSettingsWidget, i18n("Server"));
AbstractAccountParametersWidget* proxySettingsWidget = new ProxySettingsWidget(model, widget);
- widget->addTab(proxySettingsWidget, "Proxy");
+ widget->addTab(proxySettingsWidget, i18n("Proxy"));
return widget;
}
diff --git a/plugins/gabble/main-options-widget-facebook.cpp b/plugins/gabble/main-options-widget-facebook.cpp
index e8e8ac5..7e800be 100644
--- a/plugins/gabble/main-options-widget-facebook.cpp
+++ b/plugins/gabble/main-options-widget-facebook.cpp
@@ -33,16 +33,16 @@ MainOptionsWidgetFacebook::MainOptionsWidgetFacebook(ParameterEditModel *model,
// We cannot use handleParameter directly as we need to append @chat.facebook.com onto the end of the JID.
// Profiles have no method to do this, so pseudo-hardcoding is the only available option.
- Tp::ProtocolParameter parameter = parameterModel()->parameter("account");
+ Tp::ProtocolParameter parameter = parameterModel()->parameter(QLatin1String("account"));
QModelIndex index = parameterModel()->indexForParameter(parameter);
if (index.isValid()) {
QString account = index.data().toString();
//strip off any "@chat.facebook.com" from the parameter when displaying it in the text edit.
- account = account.left(account.indexOf('@'));
+ account = account.left(account.indexOf(QLatin1Char('@')));
m_ui->accountLineEdit->setText(account);
}
- handleParameter("password", QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
+ handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus()));
}
@@ -53,14 +53,14 @@ MainOptionsWidgetFacebook::~MainOptionsWidgetFacebook()
void MainOptionsWidgetFacebook::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();
//append "@chat.facebook.com" (fetching the address from the default params for as much future compatiability as possible)
- account.append('@');
- QString serverAddress = parameterModel()->indexForParameter(parameterModel()->parameter("server")).data().toString();
+ account.append(QLatin1Char('@'));
+ QString serverAddress = parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("server"))).data().toString();
account.append(serverAddress);
//update the model with the account value from the text box.
diff --git a/plugins/gabble/main-options-widget-googletalk.cpp b/plugins/gabble/main-options-widget-googletalk.cpp
index 7795e8d..ed97bff 100644
--- a/plugins/gabble/main-options-widget-googletalk.cpp
+++ b/plugins/gabble/main-options-widget-googletalk.cpp
@@ -28,8 +28,8 @@ MainOptionsWidgetGoogleTalk::MainOptionsWidgetGoogleTalk(ParameterEditModel *mod
m_ui = new Ui::MainOptionsWidgetGoogleTalk;
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/gabble/main-options-widget.cpp b/plugins/gabble/main-options-widget.cpp
index 75d968e..927bb32 100644
--- a/plugins/gabble/main-options-widget.cpp
+++ b/plugins/gabble/main-options-widget.cpp
@@ -28,9 +28,9 @@ 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("register", QVariant::Bool, m_ui->registerCheckBox, 0);
+ handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
+ handleParameter(QLatin1String("register"), QVariant::Bool, m_ui->registerCheckBox, 0);
QTimer::singleShot(0, m_ui->accountLineEdit, SLOT(setFocus()));
}
diff --git a/plugins/gabble/proxy-settings-widget.cpp b/plugins/gabble/proxy-settings-widget.cpp
index f23ab57..2739aef 100644
--- a/plugins/gabble/proxy-settings-widget.cpp
+++ b/plugins/gabble/proxy-settings-widget.cpp
@@ -28,14 +28,14 @@ ProxySettingsWidget::ProxySettingsWidget(ParameterEditModel *model,
m_ui = new Ui::ProxySettingsWidget;
m_ui->setupUi(this);
- handleParameter("stun-server", QVariant::String, m_ui->stunServerLineEdit, m_ui->stunServerLabel);
- handleParameter("stun-port", QVariant::UInt, m_ui->stunPortSpinBox, m_ui->stunPortLabel);
- handleParameter("fallback-stun-server", QVariant::String, m_ui->fallbackStunServerLineEdit, m_ui->fallbackStunServerLabel);
- handleParameter("fallback-stun-port", QVariant::UInt, m_ui->fallbackStunPortSpinBox, m_ui->fallbackStunPortLabel);
- handleParameter("https-proxy-server", QVariant::String, m_ui->httpsProxyServerLineEdit, m_ui->httpsProxyServerLabel);
- handleParameter("https-proxy-port", QVariant::UInt, m_ui->httpsProxyPortSpinBox, m_ui->httpsProxyPortLabel);
- handleParameter("fallback-socks5-proxies", QVariant::StringList, m_ui->fallbackSocks5ProxiesTextEdit, m_ui->fallbackSocks5ProxiesLabel);
- handleParameter("fallback-conference-server", QVariant::String, m_ui->fallbackConferenceServerLineEdit, m_ui->fallbackConferenceServerLabel);
+ handleParameter(QLatin1String("stun-server"), QVariant::String, m_ui->stunServerLineEdit, m_ui->stunServerLabel);
+ handleParameter(QLatin1String("stun-port"), QVariant::UInt, m_ui->stunPortSpinBox, m_ui->stunPortLabel);
+ handleParameter(QLatin1String("fallback-stun-server"), QVariant::String, m_ui->fallbackStunServerLineEdit, m_ui->fallbackStunServerLabel);
+ handleParameter(QLatin1String("fallback-stun-port"), QVariant::UInt, m_ui->fallbackStunPortSpinBox, m_ui->fallbackStunPortLabel);
+ handleParameter(QLatin1String("https-proxy-server"), QVariant::String, m_ui->httpsProxyServerLineEdit, m_ui->httpsProxyServerLabel);
+ handleParameter(QLatin1String("https-proxy-port"), QVariant::UInt, m_ui->httpsProxyPortSpinBox, m_ui->httpsProxyPortLabel);
+ handleParameter(QLatin1String("fallback-socks5-proxies"), QVariant::StringList, m_ui->fallbackSocks5ProxiesTextEdit, m_ui->fallbackSocks5ProxiesLabel);
+ handleParameter(QLatin1String("fallback-conference-server"), QVariant::String, m_ui->fallbackConferenceServerLineEdit, m_ui->fallbackConferenceServerLabel);
}
ProxySettingsWidget::~ProxySettingsWidget()
diff --git a/plugins/gabble/server-settings-widget.cpp b/plugins/gabble/server-settings-widget.cpp
index a7f0da5..691e6bf 100644
--- a/plugins/gabble/server-settings-widget.cpp
+++ b/plugins/gabble/server-settings-widget.cpp
@@ -28,15 +28,15 @@ ServerSettingsWidget::ServerSettingsWidget(ParameterEditModel *model,
m_ui = new Ui::ServerSettingsWidget;
m_ui->setupUi(this);
- handleParameter("server", QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
- handleParameter("port", QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
- handleParameter("keepalive-interval", QVariant::UInt, m_ui->keepaliveIntervalSpinBox, 0);
- handleParameter("low-bandwidth", QVariant::Bool, m_ui->lowBandwidthCheckBox, 0);
- handleParameter("require-encryption", QVariant::Bool, m_ui->requireEncryptionCheckBox, 0);
- handleParameter("ignore-ssl-errors", QVariant::Bool, m_ui->ignoreSslErrorsCheckBox, 0);
- handleParameter("old-ssl", QVariant::Bool, m_ui->oldSslCheckBox, 0);
- handleParameter("resource", QVariant::String, m_ui->resourceLineEdit, m_ui->resourceLabel);
- handleParameter("priority", QVariant::Int, m_ui->prioritySpinBox, m_ui->priorityLabel);
+ handleParameter(QLatin1String("server"), QVariant::String, m_ui->serverLineEdit, m_ui->serverLabel);
+ handleParameter(QLatin1String("port"), QVariant::UInt, m_ui->portSpinBox, m_ui->portLabel);
+ handleParameter(QLatin1String("keepalive-interval"), QVariant::UInt, m_ui->keepaliveIntervalSpinBox, 0);
+ handleParameter(QLatin1String("low-bandwidth"), QVariant::Bool, m_ui->lowBandwidthCheckBox, 0);
+ handleParameter(QLatin1String("require-encryption"), QVariant::Bool, m_ui->requireEncryptionCheckBox, 0);
+ handleParameter(QLatin1String("ignore-ssl-errors"), QVariant::Bool, m_ui->ignoreSslErrorsCheckBox, 0);
+ handleParameter(QLatin1String("old-ssl"), QVariant::Bool, m_ui->oldSslCheckBox, 0);
+ handleParameter(QLatin1String("resource"), QVariant::String, m_ui->resourceLineEdit, m_ui->resourceLabel);
+ handleParameter(QLatin1String("priority"), QVariant::Int, m_ui->prioritySpinBox, m_ui->priorityLabel);
}
ServerSettingsWidget::~ServerSettingsWidget()
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list