From 3f1f0210cefaa3523c8d2cd5ead4bdbd5d92a68a Mon Sep 17 00:00:00 2001
From: Frans Englich <frans.englich@nokia.com>
Date: Thu, 15 Oct 2009 11:28:21 +0200
Subject: Use QT_NO_DEBUG, not _DEBUG.

---
 src/3rdparty/phonon/mmf/mmf_videoplayer.cpp | 8 ++++----
 src/3rdparty/phonon/mmf/utils.cpp           | 2 +-
 src/3rdparty/phonon/mmf/utils.h             | 4 ++--
 src/3rdparty/phonon/mmf/videooutput.cpp     | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
index 6d7e0ed..53bbb77 100644
--- a/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
+++ b/src/3rdparty/phonon/mmf/mmf_videoplayer.cpp
@@ -27,7 +27,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "mmf_videoplayer.h"
 #include "utils.h"
 
-#ifdef _DEBUG
+#ifndef QT_NO_DEBUG
 #include "objectdump.h"
 #endif
 
@@ -341,7 +341,7 @@ void MMF::VideoPlayer::videoOutputRegionChanged()
 }
 
 
-#ifdef _DEBUG
+#ifndef QT_NO_DEBUG
 
 // The following code is for debugging problems related to video visibility.  It allows
 // the VideoPlayer instance to query the window server in order to determine the
@@ -392,7 +392,7 @@ void MMF::VideoPlayer::updateMmfOutput()
     // MvpuoPrepareComplete, at which point the MMF controller has been
     // loaded.
 
-#ifdef _DEBUG
+#ifndef QT_NO_DEBUG
     getDsaRegion(m_wsSession, *m_window);
 #endif
 
@@ -449,7 +449,7 @@ bool MMF::VideoPlayer::getNativeWindowSystemHandles()
     	// Get top-level window
     	control = QApplication::activeWindow()->effectiveWinId();
 
-#ifdef _DEBUG
+#ifndef QT_NO_DEBUG
     if(m_videoOutput) {
         QScopedPointer<ObjectDump::QDumper> dumper(new ObjectDump::QDumper);
         dumper->setPrefix("Phonon::MMF"); // to aid searchability of logs
diff --git a/src/3rdparty/phonon/mmf/utils.cpp b/src/3rdparty/phonon/mmf/utils.cpp
index 2f5b68f..607f938 100644
--- a/src/3rdparty/phonon/mmf/utils.cpp
+++ b/src/3rdparty/phonon/mmf/utils.cpp
@@ -62,7 +62,7 @@ MMF::MediaType MMF::Utils::mimeTypeToMediaType(const TDesC& mimeType)
 }
 
 
-#ifdef _DEBUG
+#ifndef QT_NO_DEBUG
 
 #include <hal.h>
 #include <hal_data.h>
diff --git a/src/3rdparty/phonon/mmf/utils.h b/src/3rdparty/phonon/mmf/utils.h
index 38964d0..727abb0 100644
--- a/src/3rdparty/phonon/mmf/utils.h
+++ b/src/3rdparty/phonon/mmf/utils.h
@@ -54,7 +54,7 @@ void panic(PanicCode code);
  */
 MediaType mimeTypeToMediaType(const TDesC& mimeType);
 
-#ifdef _DEBUG
+#ifndef QT_NO_DEBUG
 /**
  * Retrieve color of specified pixel from the screen.
  */
@@ -138,7 +138,7 @@ public:
 #define _TRACE_MODULE Phonon::MMF
 
 // Macros available for use by implementation code
-#ifdef _DEBUG
+#ifndef QT_NO_DEBUG
 #define TRACE_CONTEXT(_fn, _cat) const ::Phonon::MMF::TTraceContext _tc((TText*)L ## #_fn, (TUint)this, _cat);
 #define TRACE_ENTRY_0() { if(_tc.Enabled()) _TRACE_PRINT(_TRACE_TEXT(L ## "+ Phonon::MMF::%s [0x%08x]"), _tc.iFunction, _tc.iAddr); }
 #define TRACE_ENTRY(string, args...) { if(_tc.Enabled()) _TRACE_PRINT(_TRACE_TEXT(L ## "+ Phonon::MMF::%s [0x%08x] " L ## string), _tc.iFunction, _tc.iAddr, args); }
diff --git a/src/3rdparty/phonon/mmf/videooutput.cpp b/src/3rdparty/phonon/mmf/videooutput.cpp
index 0541612..13d00f5 100644
--- a/src/3rdparty/phonon/mmf/videooutput.cpp
+++ b/src/3rdparty/phonon/mmf/videooutput.cpp
@@ -20,7 +20,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include "videooutput.h"
 #include "videooutputobserver.h"
 
-#ifdef _DEBUG
+#ifndef QT_NO_DEBUG
 #include "objectdump.h"
 #endif
 
@@ -173,7 +173,7 @@ void MMF::VideoOutput::videoOutputRegionChanged()
 
 void MMF::VideoOutput::dump() const
 {
-#ifdef _DEBUG
+#ifndef QT_NO_DEBUG
     TRACE_CONTEXT(VideoOutput::dump, EVideoInternal);
     QScopedPointer<ObjectDump::QVisitor> visitor(new ObjectDump::QVisitor);
     visitor->setPrefix("Phonon::MMF"); // to aid searchability of logs
-- 
cgit v0.12