[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=58d7eb5

The following commit has been merged in the master branch:
commit 58d7eb5a461bc597455065da3a4cd813e4f0a15a
Author: Daniele E. Domenichelli <ddomenichelli at kde.org>
Date:   Fri Feb 8 15:11:13 2013 +0100

    Print tp-qt library name and version in tp-qt debug
    
    This allows to get better logs, since we will get the tp-qt version
    together with the log, moreover if KDE_COLOR_DEBUG=1 warnings and errors
    will be printed in a different colour, making it easier to locate them.
    
    Reviewed-by: David Edmundson <kde at davidedmundson.co.uk>
---
 KTp/debug.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/KTp/debug.cpp b/KTp/debug.cpp
index e7d26bc..fcc5cd6 100644
--- a/KTp/debug.cpp
+++ b/KTp/debug.cpp
@@ -27,15 +27,17 @@ namespace KTp
 
 namespace {
 int s_tpqtDebugArea;
+QString libraryString;
 
 static void tpDebugCallback(const QString &libraryName,
                             const QString &libraryVersion,
                             QtMsgType type,
                             const QString &msg)
 {
-    Q_UNUSED(libraryName)
-    Q_UNUSED(libraryVersion)
-    kDebugStream(type, s_tpqtDebugArea, __FILE__, __LINE__, 0) << qPrintable(msg);
+    if (Q_UNLIKELY(libraryString.isEmpty())) {
+        libraryString = QString::fromLatin1("%1 %2").arg(libraryName, libraryVersion);
+    }
+    kDebugStream(type, s_tpqtDebugArea, __FILE__, __LINE__, libraryString.toLatin1()) << qPrintable(msg);
 }
 } // namespace
 } // namespace KTp

-- 
ktp-common-internals packaging