From 49b12d82360ac9602190ff6be93ef0d7b2949055 Mon Sep 17 00:00:00 2001
From: Sean Harmer <sean.harmer.qnx@kdab.com>
Date: Thu, 24 May 2012 11:03:43 +0100
Subject: QNX: Rationalise the usage of qDebug() to remove lots of #ifdef's

Change-Id: I097e4af86a6a0941f4fd7e122970f88ba536ab38
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Andriy Golovnya <andriy.golovnya@googlemail.com>
---
 src/plugins/platforms/qnx/qqnxbuffer.cpp | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'src/plugins/platforms/qnx/qqnxbuffer.cpp')

diff --git a/src/plugins/platforms/qnx/qqnxbuffer.cpp b/src/plugins/platforms/qnx/qqnxbuffer.cpp
index 048aec8ff6..9c951e39d6 100644
--- a/src/plugins/platforms/qnx/qqnxbuffer.cpp
+++ b/src/plugins/platforms/qnx/qqnxbuffer.cpp
@@ -46,22 +46,24 @@
 #include <errno.h>
 #include <sys/mman.h>
 
+#ifdef QQNXBUFFER_DEBUG
+#define qBufferDebug qDebug
+#else
+#define qBufferDebug QT_NO_QDEBUG_MACRO
+#endif
+
 QT_BEGIN_NAMESPACE
 
 QQnxBuffer::QQnxBuffer()
     : m_buffer(0)
 {
-#if defined(QQNXBUFFER_DEBUG)
-    qDebug() << "QQnxBuffer::QQnxBuffer - empty";
-#endif
+    qBufferDebug() << Q_FUNC_INFO << "empty";
 }
 
 QQnxBuffer::QQnxBuffer(screen_buffer_t buffer)
     : m_buffer(buffer)
 {
-#if defined(QQNXBUFFER_DEBUG)
-    qDebug() << "QQnxBuffer::QQnxBuffer - normal";
-#endif
+    qBufferDebug() << Q_FUNC_INFO << "normal";
 
     // Get size of buffer
     errno = 0;
@@ -131,23 +133,17 @@ QQnxBuffer::QQnxBuffer(const QQnxBuffer &other)
     : m_buffer(other.m_buffer),
       m_image(other.m_image)
 {
-#if defined(QQNXBUFFER_DEBUG)
-    qDebug() << "QQnxBuffer::QQnxBuffer - copy";
-#endif
+    qBufferDebug() << Q_FUNC_INFO << "copy";
 }
 
 QQnxBuffer::~QQnxBuffer()
 {
-#if defined(QQNXBUFFER_DEBUG)
-    qDebug() << "QQnxBuffer::~QQnxBuffer";
-#endif
+    qBufferDebug() << Q_FUNC_INFO;
 }
 
 void QQnxBuffer::invalidateInCache()
 {
-#if defined(QQNXBUFFER_DEBUG)
-    qDebug() << "QQnxBuffer::invalidateInCache";
-#endif
+    qBufferDebug() << Q_FUNC_INFO;
 
     // Verify native buffer exists
     if (m_buffer == 0) {
-- 
cgit v1.2.3