[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=71ec252

The following commit has been merged in the master branch:
commit 71ec252c497bc96f6576b8d0b35e32a0016cd673
Author: Aleix Pol <aleixpol at kde.org>
Date:   Mon Dec 15 16:06:53 2014 +0100

    Port ktp-debugger away from KDELibs4Support
---
 tools/debugger/CMakeLists.txt         |  3 +--
 tools/debugger/debug-message-view.cpp | 22 +++++++++++-----------
 tools/debugger/main-window.cpp        |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/tools/debugger/CMakeLists.txt b/tools/debugger/CMakeLists.txt
index 769a24b..15287af 100644
--- a/tools/debugger/CMakeLists.txt
+++ b/tools/debugger/CMakeLists.txt
@@ -2,7 +2,6 @@ project(ktp-debugger)
 
 include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${TELEPATHY_QT5_INCLUDE_DIR}
 )
 
 set(ktp-debugger_SRCS
@@ -19,7 +18,7 @@ target_link_libraries(ktp-debugger
     KF5::TextEditor
     KF5::I18n
     KF5::IconThemes
-    KF5::KDELibs4Support
+    KF5::XmlGui
 )
 
 install(TARGETS ktp-debugger DESTINATION ${BIN_INSTALL_DIR})
diff --git a/tools/debugger/debug-message-view.cpp b/tools/debugger/debug-message-view.cpp
index a93f9b9..bcee533 100644
--- a/tools/debugger/debug-message-view.cpp
+++ b/tools/debugger/debug-message-view.cpp
@@ -22,16 +22,16 @@
 #include <TelepathyQt/DebugReceiver>
 #include <TelepathyQt/PendingDebugMessageList>
 
-#include <KDebug>
+#include <QDebug>
+#include <QAction>
+#include <QFileDialog>
 #include <KColorScheme>
 #include <KStandardAction>
-#include <KAction>
 #include <KLocalizedString>
 #include <KFindDialog>
 #include <KService>
 #include <KTextEditor/View>
 #include <kfind.h>
-#include <KFileDialog>
 #include <KTextEditor/Document>
 
 #include <ctime>
@@ -51,7 +51,7 @@ DebugMessageView::DebugMessageView(QWidget *parent)
         Q_ASSERT(m_editor && "Failed to instantiate a KatePart");
     }
     else {
-        kFatal() << "Could not find kate part";
+        qCritical() << "Could not find kate part";
     }
 
     m_editor->setReadWrite(false);
@@ -113,7 +113,7 @@ void DebugMessageView::setService(const QString &service)
 
 void DebugMessageView::onServiceRegistered(const QString & service)
 {
-    kDebug() << "Service" << service << "registered. Introspecting Debug interface...";
+    qDebug() << "Service" << service << "registered. Introspecting Debug interface...";
 
     m_debugReceiver = Tp::DebugReceiver::create(service);
 
@@ -126,7 +126,7 @@ void DebugMessageView::onDebugReceiverInvalidated(Tp::DBusProxy *proxy,
                                                     const QString &errorName, const QString &errorMessage)
 {
     Q_UNUSED(proxy);
-    kDebug() << "DebugReceiver invalidated" << errorName << errorMessage;
+    qDebug() << "DebugReceiver invalidated" << errorName << errorMessage;
     m_ready = false;
     m_debugReceiver.reset();
 }
@@ -134,7 +134,7 @@ void DebugMessageView::onDebugReceiverInvalidated(Tp::DBusProxy *proxy,
 void DebugMessageView::onDebugReceiverReady(Tp::PendingOperation *op)
 {
     if (op->isError()) {
-        kDebug() << "Failed to introspect Debug interface for" << m_serviceName
+        qDebug() << "Failed to introspect Debug interface for" << m_serviceName
                  << "Error was:" << op->errorName() << "-" << op->errorMessage();
         m_debugReceiver.reset();
     } else {
@@ -150,7 +150,7 @@ void DebugMessageView::onDebugReceiverReady(Tp::PendingOperation *op)
 void DebugMessageView::onDebugReceiverMonitoringEnabled(Tp::PendingOperation* op)
 {
     if (op->isError()) {
-        kError() << "Failed to enable monitoring on the Debug object of" << m_serviceName
+        qWarning() << "Failed to enable monitoring on the Debug object of" << m_serviceName
                  << "Error was:" << op->errorName() << "-" << op->errorMessage();
         m_tmpCache.clear();
         m_debugReceiver.reset();
@@ -163,7 +163,7 @@ void DebugMessageView::onDebugReceiverMonitoringEnabled(Tp::PendingOperation* op
 void DebugMessageView::onFetchMessagesFinished(Tp::PendingOperation* op)
 {
     if (op->isError()) {
-        kError() << "Failed to fetch messages from" << m_serviceName
+        qWarning() << "Failed to fetch messages from" << m_serviceName
                  << "Error was:" << op->errorName() << "-" << op->errorMessage();
         m_tmpCache.clear();
         m_debugReceiver.reset();
@@ -212,7 +212,7 @@ static inline QString formatTimestamp(double timestamp)
     sec = (long) timestamp;
     tstruct = std::localtime((time_t *) &sec);
     if (!std::strftime(time_str, sizeof(time_str), "%x %T", tstruct)) {
-        kDebug() << "Failed to format timestamp" << timestamp;
+        qDebug() << "Failed to format timestamp" << timestamp;
         time_str[0] = '

-- 
ktp-common-internals packaging