[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:10 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=bd52a72
The following commit has been merged in the master branch:
commit bd52a72b6e655b6e1c6758b16149d2d3ed0299a7
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date: Thu Dec 29 14:23:45 2011 +0100
Fix Martin's issues and some more cleanup
---
plugins/gabble/gabble-account-ui.cpp | 2 +-
plugins/rakia/rakia-account-ui-plugin.cpp | 2 +-
plugins/rakia/rakia-main-options-widget.cpp | 2 +-
plugins/salut/salut-main-options-widget.cpp | 2 +-
.../abstract-account-parameters-widget.cpp | 12 ++++++------
src/KCMTelepathyAccounts/account-edit-widget.cpp | 15 +++++++--------
src/KCMTelepathyAccounts/feedback-widget.cpp | 2 +-
.../generic-advanced-options-widget.cpp | 2 +-
src/KCMTelepathyAccounts/parameter-edit-model.cpp | 18 +++++++++---------
src/KCMTelepathyAccounts/profile-item.cpp | 2 +-
src/KCMTelepathyAccounts/profile-list-model.cpp | 12 ++++++------
src/KCMTelepathyAccounts/profile-select-widget.cpp | 2 +-
src/KCMTelepathyAccounts/validated-line-edit.cpp | 6 +++---
src/account-item.cpp | 6 +++---
src/accounts-list-delegate.cpp | 2 +-
src/accounts-list-model.cpp | 20 ++++++++++----------
src/add-account-assistant.cpp | 8 ++++----
src/kcm-telepathy-accounts.cpp | 8 ++++----
src/salut-details-dialog.cpp | 2 +-
src/salut-enabler.cpp | 12 ++++++------
src/salut-message-widget.cpp | 8 ++++----
21 files changed, 72 insertions(+), 73 deletions(-)
diff --git a/plugins/gabble/gabble-account-ui.cpp b/plugins/gabble/gabble-account-ui.cpp
index 0e86c0f..7a2fea3 100644
--- a/plugins/gabble/gabble-account-ui.cpp
+++ b/plugins/gabble/gabble-account-ui.cpp
@@ -65,7 +65,7 @@ AbstractAccountParametersWidget *GabbleAccountUi::mainOptionsWidget(
ParameterEditModel *model,
QWidget *parent) const
{
- if(m_serviceName == QLatin1String("google-talk")) {
+ if (m_serviceName == QLatin1String("google-talk")) {
return new MainOptionsWidgetGoogleTalk(model, parent);
} else if (m_serviceName == QLatin1String("facebook")) {
return new MainOptionsWidgetFacebook(model, parent);
diff --git a/plugins/rakia/rakia-account-ui-plugin.cpp b/plugins/rakia/rakia-account-ui-plugin.cpp
index 517de53..79a9717 100644
--- a/plugins/rakia/rakia-account-ui-plugin.cpp
+++ b/plugins/rakia/rakia-account-ui-plugin.cpp
@@ -48,7 +48,7 @@ AbstractAccountUi* RakiaAccountUiPlugin::accountUi(const QString &connectionMana
", servicename: " << serviceName;
// We support rakia/sip and the renamed version rakia/sip combination.
- if(((connectionManager == QLatin1String("rakia")) && (protocol == QLatin1String("sip"))) ||
+ if (((connectionManager == QLatin1String("rakia")) && (protocol == QLatin1String("sip"))) ||
((connectionManager == QLatin1String("sofiasip")) && (protocol == QLatin1String("sip")))
) {
return new RakiaAccountUi;
diff --git a/plugins/rakia/rakia-main-options-widget.cpp b/plugins/rakia/rakia-main-options-widget.cpp
index 6b57a6f..ecb4ee4 100644
--- a/plugins/rakia/rakia-main-options-widget.cpp
+++ b/plugins/rakia/rakia-main-options-widget.cpp
@@ -37,7 +37,7 @@ RakiaMainOptionsWidget::RakiaMainOptionsWidget(ParameterEditModel *model, QWidge
// if the account is empty on startup we add a new account, therefore
// set the alias to the current users full name
- if(m_ui->accountLineEdit->text().isEmpty()) {
+ if (m_ui->accountLineEdit->text().isEmpty()) {
KUser user = KUser();
m_ui->aliasLineEdit->setText(user.property(KUser::FullName).toString());
}
diff --git a/plugins/salut/salut-main-options-widget.cpp b/plugins/salut/salut-main-options-widget.cpp
index 33d76a1..64b4167 100644
--- a/plugins/salut/salut-main-options-widget.cpp
+++ b/plugins/salut/salut-main-options-widget.cpp
@@ -37,7 +37,7 @@ SalutMainOptionsWidget::SalutMainOptionsWidget(ParameterEditModel *model, QWidge
// if the first- and last-name are empty on startup we add them based on
// the current users full name
- if(m_ui->firstnameLineEdit->text().isEmpty()) {
+ if (m_ui->firstnameLineEdit->text().isEmpty()) {
KUser user = KUser();
m_ui->firstnameLineEdit->setText(user.property(KUser::FullName).toString());
m_ui->nicknameLineEdit->setText(user.loginName());
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index 553d632..c697ea9 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -89,7 +89,7 @@ void AbstractAccountParametersWidget::handleParameter(const QString ¶meterNa
QWidget* labelWidget = 0)
{
QList<QWidget*> labelWidgets;
- if(labelWidget) {
+ if (labelWidget) {
labelWidgets << labelWidget;
}
handleParameter(parameterName, parameterType, dataWidget, labelWidgets);
@@ -104,12 +104,12 @@ void AbstractAccountParametersWidget::handleParameter(const QString ¶meterNa
Tp::ProtocolParameter foundParameter = d->parameterModel->parameter(parameterName);
- if(!foundParameter.isValid() || foundParameter.type() != parameterType) {
+ if (!foundParameter.isValid() || foundParameter.type() != parameterType) {
// hide widgets because they are not needed
kDebug() << "Field" << parameterName << "hidden";
dataWidget->hide();
Q_FOREACH (QWidget *label, labelWidgets) {
- if(label) {
+ if (label) {
label->hide();
}
}
@@ -117,7 +117,7 @@ void AbstractAccountParametersWidget::handleParameter(const QString ¶meterNa
}
QModelIndex index = d->parameterModel->indexForParameter(foundParameter);
- if(index.isValid()) {
+ if (index.isValid()) {
kDebug() << index << parameterName;
// insert it to valid parameters list
//for text edit boxes we force it to use the plainText property so that we don't get HTML all over our options
@@ -130,11 +130,11 @@ void AbstractAccountParametersWidget::handleParameter(const QString ¶meterNa
// check if the passed parameter is a validated one.. If so we're going to set the model here
ValidatedLineEdit *validated = qobject_cast<ValidatedLineEdit*>(dataWidget);
- if(validated) {
+ if (validated) {
d->validatedWidgets.insert(index, validated);
}
- if (! (index.flags() & Qt::ItemIsEnabled)) {
+ if (!(index.flags() & Qt::ItemIsEnabled)) {
dataWidget->setEnabled(false);
}
}
diff --git a/src/KCMTelepathyAccounts/account-edit-widget.cpp b/src/KCMTelepathyAccounts/account-edit-widget.cpp
index e9b6b83..312a4c9 100644
--- a/src/KCMTelepathyAccounts/account-edit-widget.cpp
+++ b/src/KCMTelepathyAccounts/account-edit-widget.cpp
@@ -90,19 +90,18 @@ AccountEditWidget::AccountEditWidget(const Tp::ProfilePtr &profile,
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()) {
+ if (localizedName.isEmpty()) {
localizedName = profile->name();
}
d->ui->titleLabel->setText(localizedName);
- d->ui->iconLabel->setText(QLatin1String(""));
+ d->ui->iconLabel->setText(QString());
d->ui->iconLabel->setPixmap(KIcon(profile->iconName()).pixmap(32));
- if(connectOnAddFlag == doConnectOnAdd) {
+ if (connectOnAddFlag == doConnectOnAdd) {
d->connectOnAdd = new QCheckBox(i18n("Connect when wizard is finished"), this);
d->connectOnAdd->setChecked(true);
d->ui->verticalLayout->addWidget(d->connectOnAdd);
- }
- else{
+ } else {
d->connectOnAdd = 0;
}
@@ -157,7 +156,7 @@ void AccountEditWidget::loadWidgets()
// also verify if the UI handle all mandatory parameters
QMap<QString, QVariant::Type> params = d->accountUi->supportedParameters();
QMap<QString, QVariant::Type>::const_iterator paramIter = params.constBegin();
- while(paramIter != params.constEnd()) {
+ while (paramIter != params.constEnd()) {
Q_FOREACH (const Tp::ProtocolParameter ¶meter, d->parameterModel->parameters()) {
if ((parameter.name() == paramIter.key()) &&
(parameter.type() == paramIter.value())) {
@@ -201,7 +200,7 @@ QStringList AccountEditWidget::parametersUnset() const
void AccountEditWidget::onAdvancedClicked()
{
- if(!d->parameterModel->validateParameterValues()) {
+ if (!d->parameterModel->validateParameterValues()) {
return;
}
@@ -238,7 +237,7 @@ ParameterEditModel* AccountEditWidget::parameterModel() const
bool AccountEditWidget::connectOnAdd()
{
- if(d->connectOnAdd == 0){
+ if (d->connectOnAdd == 0) {
return false;
}
else{
diff --git a/src/KCMTelepathyAccounts/feedback-widget.cpp b/src/KCMTelepathyAccounts/feedback-widget.cpp
index 9d179c2..45a2ef2 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(QLatin1String("<b>%1</b><br />%2")).arg(text).arg(comment), type);
+ setText(QString::fromLatin1("<b>%1</b><br />%2").arg(text).arg(comment), type);
}
void FeedbackWidget::setText(const QString &text, KMessageWidget::MessageType type)
diff --git a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
index 461791e..73783eb 100644
--- a/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
+++ b/src/KCMTelepathyAccounts/generic-advanced-options-widget.cpp
@@ -78,7 +78,7 @@ void GenericAdvancedOptionsWidget::submit()
void GenericAdvancedOptionsWidget::addTab(AbstractAccountParametersWidget* tab, const QString& label)
{
- if(d->tabWidget->count() == 1) {
+ if (d->tabWidget->count() == 1) {
d->tabWidget->setTabBarHidden(false);
}
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index 2c5e16d..6f894a2 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -57,7 +57,7 @@ int ParameterEditModel::rowCount(const QModelIndex &index) const
QVariant ParameterEditModel::data(const QModelIndex &index, int role) const
{
- if(!index.isValid()) {
+ if (!index.isValid()) {
return QVariant();
}
@@ -71,7 +71,7 @@ QVariant ParameterEditModel::data(const QModelIndex &index, int role) const
case Qt::EditRole:
case ParameterEditModel::ValueRole:
data = QVariant(m_items.at(index.row())->value());
- if(!data.isValid()) {
+ if (!data.isValid()) {
data = this->data(index, ParameterEditModel::DefaultValueRole);
}
break;
@@ -130,7 +130,7 @@ bool ParameterEditModel::setData(const QModelIndex &index, const QVariant &value
if (role == ParameterEditModel::ValueRole || role == Qt::EditRole) {
//never edit items fixed in the profile.
- if(m_items.at(index.row())->isMandatory()) {
+ if (m_items.at(index.row())->isMandatory()) {
return false;
}
@@ -158,8 +158,8 @@ bool ParameterEditModel::setData(const QModelIndex &index, const QVariant &value
QModelIndex ParameterEditModel::indexForParameter(const Tp::ProtocolParameter ¶meter) const
{
- for(int i=0; i<m_items.size(); ++i) {
- if(m_items.at(i)->parameter() == parameter) {
+ for (int i=0; i<m_items.size(); ++i) {
+ if (m_items.at(i)->parameter() == parameter) {
return createIndex(i,0);
}
}
@@ -168,9 +168,9 @@ QModelIndex ParameterEditModel::indexForParameter(const Tp::ProtocolParameter &p
QModelIndex ParameterEditModel::indexForParameter(const Tp::Profile::Parameter ¶meter) const
{
- for(int i=0; i<m_items.size(); ++i) {
+ for (int i=0; i<m_items.size(); ++i) {
ParameterItem *item = m_items.at(i);
- if(item->parameter().name() == parameter.name() && item->parameter().type() == parameter.type()) {
+ if (item->parameter().name() == parameter.name() && item->parameter().type() == parameter.type()) {
return createIndex(i,0);
}
}
@@ -180,7 +180,7 @@ QModelIndex ParameterEditModel::indexForParameter(const Tp::Profile::Parameter &
Tp::ProtocolParameter ParameterEditModel::parameter(const QString ¶meterName) const
{
Q_FOREACH (ParameterItem* item, m_items) {
- if(item->parameter().name() == parameterName) {
+ if (item->parameter().name() == parameterName) {
return item->parameter();
}
}
@@ -193,7 +193,7 @@ void ParameterEditModel::addItem(const Tp::ProtocolParameter ¶meter, const T
{
// Check we are not creating duplicate items.
Q_FOREACH (const ParameterItem *item, m_items) {
- if(item->parameter() == parameter) {
+ if (item->parameter() == parameter) {
return;
}
}
diff --git a/src/KCMTelepathyAccounts/profile-item.cpp b/src/KCMTelepathyAccounts/profile-item.cpp
index 77ac192..ee3b63d 100644
--- a/src/KCMTelepathyAccounts/profile-item.cpp
+++ b/src/KCMTelepathyAccounts/profile-item.cpp
@@ -34,7 +34,7 @@ ProfileItem::ProfileItem(const Tp::ProfilePtr &profile, QObject *parent)
{
//FIXME: Dictionary should not be needed anymore when distros ship profiles
m_localizedName = Dictionary::instance()->string(profile->name());
- if(m_localizedName.isEmpty()) {
+ if (m_localizedName.isEmpty()) {
m_localizedName = profile->name();
}
diff --git a/src/KCMTelepathyAccounts/profile-list-model.cpp b/src/KCMTelepathyAccounts/profile-list-model.cpp
index 063dff6..328a361 100644
--- a/src/KCMTelepathyAccounts/profile-list-model.cpp
+++ b/src/KCMTelepathyAccounts/profile-list-model.cpp
@@ -93,14 +93,14 @@ bool ProfileListModel::hasNonFakeProfile(const Tp::ProfilePtr& profile, const QL
{
//loop through all profiles, and look for a non autogenerated profile which matches this name.
Q_FOREACH (const Tp::ProfilePtr &otherProfile, profiles) {
- if(profile->protocolName() == otherProfile->protocolName() && !otherProfile->isFake())
+ 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(QLatin1String("-")).append(otherProfile->protocolName())
+ if (otherProfile->serviceName() == otherProfile->cmName().append(QLatin1Char('-')).append(otherProfile->protocolName())
|| otherProfile->serviceName() == otherProfile->protocolName()) {
//check we have a valid CM for the non-fake profile
- if(m_connectionManagerNames.contains(otherProfile->cmName())) {
+ if (m_connectionManagerNames.contains(otherProfile->cmName())) {
return true;
}
}
@@ -123,8 +123,8 @@ void ProfileListModel::populateList()
QList<ProfileItem*> insertItems;
Q_FOREACH (const Tp::ProfilePtr &profile, profiles) {
- if(profile->isFake()) {
- if(hasNonFakeProfile(profile, profiles)) {
+ if (profile->isFake()) {
+ if (hasNonFakeProfile(profile, profiles)) {
continue;
}
}
@@ -137,7 +137,7 @@ void ProfileListModel::populateList()
insertItems.append(new ProfileItem(profile, this));
}
- if( insertItems.size() > 0 )
+ if ( insertItems.size() > 0 )
{
beginInsertRows(QModelIndex(), 0, insertItems.size()-1);
m_profileItems.append(insertItems);
diff --git a/src/KCMTelepathyAccounts/profile-select-widget.cpp b/src/KCMTelepathyAccounts/profile-select-widget.cpp
index 5ca4e2f..3b83ff7 100644
--- a/src/KCMTelepathyAccounts/profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/profile-select-widget.cpp
@@ -66,7 +66,7 @@ ProfileSelectWidget::ProfileSelectWidget(QWidget *parent, bool enableSalut)
// Here we filter out salut and not local-xmpp because it might want to be
// able to see local-xmpp using haze later.
- if(!enableSalut) {
+ if (!enableSalut) {
d->sortModel->setFilterRole(ProfileListModel::ProfileCmNameRole);
d->sortModel->setFilterRegExp(QLatin1String("^((?!salut).)*$"));
}
diff --git a/src/KCMTelepathyAccounts/validated-line-edit.cpp b/src/KCMTelepathyAccounts/validated-line-edit.cpp
index 38090bb..dd11790 100644
--- a/src/KCMTelepathyAccounts/validated-line-edit.cpp
+++ b/src/KCMTelepathyAccounts/validated-line-edit.cpp
@@ -173,15 +173,15 @@ void ValidatedLineEdit::validate()
int pos;
QString validatedText(text());
- if(d->validator.validate(validatedText, pos) == QValidator::Acceptable) {
- if(d->currentIcon != ValidationIconWidget::ValidIcon) {
+ if (d->validator.validate(validatedText, pos) == QValidator::Acceptable) {
+ if (d->currentIcon != ValidationIconWidget::ValidIcon) {
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) {
+ else if (d->currentIcon != ValidationIconWidget::InvalidIcon) {
d->validationIcon->setPixmap(SmallIcon(QLatin1String("dialog-error"), 0));
this->setToolTip(d->errorMessage);
d->currentIcon = ValidationIconWidget::InvalidIcon;
diff --git a/src/account-item.cpp b/src/account-item.cpp
index 028c20c..aab3482 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -144,8 +144,8 @@ void AccountItem::generateIcon()
QString iconPath = account()->iconName();
//if the icon has not been set, we use the protocol icon
- if(iconPath.isEmpty()) {
- iconPath = QString(QLatin1String("im-%1")).arg(account()->protocolName());
+ if (iconPath.isEmpty()) {
+ iconPath = QString::fromLatin1("im-%1").arg(account()->protocolName());
}
delete m_icon;
@@ -155,7 +155,7 @@ void AccountItem::generateIcon()
m_icon = new KIcon(KIconLoader::global()->loadIcon(iconPath, KIconLoader::Desktop, 32, KIconLoader::DisabledState));
}
- if(!account()->isValid()) {
+ if (!account()->isValid()) {
//we paint a warning symbol in the right-bottom corner
QPixmap pixmap = m_icon->pixmap(32, 32);
QPainter painter(&pixmap);
diff --git a/src/accounts-list-delegate.cpp b/src/accounts-list-delegate.cpp
index db1c942..d033e27 100644
--- a/src/accounts-list-delegate.cpp
+++ b/src/accounts-list-delegate.cpp
@@ -69,7 +69,7 @@ void AccountsListDelegate::updateItemWidgets(const QList<QWidget *> widgets, con
checkbox->move(m_paddingSize, topMargin);
checkbox->setChecked(index.data(Qt::CheckStateRole).toBool());
- if(checkbox->isChecked()) {
+ if (checkbox->isChecked()) {
checkbox->setToolTip(i18n("Disable account"));
}
else {
diff --git a/src/accounts-list-model.cpp b/src/accounts-list-model.cpp
index b8f671e..469cb9d 100644
--- a/src/accounts-list-model.cpp
+++ b/src/accounts-list-model.cpp
@@ -60,7 +60,7 @@ int AccountsListModel::columnCount(const QModelIndex& parent) const
QVariant AccountsListModel::data(const QModelIndex &index, int role) const
{
- if(!index.isValid()) {
+ if (!index.isValid()) {
return QVariant();
}
@@ -78,7 +78,7 @@ QVariant AccountsListModel::data(const QModelIndex &index, int role) const
break;
case Qt::CheckStateRole:
- if(account->isEnabled()) {
+ if (account->isEnabled()) {
data = QVariant(Qt::Checked);
}
else {
@@ -119,10 +119,10 @@ QVariant AccountsListModel::data(const QModelIndex &index, int role) const
bool AccountsListModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
- if(!index.isValid()) {
+ if (!index.isValid()) {
return false;
}
- if(role == Qt::CheckStateRole) {
+ if (role == Qt::CheckStateRole) {
//this is index from QSortFilterProxyModel
index.data(AccountItemRole).value<AccountItem*>()->account()->setEnabled(value.toInt() == Qt::Checked);
return true;
@@ -133,11 +133,11 @@ bool AccountsListModel::setData(const QModelIndex &index, const QVariant &value,
QModelIndex AccountsListModel::index(int row, int column, const QModelIndex& parent) const
{
- if(row < 0 || column < 0 || parent != QModelIndex()) {
+ if (row < 0 || column < 0 || parent != QModelIndex()) {
return QModelIndex();
}
- if(row < rowCount() && column < columnCount()) {
+ if (row < rowCount() && column < columnCount()) {
return createIndex(row, column);
}
@@ -147,7 +147,7 @@ QModelIndex AccountsListModel::index(int row, int column, const QModelIndex& par
Qt::ItemFlags AccountsListModel::flags(const QModelIndex &index) const
{
- if(!index.isValid()) {
+ if (!index.isValid()) {
return QAbstractItemModel::flags(index);
}
return QAbstractItemModel::flags(index) | Qt::ItemIsUserCheckable;
@@ -161,7 +161,7 @@ void AccountsListModel::addAccount(const Tp::AccountPtr &account)
bool found = false;
if (!found) {
- Q_FOREACH (const AccountItem* ai, m_accounts) {
+ Q_FOREACH (const AccountItem *ai, m_accounts) {
if (ai->account() == account) {
found = true;
break;
@@ -190,7 +190,7 @@ void AccountsListModel::addAccount(const Tp::AccountPtr &account)
void AccountsListModel::removeAccount(const QModelIndex &index)
{
- if(!index.isValid()) {
+ if (!index.isValid()) {
kDebug() << "Can't remove Account: Invalid index";
return;
}
@@ -203,7 +203,7 @@ void AccountsListModel::removeAccount(const QModelIndex &index)
AccountItem* AccountsListModel::itemForIndex(const QModelIndex &index)
{
- if(!index.isValid()) {
+ if (!index.isValid()) {
kWarning() << "Invalid index" << index;
return 0;
}
diff --git a/src/add-account-assistant.cpp b/src/add-account-assistant.cpp
index 6d55695..3f189b4 100644
--- a/src/add-account-assistant.cpp
+++ b/src/add-account-assistant.cpp
@@ -145,7 +145,7 @@ void AddAccountAssistant::goToPageThree()
// FIXME: untill packages for missing profiles aren't installed this needs to stay here
if (selectedItem != 0) {
// Set up the next page.
- if(d->currentProfileItem != selectedItem) {
+ if (d->currentProfileItem != selectedItem) {
d->currentProfileItem = selectedItem;
d->connectionManager = Tp::ConnectionManager::create(selectedItem->cmName());
@@ -289,7 +289,7 @@ void AddAccountAssistant::onAccountCreated(Tp::PendingOperation *op)
wallet.setPassword(account, values[QLatin1String("password")].toString());
}
- if(d->accountEditWidget->connectOnAdd()){
+ if (d->accountEditWidget->connectOnAdd()) {
account->setRequestedPresence(Tp::Presence::available(QLatin1String("Online")));
}
account->setServiceName(d->currentProfileItem->serviceName());
@@ -298,11 +298,11 @@ void AddAccountAssistant::onAccountCreated(Tp::PendingOperation *op)
void AddAccountAssistant::onConnectionManagerReady(Tp::PendingOperation *op)
{
- if(op->isError()) {
+ if (op->isError()) {
kWarning() << "Creating ConnectionManager failed:" << op->errorName() << op->errorMessage();
}
- if(!d->connectionManager->isValid()) {
+ if (!d->connectionManager->isValid()) {
kWarning() << "Invalid ConnectionManager";
}
diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 9acd6d4..b3dca3e 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -384,23 +384,23 @@ void KCMTelepathyAccounts::onSalutEnableButtonToggled(bool checked)
void KCMTelepathyAccounts::onSalutConnectionManagerReady(Tp::PendingOperation* op)
{
bool error = false;
- if(op->isError()) {
+ if (op->isError()) {
kWarning() << "Creating salut ConnectionManager failed:" << op->errorName() << op->errorMessage();
error = true;
} else {
Tp::ConnectionManagerPtr cm = Tp::ConnectionManagerPtr::qObjectCast(qobject_cast<Tp::PendingReady*>(op)->proxy());
- if(!cm->isValid()) {
+ if (!cm->isValid()) {
kWarning() << "Invalid salut ConnectionManager";
error = true;
- } else if(!cm->supportedProtocols().contains(QLatin1String("local-xmpp"))) {
+ } else if (!cm->supportedProtocols().contains(QLatin1String("local-xmpp"))) {
kWarning() << "salut ConnectionManager doesn't support local-xmpp... this is weird";
error = true;
}
}
// Salut is not installed or has some problem
- if(error) {
+ if (error) {
m_ui->salutEnableFrame->setDisabled(true);
m_ui->salutEnableStatusLabel->setText(i18n("Install telepathy-salut to enable"));
}
diff --git a/src/salut-details-dialog.cpp b/src/salut-details-dialog.cpp
index bc24835..a95f2fc 100644
--- a/src/salut-details-dialog.cpp
+++ b/src/salut-details-dialog.cpp
@@ -69,7 +69,7 @@ SalutDetailsDialog::SalutDetailsDialog(const Tp::ProfileManagerPtr profileManage
Q_ASSERT(!d->profile.isNull());
Q_ASSERT(d->profile->isValid());
Q_ASSERT(d->profile->protocolName() == QLatin1String("local-xmpp"));
- if(d->profile.isNull() || !d->profile->isValid() || d->profile->protocolName() != QLatin1String("local-xmpp"))
+ if (d->profile.isNull() || !d->profile->isValid() || d->profile->protocolName() != QLatin1String("local-xmpp"))
{
kWarning() << "Something went wrong with telepathy salut";
}
diff --git a/src/salut-enabler.cpp b/src/salut-enabler.cpp
index 2623d36..db24b9e 100644
--- a/src/salut-enabler.cpp
+++ b/src/salut-enabler.cpp
@@ -86,11 +86,11 @@ SalutEnabler::~SalutEnabler()
void SalutEnabler::onConnectionManagerReady(Tp::PendingOperation* op)
{
- if(op->isError()) {
+ if (op->isError()) {
kWarning() << "Creating ConnectionManager failed:" << op->errorName() << op->errorMessage();
}
- if(!d->connectionManager->isValid()) {
+ if (!d->connectionManager->isValid()) {
kWarning() << "Invalid ConnectionManager";
}
@@ -104,7 +104,7 @@ void SalutEnabler::onConnectionManagerReady(Tp::PendingOperation* op)
void SalutEnabler::onProfileManagerReady(Tp::PendingOperation* op)
{
- if(op->isError()) {
+ if (op->isError()) {
kWarning() << "Creating ProfileManager failed:" << op->errorName() << op->errorMessage();
}
@@ -195,7 +195,7 @@ void SalutEnabler::onUserAccepted()
if (((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty()))
&& !nick.isEmpty()) {
- displayName = QString(QLatin1String("%1 (%2)")).arg(d->values[firstNamePar].toString().isEmpty() ?
+ displayName = QString::fromLatin1("%1 (%2)").arg(d->values[firstNamePar].toString().isEmpty() ?
d->values[lastNamePar].toString() : d->values[firstNamePar].toString(),
d->values[nickNamePar].toString());
@@ -215,7 +215,7 @@ void SalutEnabler::onUserAccepted()
//FIXME: let the user know that he reached a very strange situation
} else {
- displayName = QString(QLatin1String("%1 %2 (%3)")).arg(d->values[firstNamePar].toString(),
+ displayName = QString::fromLatin1("%1 %2 (%3)").arg(d->values[firstNamePar].toString(),
d->values[lastNamePar].toString(),
d->values[nickNamePar].toString());
}
@@ -234,7 +234,7 @@ void SalutEnabler::onUserAccepted()
void SalutEnabler::onAccountCreated(Tp::PendingOperation* op)
{
kWarning() << "Account created";
- if(op->isError()) {
+ if (op->isError()) {
kWarning() << "Creating Account failed:" << op->errorName() << op->errorMessage();
}
diff --git a/src/salut-message-widget.cpp b/src/salut-message-widget.cpp
index c0a5a32..e0f8cf6 100644
--- a/src/salut-message-widget.cpp
+++ b/src/salut-message-widget.cpp
@@ -79,24 +79,24 @@ void SalutMessageWidget::setParams(const QString& firstname, const QString& last
if (((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty()))
&& !nick.isEmpty()) {
- displayName = QString(QLatin1String("%1 (%2)")).arg(lastname.isEmpty() ? firstname : lastname, nick);
+ displayName = QString::fromLatin1("%1 (%2)").arg(lastname.isEmpty() ? firstname : lastname, nick);
//either one of the names is filled and nick is empty
} else if (((lastname.isEmpty() && !firstname.isEmpty()) || (!lastname.isEmpty() && firstname.isEmpty()))
&& nick.isEmpty()) {
- displayName = QString(QLatin1String("%1")).arg(lastname.isEmpty() ? firstname : lastname);
+ displayName = QString::fromLatin1("%1").arg(lastname.isEmpty() ? firstname : lastname);
//both first & last names are empty but nick is not
} else if (lastname.isEmpty() && firstname.isEmpty() && !nick.isEmpty()) {
- displayName = QString(QLatin1String("%1")).arg(nick);
+ displayName = QString::fromLatin1("%1").arg(nick);
} else if (lastname.isEmpty() && firstname.isEmpty() && nick.isEmpty()) {
//FIXME: let the user know that he reached a very strange situation
} else {
- displayName = QString(QLatin1String("%1 %2 (%3)")).arg(firstname, lastname, nick);
+ displayName = QString::fromLatin1("%1 %2 (%3)").arg(firstname, lastname, nick);
}
setText(i18n("You will appear as \"%1\" on your local network.",
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list