[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=f87ced7

The following commit has been merged in the master branch:
commit f87ced7b1379f417add1bba067c696acc7718073
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Tue Jan 13 17:30:19 2015 +0100

    [logviewer] Port K* widgets to Q* widgets
---
 logviewer/log-viewer.cpp         |  3 ++-
 logviewer/log-viewer.ui          | 11 +++--------
 logviewer/logs-import-dialog.cpp |  6 ++++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/logviewer/log-viewer.cpp b/logviewer/log-viewer.cpp
index abd316e..1626cc6 100644
--- a/logviewer/log-viewer.cpp
+++ b/logviewer/log-viewer.cpp
@@ -37,6 +37,8 @@
 
 #include <QWebFrame>
 #include <KLineEdit>
+#include <QMenuBar>
+
 #include <KPixmapSequence>
 #include <KMessageBox>
 #include <KStandardAction>
@@ -44,7 +46,6 @@
 #include <KApplication>
 #include <KAction>
 #include <KActionCollection>
-#include <KMenuBar>
 #include <KSettings/Dialog>
 #include <KLocalizedString>
 #include <KIconLoader>
diff --git a/logviewer/log-viewer.ui b/logviewer/log-viewer.ui
index cb0a313..dc624c0 100644
--- a/logviewer/log-viewer.ui
+++ b/logviewer/log-viewer.ui
@@ -15,11 +15,11 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="1" column="0">
-    <widget class="KLineEdit" name="globalSearch">
-     <property name="clickMessage">
+    <widget class="QLineEdit" name="globalSearch">
+     <property name="placeholderText">
       <string>Search all logs...</string>
      </property>
-     <property name="showClearButton" stdset="0">
+     <property name="clearButtonEnabled" stdset="0">
       <bool>true</bool>
      </property>
     </widget>
@@ -69,11 +69,6 @@
    <header>kfilterproxysearchline.h</header>
   </customwidget>
   <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
-  <customwidget>
    <class>KPixmapSequenceWidget</class>
    <extends>QWidget</extends>
    <header>kpixmapsequencewidget.h</header>
diff --git a/logviewer/logs-import-dialog.cpp b/logviewer/logs-import-dialog.cpp
index 49a738c..68bc720 100644
--- a/logviewer/logs-import-dialog.cpp
+++ b/logviewer/logs-import-dialog.cpp
@@ -23,11 +23,13 @@
 #include <QLabel>
 #include <QProgressBar>
 #include <QIcon>
-#include <KListWidget>
 #include <QDialogButtonBox>
 #include <QAbstractButton>
 #include <QPushButton>
+#include <QListWidget>
+
 #include <KLocalizedString>
+
 #include <KTp/logs-importer.h>
 #include <TelepathyQt/Account>
 
@@ -60,7 +62,7 @@ LogsImportDialog::LogsImportDialog(QObject *parent)
     label->setWordWrap(true);
     layout->addWidget(label);
 
-    m_accountsList = new KListWidget(mainWidget);
+    m_accountsList = new QListWidget(mainWidget);
     m_accountsList->setIconSize(QSize(24,24));
     layout->addWidget(m_accountsList, 1);
 

-- 
ktp-text-ui packaging