diff d2/qtd/Debug.d @ 383:bd7f485e3573

More debug fixes
author Max Samukha <maxter@spambox.com>
date Mon, 12 Jul 2010 22:50:58 +0300
parents 681af90e1d53
children
line wrap: on
line diff
--- a/d2/qtd/Debug.d	Mon Jul 12 20:36:07 2010 +0300
+++ b/d2/qtd/Debug.d	Mon Jul 12 22:50:58 2010 +0300
@@ -60,8 +60,9 @@
         {
             static assert (QtdObjectFlags.sizeof == ubyte.sizeof);
             auto flags = wrapper.qtdFlags;
-            return format("%s (nativeId: %s, this ptr: %s, flags: %b)", this, wrapper.qtdNativeId
-                , cast(void*)this, *cast(ubyte*)&flags);
+            return format("%s (nativeId: %s, this ptr: %s, flags: %b)"
+                , wrapper, wrapper.qtdNativeId
+                , cast(void*)wrapper, *cast(ubyte*)&flags);
         }
 
         void onWrapperConstructed(QtdObject wrapper)
@@ -77,13 +78,13 @@
 
         void onWrapperDestroyed(QtdObject wrapper)
         {
-            info("Leaving QtdObject destructor: " ~ wrapperToString(wrapper));
+            info(format("Leaving QtdObject destructor (dId: %s)",  cast(void*)wrapper));
             wrapperCount_--;
         }
 
         void onNativeDeleted(QtdObject wrapper)
         {
-            info("Native object deleted: " ~ wrapperToString(wrapper));
+            info(format("Native object deleted (dId: %s)", cast(void*)wrapper));
             nativeDeletedCount_++;
         }
 
@@ -92,9 +93,9 @@
             info("Object ownership changed: " ~ wrapperToString(wrapper));
         }
 
-        void onDeletingWrapperFromNative(void* dId)
+        void onDeletingWrapperFromNative(QtdObject wrapper)
         {
-            info(format("Wrapper deletion initiated from C++ (wrapper id: %s)", dId));
+            info(format("Wrapper deletion initiated from C++ (wrapper id: %s)", cast(void*)wrapper));
         }
 
         @property int wrapperCount()