[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:03 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=1528550
The following commit has been merged in the master branch:
commit 1528550193eb399210b9f516cf75623e592c78ce
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Dec 29 12:34:06 2011 +0100
QLatin1String in KCMTelepathyAccounts
---
src/KCMTelepathyAccounts/account-edit-widget.cpp | 4 +-
src/KCMTelepathyAccounts/dictionary.cpp | 86 ++++++++++++------------
src/KCMTelepathyAccounts/feedback-widget.cpp | 2 +-
src/KCMTelepathyAccounts/plugin-manager.cpp | 2 +-
src/KCMTelepathyAccounts/profile-list-model.cpp | 2 +-
src/KCMTelepathyAccounts/validated-line-edit.cpp | 16 +++--
6 files changed, 58 insertions(+), 54 deletions(-)
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index 8a7f715..e9b6b83 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -87,14 +87,14 @@ AccountEditWidget::AccountEditWidget(const Tp::ProfilePtr &profile,
feedback,
SLOT(setMessage(QString,QString,KMessageWidget::MessageType)));
- d->ui->advancedButton->setIcon(KIcon("configure"));
+ d->ui->advancedButton->setIcon(KIcon(QLatin1String("configure")));
//FIXME: Dictionary should not be needed anymore when distros ship profiles
QString localizedName = Dictionary::instance()->string(profile->name());
if(localizedName.isEmpty()) {
localizedName = profile->name();
}
d->ui->titleLabel->setText(localizedName);
- d->ui->iconLabel->setText("");
+ d->ui->iconLabel->setText(QLatin1String(""));
d->ui->iconLabel->setPixmap(KIcon(profile->iconName()).pixmap(32));
if(connectOnAddFlag == doConnectOnAdd) {
diff --git a/src/KCMTelepathyAccounts/dictionary.cpp b/src/KCMTelepathyAccounts/dictionary.cpp
index f6ec438..2a00179 100644
--- a/src/KCMTelepathyAccounts/dictionary.cpp
+++ b/src/KCMTelepathyAccounts/dictionary.cpp
@@ -30,51 +30,51 @@ Dictionary::Dictionary()
s_self = this;
// Parameters
- m_strings.insert("password", i18n("Password"));
- m_strings.insert("account", i18n("Account"));
- m_strings.insert("priority", i18n("Priority"));
- m_strings.insert("port", i18n("Port"));
- m_strings.insert("alias", i18n("Alias"));
- m_strings.insert("register", i18n("Register new Account"));
- m_strings.insert("server", i18n("Server Address"));
- m_strings.insert("fallback-stun-server", i18n("Fallback STUN server address"));
- m_strings.insert("resource", i18n("Resource"));
- m_strings.insert("https-proxy-port", i18n("HTTPS Proxy Port"));
- m_strings.insert("require-encryption", i18n("Require Encryption"));
- m_strings.insert("old-ssl", i18n("Old-style SSL support"));
- m_strings.insert("fallback-stun-port", i18n("Fallback STUN port"));
- m_strings.insert("fallback-conference-server", i18n("Fallback Conference Server Address"));
- m_strings.insert("low-bandwidth", i18n("Low Bandwidth Mode"));
- m_strings.insert("stun-server", i18n("STUN Server Address"));
- m_strings.insert("stun-port", i18n("STUN Port"));
- m_strings.insert("fallback-socks5-proxies", i18n("Fallback SOCKS5 Proxy Addresses"));
- m_strings.insert("https-proxy-server", i18n("HTTPS Proxy Server Address"));
- m_strings.insert("ignore-ssl-errors", i18n("Ignore SSL Errors"));
- m_strings.insert("keepalive-interval", i18n("Keepalive Interval"));
+ m_strings.insert(QLatin1String("password"), i18n("Password"));
+ m_strings.insert(QLatin1String("account"), i18n("Account"));
+ m_strings.insert(QLatin1String("priority"), i18n("Priority"));
+ m_strings.insert(QLatin1String("port"), i18n("Port"));
+ m_strings.insert(QLatin1String("alias"), i18n("Alias"));
+ m_strings.insert(QLatin1String("register"), i18n("Register new Account"));
+ m_strings.insert(QLatin1String("server"), i18n("Server Address"));
+ m_strings.insert(QLatin1String("fallback-stun-server"), i18n("Fallback STUN server address"));
+ m_strings.insert(QLatin1String("resource"), i18n("Resource"));
+ m_strings.insert(QLatin1String("https-proxy-port"), i18n("HTTPS Proxy Port"));
+ m_strings.insert(QLatin1String("require-encryption"), i18n("Require Encryption"));
+ m_strings.insert(QLatin1String("old-ssl"), i18n("Old-style SSL support"));
+ m_strings.insert(QLatin1String("fallback-stun-port"), i18n("Fallback STUN port"));
+ m_strings.insert(QLatin1String("fallback-conference-server"), i18n("Fallback Conference Server Address"));
+ m_strings.insert(QLatin1String("low-bandwidth"), i18n("Low Bandwidth Mode"));
+ m_strings.insert(QLatin1String("stun-server"), i18n("STUN Server Address"));
+ m_strings.insert(QLatin1String("stun-port"), i18n("STUN Port"));
+ m_strings.insert(QLatin1String("fallback-socks5-proxies"), i18n("Fallback SOCKS5 Proxy Addresses"));
+ m_strings.insert(QLatin1String("https-proxy-server"), i18n("HTTPS Proxy Server Address"));
+ m_strings.insert(QLatin1String("ignore-ssl-errors"), i18n("Ignore SSL Errors"));
+ m_strings.insert(QLatin1String("keepalive-interval"), i18n("Keepalive Interval"));
// Protocols
- m_strings.insert("aim", i18n("AOL Instant Messenger"));
- m_strings.insert("bigbrownchunx-skype-dbus", i18n("Skype"));
- m_strings.insert("facebook", i18n("Facebook Chat"));
- m_strings.insert("gadugadu", i18n("Gadu-Gadu"));
- m_strings.insert("google-talk", i18n("Google Talk"));
- m_strings.insert("groupwise", i18n("Novell Groupwise"));
- m_strings.insert("icq", i18n("ICQ"));
- m_strings.insert("irc", i18n("Internet Relay Chat"));
- m_strings.insert("jabber", i18n("Jabber/XMPP"));
- m_strings.insert("local-xmpp", i18n("Bonjour/Salut"));
- m_strings.insert("mxit", i18n("MXit"));
- m_strings.insert("msn", i18n("Windows Live Messenger"));
- m_strings.insert("myspace", i18n("MySpaceIM"));
- m_strings.insert("qq", i18n("Tencent QQ"));
- m_strings.insert("sametime", i18n("IBM Lotus Sametime"));
- m_strings.insert("silc", i18n("SILC"));
- m_strings.insert("sip", i18n("Session Initiation Protocol (SIP)"));
- m_strings.insert("tel", i18n("GSM Telephony"));
- m_strings.insert("trepia", i18n("Trepia"));
- m_strings.insert("yahoo", i18n("Yahoo! Messenger"));
- m_strings.insert("yahoojp", i18n("Yahoo! Messenger Japan"));
- m_strings.insert("zephyr", i18n("Zephyr"));
+ m_strings.insert(QLatin1String("aim"), i18n("AOL Instant Messenger"));
+ m_strings.insert(QLatin1String("bigbrownchunx-skype-dbus"), i18n("Skype"));
+ m_strings.insert(QLatin1String("facebook"), i18n("Facebook Chat"));
+ m_strings.insert(QLatin1String("gadugadu"), i18n("Gadu-Gadu"));
+ m_strings.insert(QLatin1String("google-talk"), i18n("Google Talk"));
+ m_strings.insert(QLatin1String("groupwise"), i18n("Novell Groupwise"));
+ m_strings.insert(QLatin1String("icq"), i18n("ICQ"));
+ m_strings.insert(QLatin1String("irc"), i18n("Internet Relay Chat"));
+ m_strings.insert(QLatin1String("jabber"), i18n("Jabber/XMPP"));
+ m_strings.insert(QLatin1String("local-xmpp"), i18n("Bonjour/Salut"));
+ m_strings.insert(QLatin1String("mxit"), i18n("MXit"));
+ m_strings.insert(QLatin1String("msn"), i18n("Windows Live Messenger"));
+ m_strings.insert(QLatin1String("myspace"), i18n("MySpaceIM"));
+ m_strings.insert(QLatin1String("qq"), i18n("Tencent QQ"));
+ m_strings.insert(QLatin1String("sametime"), i18n("IBM Lotus Sametime"));
+ m_strings.insert(QLatin1String("silc"), i18n("SILC"));
+ m_strings.insert(QLatin1String("sip"), i18n("Session Initiation Protocol (SIP)"));
+ m_strings.insert(QLatin1String("tel"), i18n("GSM Telephony"));
+ m_strings.insert(QLatin1String("trepia"), i18n("Trepia"));
+ m_strings.insert(QLatin1String("yahoo"), i18n("Yahoo! Messenger"));
+ m_strings.insert(QLatin1String("yahoojp"), i18n("Yahoo! Messenger Japan"));
+ m_strings.insert(QLatin1String("zephyr"), i18n("Zephyr"));
}
Dictionary::~Dictionary()
diff --git a/src/KCMTelepathyAccounts/feedback-widget.cpp b/src/KCMTelepathyAccounts/feedback-widget.cpp
index 32a407b..9d179c2 100644
--- a/src/KCMTelepathyAccounts/feedback-widget.cpp
+++ b/src/KCMTelepathyAccounts/feedback-widget.cpp
@@ -51,7 +51,7 @@ FeedbackWidget::~FeedbackWidget()
void FeedbackWidget::setMessage(const QString &text, const QString &comment, KMessageWidget::MessageType type)
{
- setText(QString("<b>%1</b><br />%2").arg(text).arg(comment), type);
+ setText(QString(QLatin1String("<b>%1</b><br />%2")).arg(text).arg(comment), type);
}
void FeedbackWidget::setText(const QString &text, KMessageWidget::MessageType type)
diff --git a/src/KCMTelepathyAccounts/plugin-manager.cpp b/src/KCMTelepathyAccounts/plugin-manager.cpp
index 09b13f4..f49923b 100644
--- a/src/KCMTelepathyAccounts/plugin-manager.cpp
+++ b/src/KCMTelepathyAccounts/plugin-manager.cpp
@@ -56,7 +56,7 @@ PluginManager *PluginManager::instance()
void PluginManager::loadPlugins()
{
- KService::List offers = KServiceTypeTrader::self()->query("KTpAccountsKCM/AccountUiPlugin");
+ KService::List offers = KServiceTypeTrader::self()->query(QLatin1String("KTpAccountsKCM/AccountUiPlugin"));
KService::List::const_iterator iter;
for (iter = offers.constBegin(); iter < offers.constEnd(); ++iter) {
diff --git a/src/KCMTelepathyAccounts/profile-list-model.cpp b/src/KCMTelepathyAccounts/profile-list-model.cpp
index ea5385e..063dff6 100644
--- a/src/KCMTelepathyAccounts/profile-list-model.cpp
+++ b/src/KCMTelepathyAccounts/profile-list-model.cpp
@@ -96,7 +96,7 @@ bool ProfileListModel::hasNonFakeProfile(const Tp::ProfilePtr& profile, const QL
if(profile->protocolName() == otherProfile->protocolName() && !otherProfile->isFake())
{
// check if this profile is for a special service or for this protocol in general
- if(otherProfile->serviceName() == otherProfile->cmName().append("-").append(otherProfile->protocolName())
+ if(otherProfile->serviceName() == otherProfile->cmName().append(QLatin1String("-")).append(otherProfile->protocolName())
|| otherProfile->serviceName() == otherProfile->protocolName()) {
//check we have a valid CM for the non-fake profile
diff --git a/src/KCMTelepathyAccounts/validated-line-edit.cpp b/src/KCMTelepathyAccounts/validated-line-edit.cpp
index 62cfab9..38090bb 100644
--- a/src/KCMTelepathyAccounts/validated-line-edit.cpp
+++ b/src/KCMTelepathyAccounts/validated-line-edit.cpp
@@ -118,16 +118,20 @@ void ValidatedLineEdit::setValidator(PredefinedValidator validator)
switch(validator)
{
case NotEmptyValidator:
- setValidator(".+", i18n("This field should not be empty"));
+ setValidator(QLatin1String(".+"),
+ i18n("This field should not be empty"));
break;
case EmailValidator:
- setValidator("[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}", i18n("This field should contain an email address"));
+ setValidator(QLatin1String("[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}"),
+ i18n("This field should contain an email address"));
break;
case HostnameValidator:
- setValidator(".+\..+", i18n("This field should contain a hostname"));
+ setValidator(QLatin1String(".+\..+"),
+ i18n("This field should contain a hostname"));
break;
case IPAddressValidator:
- setValidator("\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}", i18n("This field should contain an IP address"));
+ setValidator(QLatin1String("\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"),
+ i18n("This field should contain an IP address"));
break;
}
}
@@ -171,14 +175,14 @@ void ValidatedLineEdit::validate()
if(d->validator.validate(validatedText, pos) == QValidator::Acceptable) {
if(d->currentIcon != ValidationIconWidget::ValidIcon) {
- d->validationIcon->setPixmap(SmallIcon("dialog-ok-apply", 0));
+ d->validationIcon->setPixmap(SmallIcon(QLatin1String("dialog-ok-apply"), 0));
setToolTip(i18n("This field is valid"));
d->currentIcon = ValidationIconWidget::ValidIcon;
d->currentState = QValidator::Acceptable;
}
}
else if(d->currentIcon != ValidationIconWidget::InvalidIcon) {
- d->validationIcon->setPixmap(SmallIcon("dialog-error", 0));
+ d->validationIcon->setPixmap(SmallIcon(QLatin1String("dialog-error"), 0));
this->setToolTip(d->errorMessage);
d->currentIcon = ValidationIconWidget::InvalidIcon;
d->currentState = QValidator::Invalid;
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list