[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=35515bc

The following commit has been merged in the master branch:
commit 35515bc71c15ebbb2f4e3ece873350ec20d1c635
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Jan 9 19:39:19 2015 +0100

    [lib] Port various K* widgets to Q* widgets
---
 lib/adium-theme-view.cpp     |  4 ++--
 lib/authenticationwizard.cpp |  5 +++++
 lib/authenticationwizard.h   | 10 +++++-----
 lib/chat-search-bar.cpp      | 18 +++++++-----------
 lib/chat-search-bar.h        | 12 ++++++------
 lib/chat-widget.cpp          |  5 ++---
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/lib/adium-theme-view.cpp b/lib/adium-theme-view.cpp
index 3a19b57..de53b66 100644
--- a/lib/adium-theme-view.cpp
+++ b/lib/adium-theme-view.cpp
@@ -40,9 +40,9 @@
 #include <QWebInspector>
 #include <QWebSettings>
 #include <QApplication>
+#include <QAction>
 #include <QLocale>
 
-#include <KAction>
 #include <KEmoticonsTheme>
 #include <KConfig>
 #include <KConfigGroup>
@@ -65,7 +65,7 @@ AdiumThemeView::AdiumThemeView(QWidget *parent)
     page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
 
     QAction *defaultOpenLinkAction = pageAction(QWebPage::OpenLink);
-    m_openLinkAction = new KAction(defaultOpenLinkAction->text(), this);
+    m_openLinkAction = new QAction(defaultOpenLinkAction->text(), this);
     connect(m_openLinkAction, SIGNAL(triggered()),
             this, SLOT(onOpenLinkActionTriggered()));
 
diff --git a/lib/authenticationwizard.cpp b/lib/authenticationwizard.cpp
index 3be8a5a..f8b3d33 100644
--- a/lib/authenticationwizard.cpp
+++ b/lib/authenticationwizard.cpp
@@ -28,8 +28,13 @@
 #include <KIconLoader>
 #include <KWindowSystem>
 
+#include <QComboBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QRadioButton>
 #include <QGroupBox>
 #include <QProgressBar>
+
 namespace
 {
 
diff --git a/lib/authenticationwizard.h b/lib/authenticationwizard.h
index 15ab2ca..d6992f8 100644
--- a/lib/authenticationwizard.h
+++ b/lib/authenticationwizard.h
@@ -22,18 +22,18 @@
 #ifndef AUTHENTICATIONWIZARD_HEADER
 #define AUTHENTICATIONWIZARD_HEADER
 
-#include <KLineEdit>
-#include <KComboBox>
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QWizard>
-#include <QRadioButton>
 
 namespace KTp
 {
     class ChannelAdapter;
 }
 
+class QComboBox;
+class QLabel;
+class QLineEdit;
+class QRadioButton;
+
 class AuthenticationWizard: public QWizard
 {
 	Q_OBJECT
diff --git a/lib/chat-search-bar.cpp b/lib/chat-search-bar.cpp
index 2eb2649..f0a559f 100644
--- a/lib/chat-search-bar.cpp
+++ b/lib/chat-search-bar.cpp
@@ -19,12 +19,12 @@
 
 #include "chat-search-bar.h"
 
-#include <KAction>
 #include <KColorScheme>
-#include <KLineEdit>
 #include <KLocalizedString>
-#include <KPushButton>
 
+#include <QPushButton>
+#include <QLineEdit>
+#include <QAction>
 #include <QCheckBox>
 #include <QDebug>
 #include <QHBoxLayout>
@@ -34,10 +34,10 @@
 
 ChatSearchBar::ChatSearchBar(QWidget *parent)
     : QWidget(parent)
-    , m_searchInput(new KLineEdit(this))
+    , m_searchInput(new QLineEdit(this))
     , m_closeButton(new QToolButton(this))
-    , m_nextButton(new KPushButton(QIcon::fromTheme(QStringLiteral("go-down-search")), i18nc("Next search result" ,"&Next"), this))
-    , m_previousButton(new KPushButton(QIcon::fromTheme(QStringLiteral("go-up-search")), i18nc("Previous search result" ,"&Previous"), this))
+    , m_nextButton(new QPushButton(QIcon::fromTheme(QStringLiteral("go-down-search")), i18nc("Next search result" ,"&Next"), this))
+    , m_previousButton(new QPushButton(QIcon::fromTheme(QStringLiteral("go-up-search")), i18nc("Previous search result" ,"&Previous"), this))
     , m_caseSensitive(false)
 {
     // close button setup
@@ -101,7 +101,7 @@ QWebPage::FindFlags ChatSearchBar::findFlags()
     return flags;
 }
 
-KLineEdit *ChatSearchBar::searchBar() const
+QLineEdit *ChatSearchBar::searchBar() const
 {
     return m_searchInput;
 }
@@ -185,7 +185,3 @@ void ChatSearchBar::toggleCaseSensitive(bool toggle)
     m_caseSensitive = toggle;
     Q_EMIT flagsChangedSignal(m_searchInput->text(), findFlags());
 }
-
-
-
-
diff --git a/lib/chat-search-bar.h b/lib/chat-search-bar.h
index 9b9bed4..c8c5118 100644
--- a/lib/chat-search-bar.h
+++ b/lib/chat-search-bar.h
@@ -25,8 +25,8 @@
 #include <QWebPage>
 #include <QWidget>
 
-class KLineEdit;
-class KPushButton;
+class QLineEdit;
+class QPushButton;
 class QToolButton;
 
 /**
@@ -41,7 +41,7 @@ public:
     ChatSearchBar(QWidget *parent = 0);
     virtual ~ChatSearchBar();
 
-    KLineEdit* searchBar() const;
+    QLineEdit* searchBar() const;
 
 public Q_SLOTS:
     void onNextButtonClicked();
@@ -83,10 +83,10 @@ private:
     /** returns selected search criteria chosen by user */
     QWebPage::FindFlags findFlags();
 
-    KLineEdit *m_searchInput;
+    QLineEdit *m_searchInput;
     QToolButton *m_closeButton;
-    KPushButton *m_nextButton;
-    KPushButton *m_previousButton;
+    QPushButton *m_nextButton;
+    QPushButton *m_previousButton;
 
     // search criteria variables
     bool m_highlightAll
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index 7fb07d1..f6f220d 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -39,14 +39,13 @@
 #include <QSortFilterProxyModel>
 #include <QMimeType>
 #include <QMimeDatabase>
+#include <QLineEdit>
+#include <QColorDialog>
 #include <QTemporaryFile>
 
-#include <KColorDialog>
 #include <KNotification>
 #include <KAboutData>
-#include <KComponentData>
 #include <KColorScheme>
-#include <KLineEdit>
 #include <KFileDialog>
 #include <KMessageWidget>
 #include <KMessageBox>

-- 
ktp-text-ui packaging