[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=5c3900f

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

    [logviewer] Port KAction and KMenu to QAction and QMenu
---
 logviewer/log-viewer.cpp | 25 ++++++++++++-------------
 logviewer/log-viewer.h   |  4 ++--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/logviewer/log-viewer.cpp b/logviewer/log-viewer.cpp
index 1626cc6..8d7a06c 100644
--- a/logviewer/log-viewer.cpp
+++ b/logviewer/log-viewer.cpp
@@ -36,20 +36,19 @@
 #include <KTp/Models/contacts-model.h>
 
 #include <QWebFrame>
-#include <KLineEdit>
+#include <QMenu>
+#include <QAction>
+#include <QLineEdit>
 #include <QMenuBar>
 
 #include <KPixmapSequence>
 #include <KMessageBox>
 #include <KStandardAction>
-#include <KMenu>
-#include <KApplication>
-#include <KAction>
 #include <KActionCollection>
 #include <KSettings/Dialog>
 #include <KLocalizedString>
 #include <KIconLoader>
-
+#include <KSharedConfig>
 #include <KCModuleProxy>
 
 #include "entity-model.h"
@@ -127,33 +126,33 @@ LogViewer::~LogViewer()
 
 void LogViewer::setupActions()
 {
-    KStandardAction::quit(KApplication::instance(), SLOT(quit()), actionCollection());
+    KStandardAction::quit(qApp, SLOT(quit()), actionCollection());
     KStandardAction::showMenubar(this->menuBar(), SLOT(setVisible(bool)), actionCollection());
 
-    KAction *configure = new KAction(i18n("&Configure LogViewer"), this);
+    QAction *configure = new QAction(i18n("&Configure LogViewer"), this);
     configure->setIcon(QIcon::fromTheme(QStringLiteral("configure")));
     connect(configure, SIGNAL(triggered(bool)), SLOT(slotConfigure()));
 
-    KAction *clearAccHistory = new KAction(i18n("Clear &account history"), this);
+    QAction *clearAccHistory = new QAction(i18n("Clear &account history"), this);
     clearAccHistory->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-history")));
     connect(clearAccHistory, SIGNAL(triggered(bool)), SLOT(slotClearAccountHistory()));
 
-    KAction *clearContactHistory = new KAction(i18n("Clear &contact history"), this);
+    QAction *clearContactHistory = new QAction(i18n("Clear &contact history"), this);
     clearContactHistory->setIcon(QIcon::fromTheme(QStringLiteral("edit-clear-history")));
     clearContactHistory->setEnabled(false);
     connect(clearContactHistory, SIGNAL(triggered(bool)), SLOT(slotClearContactHistory()));
 
-    KAction *importKopeteLogs = new KAction(i18n("&Import Kopete Logs"), this);
+    QAction *importKopeteLogs = new QAction(i18n("&Import Kopete Logs"), this);
     importKopeteLogs->setIcon(QIcon::fromTheme(QStringLiteral("document-import")));
     connect(importKopeteLogs, SIGNAL(triggered(bool)), SLOT(slotImportKopeteLogs()));
 
-    KAction *prevConversation = new KAction(i18n("&Previous Conversation"), this);
+    QAction *prevConversation = new QAction(i18n("&Previous Conversation"), this);
     prevConversation->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_P));
     prevConversation->setIcon(QIcon::fromTheme(QStringLiteral("go-previous")));
     prevConversation->setEnabled(false);
     connect(prevConversation, SIGNAL(triggered(bool)), SLOT(slotJumpToPrevConversation()));
 
-    KAction *nextConversation = new KAction(i18n("&Next Conversation"), this);
+    QAction *nextConversation = new QAction(i18n("&Next Conversation"), this);
     nextConversation->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_N));
     nextConversation->setIcon(QIcon::fromTheme(QStringLiteral("go-next")));
     nextConversation->setEnabled(false);
@@ -167,7 +166,7 @@ void LogViewer::setupActions()
     actionCollection()->addAction(QLatin1String("configure"), configure);
 
     /* Build the popup menu for entity list */
-    m_entityListContextMenu = new KMenu(ui->entityList);
+    m_entityListContextMenu = new QMenu(ui->entityList);
     m_entityListContextMenu->addAction(clearContactHistory);
     m_entityListContextMenu->addAction(clearAccHistory);
 }
diff --git a/logviewer/log-viewer.h b/logviewer/log-viewer.h
index 51374c0..e6b6d3d 100644
--- a/logviewer/log-viewer.h
+++ b/logviewer/log-viewer.h
@@ -39,7 +39,7 @@ class DatesModel;
 class EntityModel;
 class EntityFilterModel;
 class PersonEntityMergeModel;
-class KMenu;
+class QMenu;
 
 class LogViewer : public KXmlGuiWindow
 {
@@ -93,7 +93,7 @@ private:
 
     QPersistentModelIndex m_expandedPersona;
 
-    KMenu *m_entityListContextMenu;
+    QMenu *m_entityListContextMenu;
 
     QDate m_prevConversationDate;
     QDate m_nextConversationDate;

-- 
ktp-text-ui packaging