[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [tellico/frameworks] src: Move kDebug to QDebug
From:       Robby Stephenson <robby () periapsis ! org>
Date:       2015-05-01 1:57:03
Message-ID: E1Yo0CN-0005S8-Ts () scm ! kde ! org
[Download RAW message or body]

Git commit c81ee223306152d4877eee0e612e1dbb12eaed51 by Robby Stephenson.
Committed on 30/04/2015 at 18:39.
Pushed by rstephenson into branch 'frameworks'.

Move kDebug to QDebug

M  +8    -8    src/tellico_debug.h
M  +0    -1    src/translators/csvexporter.cpp

http://commits.kde.org/tellico/c81ee223306152d4877eee0e612e1dbb12eaed51

diff --git a/src/tellico_debug.h b/src/tellico_debug.h
index c9b4183..e3caac5 100644
--- a/src/tellico_debug.h
+++ b/src/tellico_debug.h
@@ -29,7 +29,7 @@
 // which is copyright Max Howell <max.howell@methylblue.com>
 // amarok is licensed under the GPL
 
-#include <kdebug.h>
+#include <QDebug>
 // std::clock_t
 #include <ctime>
 
@@ -69,12 +69,12 @@
   #define FUNC_PREFIX "[" DEBUG_PREFIX "] "
 #endif
 
-#define myDebug()   kDebug()
-#define myWarning() kWarning()
+#define myDebug()   qDebug()
+#define myWarning() qWarning()
 #ifdef TELLICO_LOG
-#define myLog()     kDebug()
+#define myLog()     qDebug()
 #else
-#define myLog()     kDebugDevNull()
+#define myLog()     //qDebug()
 #endif
 
 namespace Debug {
@@ -83,13 +83,13 @@ class Block {
 
 public:
   Block(const char* label) : m_start(std::clock()), m_label(label) {
-    KDebug(QtDebugMsg)() << "BEGIN:" << label;
+    QDebug(QtDebugMsg) << "BEGIN:" << label;
   }
 
   ~Block() {
     std::clock_t finish = std::clock();
     const double duration = (double) (finish - m_start) / CLOCKS_PER_SEC;
-    KDebug(QtDebugMsg)() << "  END:" << m_label << "- duration =" << duration;
+    QDebug(QtDebugMsg) << "  END:" << m_label << "- duration =" << duration;
   }
 
 private :
@@ -100,7 +100,7 @@ private :
 }
 
 /// Standard function announcer
-#define DEBUG_FUNC myDebug() << k_funcinfo;
+#define DEBUG_FUNC myDebug() << Q_FUNC_INFO;
 
 /// Announce a line
 #define DEBUG_LINE myDebug() << k_lineinfo;
diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp
index 537a740..a5db7e3 100644
--- a/src/translators/csvexporter.cpp
+++ b/src/translators/csvexporter.cpp
@@ -27,7 +27,6 @@
 #include "../core/filehandler.h"
 
 #include <klocale.h>
-#include <kdebug.h>
 #include <klineedit.h>
 #include <kconfig.h>
 #include <KConfigGroup>

[prev in list] [next in list] [prev in thread] [next in thread]