[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=58b38d2

The following commit has been merged in the master branch:
commit 58b38d258095f0a63af46e058ec44921ac66603c
Author: Aleix Pol <aleixpol at kde.org>
Date:   Tue Oct 28 17:30:46 2014 +0100

    KAction -> QAction
---
 main-widget.cpp |  8 ++++----
 main-widget.h   | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/main-widget.cpp b/main-widget.cpp
index d7d31d4..7e9614f 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -556,16 +556,16 @@ void MainWidget::setupTelepathy()
             this, SLOT(onAccountManagerReady(Tp::PendingOperation*)));
 }
 
-KAction *MainWidget::createAction(const QString &text, QObject *signalReceiver, const char *slot, const QIcon &icon = QIcon())
+QAction *MainWidget::createAction(const QString &text, QObject *signalReceiver, const char *slot, const QIcon &icon = QIcon())
 {
-    KAction *action = new KAction(icon, text, this);
+    QAction *action = new QAction(icon, text, this);
     connect(action, SIGNAL(triggered(bool)), signalReceiver, slot);
     return action;
 }
 
-KAction *MainWidget::createAction(const QString& text, QObject *signalReceiver, const char* slot, bool isChecked, const QIcon &icon = QIcon())
+QAction *MainWidget::createAction(const QString& text, QObject *signalReceiver, const char* slot, bool isChecked, const QIcon &icon = QIcon())
 {
-    KAction *action = createAction(text, signalReceiver, slot, icon);
+    QAction *action = createAction(text, signalReceiver, slot, icon);
     action->setCheckable(true);
     action->setChecked(isChecked);
     return action;
diff --git a/main-widget.h b/main-widget.h
index 0710119..227757e 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -30,7 +30,7 @@
 #include <TelepathyQt/Types>
 
 #include <KXmlGuiWindow>
-#include <KAction>
+#include <QAction>
 #include <KIcon>
 #include <KDualAction>
 #include "ui_main-widget.h"
@@ -103,8 +103,8 @@ private:
     ///Was moved to telepathy-kded-module
     //void handleConnectionError(const Tp::AccountPtr &account);      /** handle connection errors for given account. This method provides visual notification */
     void closeEvent(QCloseEvent *e);
-    KAction *createAction(const QString& text, QObject *signalReceiver, const char* slot, const QIcon& icon);
-    KAction *createAction(const QString& text, QObject *signalReceiver, const char* slot, bool isChecked, const QIcon& icon);
+    QAction *createAction(const QString& text, QObject *signalReceiver, const char* slot, const QIcon& icon);
+    QAction *createAction(const QString& text, QObject *signalReceiver, const char* slot, bool isChecked, const QIcon& icon);
     void setupActions(const KConfigGroup&);
     void setupGlobalMenu();
     void setupToolBar();
@@ -112,9 +112,9 @@ private:
 
     KMenuBar               *m_globalMenu;
     QAction                *m_settingsDialog;
-    KAction                *m_joinChatRoom;
-    KAction                *m_makeCall;
-    KAction                *m_mergeContacts;
+    QAction                *m_joinChatRoom;
+    QAction                *m_makeCall;
+    QAction                *m_mergeContacts;
     QActionGroup           *m_contactListTypeGroup;
     QActionGroup           *m_blockedFilterGroup;
 
@@ -122,11 +122,11 @@ private:
     KSelectAction          *m_setStatusAction;
 
     KDualAction            *m_metacontactToggleAction;
-    KAction                *m_addContactAction;
+    QAction                *m_addContactAction;
     QActionGroup           *m_groupContactsActionGroup;
     KDualAction            *m_showOfflineAction;
-    KAction                *m_searchContactAction;
-    KAction                *m_startChatAction;
+    QAction                *m_searchContactAction;
+    QAction                *m_startChatAction;
     KDualAction            *m_sortByPresenceAction;
     QAction                *m_quitAction;
 

-- 
ktp-contact-list packaging