Add object address to the debug output.

Change-Id: Ifd0f56cccb4bf55e562db61ca0907b2e73e2bee7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Faure <faure@kde.org>

5 files changed, 14 insertions, 14 deletions

diff --git a/src/imports/mimetypes/qdeclarativemimedatabase.cpp b/src/imports/mimetypes/qdeclarativemimedatabase.cpp
index 51ea784..c913fff 100644
--- a/src/imports/mimetypes/qdeclarativemimedatabase.cpp
+++ b/src/imports/mimetypes/qdeclarativemimedatabase.cpp
@@ -50,9 +50,9 @@
 extern bool isQMimeDatabaseDebuggingActivated;
 
 #ifndef QT_NO_DEBUG_OUTPUT
-#define DBG() if (isQMimeDatabaseDebuggingActivated) qDebug() << Q_FUNC_INFO
+#define DBG() if (isQMimeDatabaseDebuggingActivated) qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO
 #else
-#define DBG() if (0) qDebug() << Q_FUNC_INFO
+#define DBG() if (0) qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO
 #endif
 
 // ------------------------------------------------------------------------------------------------
diff --git a/src/imports/mimetypes/qdeclarativemimetype.cpp b/src/imports/mimetypes/qdeclarativemimetype.cpp
index 790226d..91dab97 100644
--- a/src/imports/mimetypes/qdeclarativemimetype.cpp
+++ b/src/imports/mimetypes/qdeclarativemimetype.cpp
@@ -51,9 +51,9 @@
 extern bool isQMimeTypeDebuggingActivated;
 
 #ifndef QT_NO_DEBUG_OUTPUT
-#define DBG() if (isQMimeTypeDebuggingActivated) qDebug() << Q_FUNC_INFO
+#define DBG() if (isQMimeTypeDebuggingActivated) qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO
 #else
-#define DBG() if (0) qDebug() << Q_FUNC_INFO
+#define DBG() if (0) qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO
 #endif
 
 // ------------------------------------------------------------------------------------------------
@@ -236,12 +236,12 @@ QVariantMap QDeclarativeMimeType::properties() const
 #define ASSIGN_FROM_PROPERTY(name, setter, variantType, converter) \
     if (!other.contains(#name)) { \
         if (false) { \
-            qDebug() << Q_FUNC_INFO << "Variant does not contain" << #name; \
+            qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO << "Variant does not contain" << #name; \
         } \
     } \
     else if (other[#name].type() != QVariant::variantType) { \
         if (false) { \
-            qDebug() << Q_FUNC_INFO << "Variant for" << #name << "has wrong type" << other[#name].type() << "with" << other[#name]; \
+            qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO << "Variant for" << #name << "has wrong type" << other[#name].type() << "with" << other[#name]; \
         } \
     } \
     else { \
@@ -275,20 +275,20 @@ void QDeclarativeMimeType::assignProperties(const QVariantMap &other)
 #define EQUALS_PROPERTY(name, variantType, converter) \
     if (!other.contains(#name)) { \
         if (false) { \
-            qDebug() << Q_FUNC_INFO << "Variant does not contain" << #name << name(); \
+            qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO << "Variant does not contain" << #name << name(); \
         } \
         return false; \
     } \
     \
     if (other[#name].type() != QVariant::variantType) { \
         if (false) { \
-            qDebug() << Q_FUNC_INFO << "Variant for" << #name << "has wrong type" << other[#name].type() << "for" << name() << "with" << other[#name]; \
+            qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO << "Variant for" << #name << "has wrong type" << other[#name].type() << "for" << name() << "with" << other[#name]; \
         } \
         return false; \
     } \
     if (name() != other[#name].converter()) { \
         if (false) { \
-            qDebug() << Q_FUNC_INFO << "Values for" << #name << "differ:" << name() << other[#name]; \
+            qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO << "Values for" << #name << "differ:" << name() << other[#name]; \
         } \
         return false; \
     }
diff --git a/src/mimetypes/qmimedatabase.cpp b/src/mimetypes/qmimedatabase.cpp
index 897c634..e46a60f 100644
--- a/src/mimetypes/qmimedatabase.cpp
+++ b/src/mimetypes/qmimedatabase.cpp
@@ -44,9 +44,9 @@ QT_BEGIN_NAMESPACE
 bool isQMimeDatabaseDebuggingActivated (false);
 
 #ifndef QT_NO_DEBUG_OUTPUT
-#define DBG() if (isQMimeDatabaseDebuggingActivated) qDebug() << Q_FUNC_INFO
+#define DBG() if (isQMimeDatabaseDebuggingActivated) qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO
 #else
-#define DBG() if (0) qDebug() << Q_FUNC_INFO
+#define DBG() if (0) qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO
 #endif
 
 // ------------------------------------------------------------------------------------------------
diff --git a/src/mimetypes/qmimeprovider.cpp b/src/mimetypes/qmimeprovider.cpp
index 94fb9b1..00ba4eb 100644
--- a/src/mimetypes/qmimeprovider.cpp
+++ b/src/mimetypes/qmimeprovider.cpp
@@ -692,7 +692,7 @@ void QMimeXMLProvider::ensureLoaded()
         foreach (const QString &packageDir, packageDirs) {
             QDir dir(packageDir);
             const QStringList files = dir.entryList(QDir::Files | QDir::NoDotAndDotDot);
-            //qDebug() << Q_FUNC_INFO << packageDir << files;
+            //qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO << packageDir << files;
             if (!fdoXmlFound)
                 fdoXmlFound = files.contains(QLatin1String("freedesktop.org.xml"));
             QStringList::const_iterator endIt(files.constEnd());
diff --git a/src/mimetypes/qmimetype.cpp b/src/mimetypes/qmimetype.cpp
index a8b53b2..1431779 100644
--- a/src/mimetypes/qmimetype.cpp
+++ b/src/mimetypes/qmimetype.cpp
@@ -34,9 +34,9 @@ QT_BEGIN_NAMESPACE
 bool isQMimeTypeDebuggingActivated (false);
 
 #ifndef QT_NO_DEBUG_OUTPUT
-#define DBG() if (isQMimeTypeDebuggingActivated) qDebug() << Q_FUNC_INFO
+#define DBG() if (isQMimeTypeDebuggingActivated) qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO
 #else
-#define DBG() if (0) qDebug() << Q_FUNC_INFO
+#define DBG() if (0) qDebug() << static_cast<const void *>(this) << Q_FUNC_INFO
 #endif
 
 QMimeTypePrivate::QMimeTypePrivate()