[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=cd5a27d

The following commit has been merged in the master branch:
commit cd5a27d32c9a6450c7851a637fc565b153b81a1c
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Aug 6 13:09:33 2014 +0200

    Port KLineEdit to QLineEdit
---
 src/KCMTelepathyAccounts/parameter-edit-delegate.cpp | 6 +++---
 src/KCMTelepathyAccounts/unsigned-integer-edit.h     | 4 ++--
 src/KCMTelepathyAccounts/validated-line-edit.cpp     | 6 +++---
 src/KCMTelepathyAccounts/validated-line-edit.h       | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
index b15a9ed..f26cdd5 100644
--- a/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
+++ b/src/KCMTelepathyAccounts/parameter-edit-delegate.cpp
@@ -22,7 +22,6 @@
 
 #include "parameter-edit-model.h"
 
-#include <KLineEdit>
 #include <QDebug>
 
 #include <QtGui/QApplication>
@@ -30,6 +29,7 @@
 #include <QtGui/QLabel>
 #include <QtGui/QSpinBox>
 #include <QtGui/QPainter>
+#include <QLineEdit>
 
 ParameterEditDelegate::ParameterEditDelegate(QAbstractItemView *itemView, QObject *parent)
  : KWidgetItemDelegate(itemView, parent)
@@ -47,7 +47,7 @@ QList<QWidget*> ParameterEditDelegate::createItemWidgets() const
 
     // Create all the possible widgets for displaying the parameter.
     QLabel *nameLabel = new QLabel();
-    KLineEdit *lineEdit = new KLineEdit();
+    QLineEdit *lineEdit = new QLineEdit();
     QCheckBox *checkBox = new QCheckBox();
     QSpinBox *spinBox = new QSpinBox();
 
@@ -80,7 +80,7 @@ void ParameterEditDelegate::updateItemWidgets(const QList<QWidget*> widgets,
     nameLabel->resize(QSize(((right - (4 * margin)) / 2), option.rect.height()));
 
     // Get all the optional input widgets.
-    KLineEdit *lineEdit = qobject_cast<KLineEdit*>(widgets.at(1));
+    QLineEdit *lineEdit = qobject_cast<QLineEdit*>(widgets.at(1));
     QCheckBox *checkBox = qobject_cast<QCheckBox*>(widgets.at(2));
     QSpinBox  *spinBox  = qobject_cast<QSpinBox*>(widgets.at(3));
 
diff --git a/src/KCMTelepathyAccounts/unsigned-integer-edit.h b/src/KCMTelepathyAccounts/unsigned-integer-edit.h
index b117d8b..b9fc463 100644
--- a/src/KCMTelepathyAccounts/unsigned-integer-edit.h
+++ b/src/KCMTelepathyAccounts/unsigned-integer-edit.h
@@ -26,9 +26,9 @@
 #include <QtCore/QPair>
 #include <QtGui/QValidator>
 
-#include <KLineEdit>
+#include <QLineEdit>
 
-class KCM_TELEPATHY_ACCOUNTS_EXPORT UnsignedIntegerEdit : public KLineEdit
+class KCM_TELEPATHY_ACCOUNTS_EXPORT UnsignedIntegerEdit : public QLineEdit
 {
     Q_OBJECT
 
diff --git a/src/KCMTelepathyAccounts/validated-line-edit.cpp b/src/KCMTelepathyAccounts/validated-line-edit.cpp
index 14afe2d..2176cfc 100644
--- a/src/KCMTelepathyAccounts/validated-line-edit.cpp
+++ b/src/KCMTelepathyAccounts/validated-line-edit.cpp
@@ -22,7 +22,6 @@
 
 #include "parameter-edit-model.h"
 
-#include <KLineEdit>
 #include <KLocale>
 #include <KIconLoader>
 
@@ -34,6 +33,7 @@
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QPersistentModelIndex>
 #include <QIcon>
+#include <QLineEdit>
 
 class ValidationIconWidget : public QWidget
 {
@@ -93,7 +93,7 @@ class ValidatedLineEdit::Private
 };
 
 ValidatedLineEdit::ValidatedLineEdit(QWidget *parent)
-    : KLineEdit(parent),
+    : QLineEdit(parent),
       d(new Private())
 {
     d->validationIcon = new ValidationIconWidget(this);
@@ -157,7 +157,7 @@ void ValidatedLineEdit::onTextChanged(const QString &text)
 void ValidatedLineEdit::resizeEvent(QResizeEvent *event)
 {
     updateIcon();
-    KLineEdit::resizeEvent(event);
+    QLineEdit::resizeEvent(event);
 }
 
 void ValidatedLineEdit::updateIcon()
diff --git a/src/KCMTelepathyAccounts/validated-line-edit.h b/src/KCMTelepathyAccounts/validated-line-edit.h
index 16f4e5d..48b41d6 100644
--- a/src/KCMTelepathyAccounts/validated-line-edit.h
+++ b/src/KCMTelepathyAccounts/validated-line-edit.h
@@ -21,7 +21,7 @@
 #ifndef VALIDATEDLINEEDIT_H
 #define VALIDATEDLINEEDIT_H
 
-#include <KLineEdit>
+#include <QLineEdit>
 #include <kdemacros.h>
 #include <QtGui/QValidator>
 
@@ -32,7 +32,7 @@ class ValidationIconWidget;
 class QAbstractItemModel;
 class QModelIndex;
 
-class KDE_EXPORT ValidatedLineEdit : public KLineEdit
+class KDE_EXPORT ValidatedLineEdit : public QLineEdit
 {
     Q_OBJECT
 

-- 
ktp-accounts-kcm packaging