[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:05:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=64af98e
The following commit has been merged in the master branch:
commit 64af98e6f2c6db47f5701bc12009c4ad7840a073
Author: Martin Klapetek <mklapetek at kde.org>
Date: Wed Aug 6 13:03:35 2014 +0200
Port kDebug to qDebug
---
.../abstract-account-parameters-widget.cpp | 10 +++++-----
src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp | 4 ++--
src/KCMTelepathyAccounts/abstract-account-ui.cpp | 4 ++--
src/KCMTelepathyAccounts/parameter-edit-delegate.cpp | 4 ++--
src/KCMTelepathyAccounts/parameter-edit-model.cpp | 6 +++---
src/KCMTelepathyAccounts/plugin-manager.cpp | 8 ++++----
src/KCMTelepathyAccounts/profile-list-model.cpp | 5 ++---
src/KCMTelepathyAccounts/profile-select-widget.cpp | 4 ++--
src/KCMTelepathyAccounts/simple-profile-select-widget.cpp | 5 ++---
src/KCMTelepathyAccounts/unsigned-integer-edit.cpp | 5 ++---
10 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
index 016e3a7..3ecfbc4 100644
--- a/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-parameters-widget.cpp
@@ -25,7 +25,6 @@
#include "validated-line-edit.h"
#include <KLocalizedString>
-#include <KDebug>
#include <QtCore/QMap>
#include <QtGui/QLineEdit>
@@ -33,6 +32,7 @@
#include <QtGui/QComboBox>
#include <QtGui/QSpinBox>
#include <QtGui/QDataWidgetMapper>
+#include <QDebug>
class AbstractAccountParametersWidget::Private
@@ -103,13 +103,13 @@ void AbstractAccountParametersWidget::handleParameter(const QString ¶meterNa
const QList<QWidget*> &labelWidgets,
const QByteArray &dataWidgetProperty)
{
- kDebug() << parameterType << parameterName;
+ qDebug() << parameterType << parameterName;
Tp::ProtocolParameter foundParameter = d->parameterModel->parameter(parameterName);
if (!foundParameter.isValid() || foundParameter.type() != parameterType) {
// hide widgets because they are not needed
- kDebug() << "Field" << parameterName << "hidden";
+ qDebug() << "Field" << parameterName << "hidden";
dataWidget->hide();
Q_FOREACH (QWidget *label, labelWidgets) {
if (label) {
@@ -121,7 +121,7 @@ void AbstractAccountParametersWidget::handleParameter(const QString ¶meterNa
QModelIndex index = d->parameterModel->indexForParameter(foundParameter);
if (index.isValid()) {
- kDebug() << index << parameterName;
+ qDebug() << 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
if (!dataWidgetProperty.isEmpty()) {
@@ -180,7 +180,7 @@ ParameterEditModel* AbstractAccountParametersWidget::parameterModel() const
QString AbstractAccountParametersWidget::defaultDisplayName() const
{
- kWarning() << "This method should be implemented by derived classes";
+ qWarning() << "This method should be implemented by derived classes";
return QString();
}
diff --git a/src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp
index bc2074b..a947f37 100644
--- a/src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-ui-plugin.cpp
@@ -20,7 +20,7 @@
#include "abstract-account-ui-plugin.h"
-#include <KDebug>
+#include <QDebug>
class AbstractAccountUiPlugin::Private
{
@@ -55,7 +55,7 @@ void AbstractAccountUiPlugin::registerProvidedProtocol(const QString &connection
// Check the protocol is not already entered
Q_FOREACH (const QString &value, d->providedProtocols.values(connectionManager)) {
if (value == protocol) {
- kWarning() << "Tried to add connection manager:" << connectionManager
+ qWarning() << "Tried to add connection manager:" << connectionManager
<< "and protocol:" << protocol << "combination twice.";
return;
}
diff --git a/src/KCMTelepathyAccounts/abstract-account-ui.cpp b/src/KCMTelepathyAccounts/abstract-account-ui.cpp
index 252117b..84f56c7 100644
--- a/src/KCMTelepathyAccounts/abstract-account-ui.cpp
+++ b/src/KCMTelepathyAccounts/abstract-account-ui.cpp
@@ -22,7 +22,7 @@
#include "abstract-account-ui.h"
-#include <KDebug>
+#include <QDebug>
class AbstractAccountUi::Private
{
@@ -67,7 +67,7 @@ void AbstractAccountUi::registerSupportedParameter(const QString &name, QVariant
// Check that the parameter is not already in the list
Q_FOREACH (QVariant::Type t, d->supportedParameters.values(name)) {
if (t == type) {
- kWarning() << "Parameter:" << name << "of type:" << type << "is already added.";
+ qWarning() << "Parameter:" << name << "of type:" << type << "is already added.";
return;
}
}
diff --git a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
index e135ade..b15a9ed 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
@@ -23,7 +23,7 @@
#include "parameter-edit-model.h"
#include <KLineEdit>
-#include <KDebug>
+#include <QDebug>
#include <QtGui/QApplication>
#include <QtGui/QCheckBox>
@@ -209,7 +209,7 @@ void ParameterEditDelegate::onSpinBoxValueChanged(int value)
QSpinBox *widget = qobject_cast<QSpinBox*>(sender());
if (!widget) {
- kWarning() << "Slot called by object of the wrong type.";
+ qWarning() << "Slot called by object of the wrong type.";
return;
}
diff --git a/src/KCMTelepathyAccounts/parameter-edit-model.cpp b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
index 1aeacd5..1a20d3e 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-model.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-model.cpp
@@ -25,11 +25,11 @@
#include "parameter-item.h"
#include <KApplication>
-#include <KDebug>
#include <KLocale>
#include <KMessageWidget>
#include <QtGui/QValidator>
+#include <QDebug>
#include <TelepathyQt/Profile>
#include <TelepathyQt/ConnectionManager>
@@ -123,7 +123,7 @@ Qt::ItemFlags ParameterEditModel::flags(const QModelIndex &index) const
bool ParameterEditModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (!index.isValid()) {
- kDebug() << "Invalid item row accessed.";
+ qDebug() << "Invalid item row accessed.";
return false;
}
@@ -298,7 +298,7 @@ bool ParameterEditModel::validateParameterValues()
{
Q_FOREACH (ParameterItem *item, m_items) {
if (item->validity() != QValidator::Acceptable) {
- kWarning() << "Parameter" << item->name() << "is not valid:" << item->value();
+ qWarning() << "Parameter" << item->name() << "is not valid:" << item->value();
Q_EMIT feedbackMessage(i18n("Parameter \"<b>%1</b>\" is not valid.",
item->localizedName()),
QString(),
diff --git a/src/KCMTelepathyAccounts/plugin-manager.cpp b/src/KCMTelepathyAccounts/plugin-manager.cpp
index f49923b..a6466f1 100644
--- a/src/KCMTelepathyAccounts/plugin-manager.cpp
+++ b/src/KCMTelepathyAccounts/plugin-manager.cpp
@@ -24,7 +24,7 @@
#include "abstract-account-ui.h"
#include <KServiceTypeTrader>
-#include <KDebug>
+#include <QDebug>
PluginManager* PluginManager::s_self = 0;
@@ -66,17 +66,17 @@ void PluginManager::loadPlugins()
KPluginFactory *factory = KPluginLoader(service->library()).factory();
if (!factory) {
- kWarning() << "KPluginFactory could not load the plugin:" << service->library();
+ qWarning() << "KPluginFactory could not load the plugin:" << service->library();
continue;
}
AbstractAccountUiPlugin *plugin = factory->create<AbstractAccountUiPlugin>(this);
if (plugin) {
- kDebug() << "Loaded plugin:" << service->name();
+ qDebug() << "Loaded plugin:" << service->name();
m_plugins.append(plugin);
} else {
- kDebug() << error;
+ qDebug() << error;
}
}
}
diff --git a/src/KCMTelepathyAccounts/profile-list-model.cpp b/src/KCMTelepathyAccounts/profile-list-model.cpp
index 1275292..6fbb963 100644
--- a/src/KCMTelepathyAccounts/profile-list-model.cpp
+++ b/src/KCMTelepathyAccounts/profile-list-model.cpp
@@ -29,9 +29,8 @@
#include <TelepathyQt/PendingStringList>
#include <TelepathyQt/PendingComposite>
-
-#include <KDebug>
#include <KIcon>
+#include <QDebug>
ProfileListModel::ProfileListModel(QObject *parent)
: QAbstractListModel(parent)
@@ -53,7 +52,7 @@ void ProfileListModel::onProfileManagerReady(Tp::PendingOperation *op)
{
// Check the pending operation completed successfully.
if (op->isError()) {
- kDebug() << "becomeReady() failed:" << op->errorName() << op->errorMessage();
+ qDebug() << "becomeReady() failed:" << op->errorName() << op->errorMessage();
return;
}
Tp::PendingStringList* pendingNames = Tp::ConnectionManager::listNames();
diff --git a/src/KCMTelepathyAccounts/profile-select-widget.cpp b/src/KCMTelepathyAccounts/profile-select-widget.cpp
index df5f6ee..1927981 100644
--- a/src/KCMTelepathyAccounts/profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/profile-select-widget.cpp
@@ -26,7 +26,7 @@
#include "ui_profile-select-widget.h"
-#include <KDebug>
+#include <QDebug>
#include <QtGui/QSortFilterProxyModel>
#include <QtGui/QItemSelectionModel>
@@ -94,7 +94,7 @@ ProfileItem *ProfileSelectWidget::selectedProfile()
// If more than 1 profile is selected (shouldn't be possible, but just in case) error.
if (selectedIndexes.size() > 1) {
- kWarning() << "More than 1 profile is selected.";
+ qWarning() << "More than 1 profile is selected.";
return 0;
}
diff --git a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
index b5bee34..c30105f 100644
--- a/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
+++ b/src/KCMTelepathyAccounts/simple-profile-select-widget.cpp
@@ -26,8 +26,6 @@
#include "ui_simple-profile-select-widget.h"
-#include <KDebug>
-
#include <TelepathyQt/PendingReady>
#include <TelepathyQt/ProfileManager>
#include <TelepathyQt/Feature>
@@ -36,6 +34,7 @@
#include <QtGui/QSortFilterProxyModel>
#include <QtGui/QItemSelectionModel>
#include <QtGui/QCommandLinkButton>
+#include <QDebug>
class SimpleProfileSelectWidget::Private
{
@@ -102,7 +101,7 @@ void SimpleProfileSelectWidget::onProfileClicked(QString profileName)
{
d->profileName = profileName;
- kDebug() << "Selected profile: " << d->profileName;
+ qDebug() << "Selected profile: " << d->profileName;
Q_EMIT profileChosen();
}
diff --git a/src/KCMTelepathyAccounts/unsigned-integer-edit.cpp b/src/KCMTelepathyAccounts/unsigned-integer-edit.cpp
index d63f2b9..d07c96d 100644
--- a/src/KCMTelepathyAccounts/unsigned-integer-edit.cpp
+++ b/src/KCMTelepathyAccounts/unsigned-integer-edit.cpp
@@ -20,9 +20,8 @@
#include "unsigned-integer-edit.h"
-#include <KDebug>
-
#include <QtGui/QIntValidator>
+#include <QDebug>
UnsignedIntegerEdit::UnsignedIntegerEdit(QWidget *parent)
: QLineEdit(parent)
@@ -65,7 +64,7 @@ QPair<quint32, quint32> UnsignedIntegerEdit::validRange() const
QIntValidator const *intValidator = qobject_cast<const QIntValidator*>(validator());
if (!intValidator) {
- kWarning() << "Somehow this is not an int validator :/";
+ qWarning() << "Somehow this is not an int validator :/";
return ret;
}
--
ktp-accounts-kcm packaging
More information about the pkg-kde-commits
mailing list