[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=968597e

The following commit has been merged in the master branch:
commit 968597e8043a0afa12c8c5a7f25502e1a37aebdc
Author: Aleix Pol <aleixpol at kde.org>
Date:   Thu Oct 30 18:58:12 2014 +0100

    Prefer qWarning for warnings
---
 context-menu.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/context-menu.cpp b/context-menu.cpp
index e51a376..d3e6806 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -19,7 +19,7 @@
 
 #include "context-menu.h"
 
-#include <KDebug>
+#include <QDebug>
 
 #include <KMenu>
 #include <KLocalizedString>
@@ -28,7 +28,6 @@
 #include <KMessageBox>
 #include <KAction>
 
-
 #include <KTp/text-parser.h>
 #include <KTp/Widgets/notification-config-dialog.h>
 #include <KTp/contact-info-dialog.h>
@@ -85,14 +84,14 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
     KTp::ContactPtr contact = index.data(KTp::ContactRole).value<KTp::ContactPtr>();
 
     if (contact.isNull()) {
-        kDebug() << "Contact is nulled";
+        qWarning() << "Contact is nulled";
         return 0;
     }
 
     Tp::AccountPtr account = index.data(KTp::AccountRole).value<Tp::AccountPtr>();
 
     if (account.isNull()) {
-        kDebug() << "Account is nulled";
+        qWarning() << "Account is nulled";
         return 0;
     }
 
@@ -206,7 +205,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
 
     Tp::ConnectionPtr accountConnection = account->connection();
     if (accountConnection.isNull()) {
-        kDebug() << "Account connection is nulled.";
+        qWarning() << "Account connection is nulled.";
         return 0;
     }
 
@@ -244,7 +243,7 @@ KMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
                         SLOT(onAddContactToGroupTriggered()));
             }
         } else {
-            kDebug() << "Unable to support Groups";
+            qWarning() << "Unable to support Groups";
         }
     }
 
@@ -345,7 +344,7 @@ void ContextMenu::onOpenLinkTriggered(QAction *action)
 void ContextMenu::onShowInfoTriggered()
 {
     if (!m_currentIndex.isValid()) {
-        kDebug() << "Invalid index provided.";
+        qWarning() << "Invalid index provided.";
         return;
     }
 
@@ -374,7 +373,7 @@ void ContextMenu::onShowInfoTriggered()
 void ContextMenu::onStartTextChatTriggered()
 {
     if (!m_currentIndex.isValid()) {
-        kDebug() << "Invalid index provided.";
+        qWarning() << "Invalid index provided.";
         return;
     }
 
@@ -399,7 +398,7 @@ void ContextMenu::onStartAudioChatTriggered()
 void ContextMenu::onStartVideoChatTriggered()
 {
     if (!m_currentIndex.isValid()) {
-        kDebug() << "Invalid index provided.";
+        qWarning() << "Invalid index provided.";
         return;
     }
 
@@ -414,7 +413,7 @@ void ContextMenu::onStartVideoChatTriggered()
 void ContextMenu::onStartFileTransferTriggered()
 {
     if (!m_currentIndex.isValid()) {
-        kDebug() << "Invalid index provided.";
+        qWarning() << "Invalid index provided.";
         return;
     }
 
@@ -429,7 +428,7 @@ void ContextMenu::onStartFileTransferTriggered()
 void ContextMenu::onStartDesktopSharingTriggered()
 {
     if (!m_currentIndex.isValid()) {
-        kDebug() << "Invalid index provided.";
+        qWarning() << "Invalid index provided.";
         return;
     }
 
@@ -444,7 +443,7 @@ void ContextMenu::onStartDesktopSharingTriggered()
 void ContextMenu::onOpenLogViewerTriggered()
 {
     if (!m_currentIndex.isValid()) {
-      kDebug() << "Invalid index provided.";
+      qWarning() << "Invalid index provided.";
       return;
     }
 
@@ -471,7 +470,7 @@ void ContextMenu::onAddContactToGroupTriggered()
 
     QAction *action = qobject_cast<QAction*>(sender());
     if (!action) {
-        kDebug() << "Invalid action";
+        qWarning() << "Invalid action";
         return;
     }
 

-- 
ktp-contact-list packaging