[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:07 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=c3af5fb
The following commit has been merged in the master branch:
commit c3af5fb45c35fb6519a339860866b665c821e2b7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Dec 29 12:35:48 2011 +0100
QLatin1String in plugins/rakia
---
plugins/rakia/rakia-account-ui-plugin.cpp | 4 +--
plugins/rakia/rakia-account-ui.cpp | 40 ++++++++++++-------------
plugins/rakia/rakia-advanced-options-widget.cpp | 28 ++++++++---------
plugins/rakia/rakia-main-options-widget.cpp | 6 ++--
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/plugins/rakia/rakia-account-ui-plugin.cpp b/plugins/rakia/rakia-account-ui-plugin.cpp
index d400632..517de53 100644
--- a/plugins/rakia/rakia-account-ui-plugin.cpp
+++ b/plugins/rakia/rakia-account-ui-plugin.cpp
@@ -31,8 +31,8 @@ RakiaAccountUiPlugin::RakiaAccountUiPlugin(QObject *parent, const QVariantList &
{
// Register supported cm/protocol combinations
// We support rakia/sip and the renamed version rakia/sip combination.
- registerProvidedProtocol("rakia", "sip");
- registerProvidedProtocol("sofiasip", "sip");
+ registerProvidedProtocol(QLatin1String("rakia"), QLatin1String("sip"));
+ registerProvidedProtocol(QLatin1String("sofiasip"), QLatin1String("sip"));
}
RakiaAccountUiPlugin::~RakiaAccountUiPlugin()
diff --git a/plugins/rakia/rakia-account-ui.cpp b/plugins/rakia/rakia-account-ui.cpp
index 8579a8e..cf068a4 100644
--- a/plugins/rakia/rakia-account-ui.cpp
+++ b/plugins/rakia/rakia-account-ui.cpp
@@ -31,64 +31,64 @@ RakiaAccountUi::RakiaAccountUi(QObject *parent)
// Register supported parameters
// Main Options
/**< public SIP address (SIP URI) */
- registerSupportedParameter("account", QVariant::String);
+ registerSupportedParameter(QLatin1String("account"), QVariant::String);
/**< account password (for registration) */
- registerSupportedParameter("password", QVariant::String);
+ registerSupportedParameter(QLatin1String("password"), QVariant::String);
/**< Display name for self */
- registerSupportedParameter("alias", QVariant::String);
+ registerSupportedParameter(QLatin1String("alias"), QVariant::String);
// Advanced Options
/**< account username (if different from public address userinfo part) */
- registerSupportedParameter("auth-user", QVariant::String);
+ registerSupportedParameter(QLatin1String("auth-user"), QVariant::String);
/**< SIP registrar (SIP URI) */
- registerSupportedParameter("registrar", QVariant::String);
+ registerSupportedParameter(QLatin1String("registrar"), QVariant::String);
// Parameters being used to compose the proxy uri
/**< outbound SIP proxy (SIP URI) */
- registerSupportedParameter("proxy-host", QVariant::String);
- registerSupportedParameter("port", QVariant::UInt);
+ registerSupportedParameter(QLatin1String("proxy-host"), QVariant::String);
+ registerSupportedParameter(QLatin1String("port"), QVariant::UInt);
/**< outbound transport */
- registerSupportedParameter("transport", QVariant::String);
+ registerSupportedParameter(QLatin1String("transport"), QVariant::String);
/**< Discover STUN server name using DNS SRV lookup */
- registerSupportedParameter("discover-stun", QVariant::Bool);
+ registerSupportedParameter(QLatin1String("discover-stun"), QVariant::Bool);
/**< STUN server address (if not set, derived from public SIP address) */
- registerSupportedParameter("stun-server", QVariant::String);
+ registerSupportedParameter(QLatin1String("stun-server"), QVariant::String);
/**< STUN port */
- registerSupportedParameter("stun-port", QVariant::UInt);
+ registerSupportedParameter(QLatin1String("stun-port"), QVariant::UInt);
/**< enable discovery of public binding */
- registerSupportedParameter("discover-binding", QVariant::Bool);
+ registerSupportedParameter(QLatin1String("discover-binding"), QVariant::Bool);
/**< enable loose routing behavior */
- registerSupportedParameter("loose-routing", QVariant::Bool);
+ registerSupportedParameter(QLatin1String("loose-routing"), QVariant::Bool);
/**< keepalive mechanism as defined by TpsipConnectionKeepaliveMechanism
* "auto","register","options","stun","off" */
- registerSupportedParameter("keepalive-mechanism", QVariant::String);
+ registerSupportedParameter(QLatin1String("keepalive-mechanism"), QVariant::String);
/**< keepalive interval in seconds */
- registerSupportedParameter("keepalive-interval", QVariant::UInt);
+ registerSupportedParameter(QLatin1String("keepalive-interval"), QVariant::UInt);
// Parameters, we know about their existence but don't expose them to the user
// for eventual later usage, we keep them documented here:
// immuteable-streams: if set to True, you can't add video to an already running voice call.
// /**< If the session content is immutable once set up */
-// registerSupportedParameter("immutable-streams", QVariant::Bool);
+// registerSupportedParameter(QLatin1String("immutable-streams"), QVariant::Bool);
// local-ip-addres, local-port:
// These affect the socket binding of the SIP UA. It's a way to ensure that Sofia-SIP uses a
// particular local IP binding on multi-homed hosts, something that it does not do in a
// satisfactory way automatically.
// /**< Local IP address (normally not needed, chosen by stack) */
-// registerSupportedParameter("local-ip-address", QVariant::String);
+// registerSupportedParameter(QLatin1String("local-ip-address"), QVariant::String);
// /**< Local port for SIP (normally not needed, chosen by stack) */
-// registerSupportedParameter("local-port", QVariant::UInt);
+// registerSupportedParameter(QLatin1String("local-port"), QVariant::UInt);
// extra-auth-user, extra-auth-password:
// ifdigest authentication on demand is implemented, these parameters are obsolete.
// /**< User name to use for extra authentication challenges */
-// registerSupportedParameter("extra-auth-user", QVariant::String);
+// registerSupportedParameter(QLatin1String("extra-auth-user"), QVariant::String);
// /**< Password to use for extra authentication challenges */
-// registerSupportedParameter("extra-auth-password", QVariant::String);
+// registerSupportedParameter(QLatin1String("extra-auth-password"), QVariant::String);
}
RakiaAccountUi::~RakiaAccountUi()
diff --git a/plugins/rakia/rakia-advanced-options-widget.cpp b/plugins/rakia/rakia-advanced-options-widget.cpp
index 8e072db..343b63c 100644
--- a/plugins/rakia/rakia-advanced-options-widget.cpp
+++ b/plugins/rakia/rakia-advanced-options-widget.cpp
@@ -31,52 +31,52 @@ RakiaAdvancedOptionsWidget::RakiaAdvancedOptionsWidget(ParameterEditModel* model
m_ui = new Ui::RakiaAdvancedOptionsWidget;
m_ui->setupUi(this);
- handleParameter("auth-user", QVariant::String,
+ handleParameter(QLatin1String("auth-user"), QVariant::String,
m_ui->authUserLineEdit,
m_ui->authUserLabel);
- handleParameter("registrar", QVariant::String,
+ handleParameter(QLatin1String("registrar"), QVariant::String,
m_ui->registrarLineEdit,
m_ui->registrarLabel);
- handleParameter("proxy-host", QVariant::String,
+ handleParameter(QLatin1String("proxy-host"), QVariant::String,
m_ui->proxyLineEdit,
m_ui->proxyLabel);
- handleParameter("port", QVariant::UInt,
+ handleParameter(QLatin1String("port"), QVariant::UInt,
m_ui->portSpinBox,
m_ui->portLabel);
- handleParameter("transport", QVariant::String,
+ handleParameter(QLatin1String("transport"), QVariant::String,
m_ui->transportComboBox,
m_ui->transportLabel);
- handleParameter("stun-server", QVariant::String,
+ handleParameter(QLatin1String("stun-server"), QVariant::String,
m_ui->stunServerLineEdit,
m_ui->stunServerLabel);
- handleParameter("stun-port", QVariant::UInt,
+ handleParameter(QLatin1String("stun-port"), QVariant::UInt,
m_ui->stunPortSpinBox,
m_ui->stunPortLabel);
- handleParameter("loose-routing", QVariant::Bool,
+ handleParameter(QLatin1String("loose-routing"), QVariant::Bool,
m_ui->looseRoutingCheckBox,
m_ui->looseRoutingLabel);
- handleParameter("discover-binding", QVariant::Bool,
+ handleParameter(QLatin1String("discover-binding"), QVariant::Bool,
m_ui->discoverBindingCheckBox,
m_ui->discoverBindingLabel);
- handleParameter("keepalive-mechanism", QVariant::String,
+ handleParameter(QLatin1String("keepalive-mechanism"), QVariant::String,
m_ui->keepaliveMechanismComboBox,
m_ui->keepaliveMechanismLabel);
- handleParameter("keepalive-interval", QVariant::UInt,
+ handleParameter(QLatin1String("keepalive-interval"), QVariant::UInt,
m_ui->keepaliveIntervalNumInput,
m_ui->keepaliveIntervalLabel);
kDebug() << parameterModel()->data(
- parameterModel()->indexForParameter(parameterModel()->parameter("discover-stun")),
+ parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("discover-stun"))),
ParameterEditModel::ValueRole);
// enable/disable the stunGroupBox if discover-stun is false/true
m_ui->stunGroupBox->setChecked(
!parameterModel()->data(
- parameterModel()->indexForParameter(parameterModel()->parameter("discover-stun")),
+ parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("discover-stun"))),
ParameterEditModel::ValueRole).toBool()
);
@@ -113,7 +113,7 @@ void RakiaAdvancedOptionsWidget::submit()
// https://bugs.freedesktop.org/show_bug.cgi?id=34227 for details
kDebug() << "ok, we're saving now, we need to do some magic!";
parameterModel()->setData(
- parameterModel()->indexForParameter(parameterModel()->parameter("discover-stun")),
+ parameterModel()->indexForParameter(parameterModel()->parameter(QLatin1String("discover-stun"))),
!m_ui->stunGroupBox->isChecked(),
ParameterEditModel::ValueRole);
diff --git a/plugins/rakia/rakia-main-options-widget.cpp b/plugins/rakia/rakia-main-options-widget.cpp
index 8b41c8f..6b57a6f 100644
--- a/plugins/rakia/rakia-main-options-widget.cpp
+++ b/plugins/rakia/rakia-main-options-widget.cpp
@@ -31,9 +31,9 @@ RakiaMainOptionsWidget::RakiaMainOptionsWidget(ParameterEditModel *model, QWidge
m_ui = new Ui::RakiaMainOptionsWidget;
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("alias", QVariant::String, m_ui->aliasLineEdit, m_ui->aliasLabel);
+ handleParameter(QLatin1String("account"), QVariant::String, m_ui->accountLineEdit, m_ui->accountLabel);
+ handleParameter(QLatin1String("password"), QVariant::String, m_ui->passwordLineEdit, m_ui->passwordLabel);
+ handleParameter(QLatin1String("alias"), QVariant::String, m_ui->aliasLineEdit, m_ui->aliasLabel);
// if the account is empty on startup we add a new account, therefore
// set the alias to the current users full name
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list