Mercurial > projects > qtd

changeset 382:1d56b2a2e10c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes to debugging stuff. Added size_t as primitive type to workaround Qwt build failure in debug
author Max Samukha <maxter@spambox.com>
date Mon, 12 Jul 2010 20:36:07 +0300
parents 347e4c7a9ba1
children bd7f485e3573
files build/core.txt d2/qtd/QtdObject.d examples/qwt/simpleplot/build.sh generator/cppimplgenerator.cpp
diffstat 4 files changed, 6 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/build/core.txt	Sun Jul 11 01:59:42 2010 +0100
+++ b/build/core.txt	Mon Jul 12 20:36:07 2010 +0300
@@ -65,12 +65,6 @@
     )
 endif()
 
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug" OR UNITTEST)
-set (d_qtd_files ${d_qtd_files}
-        Debug
-    )
-endif()
-
 set (d_generated_files core/Qt QDefines)
 ## Classes.
 set (classes
--- a/d2/qtd/QtdObject.d	Sun Jul 11 01:59:42 2010 +0100
+++ b/d2/qtd/QtdObject.d	Mon Jul 12 20:36:07 2010 +0300
@@ -13,7 +13,7 @@
     std.bitmanip,
     qtd.Core,
     qtd.Debug,
-    qtd.meta.Runtime;  
+    qtd.meta.Runtime;
 
 /**
     QtdObject initialization options.
@@ -140,7 +140,7 @@
 
         Note that wrappers for QObject instances and instances of classes
         derived from QObject are always unique, therefore
-        the 'is' expression can be used instead of this function.
+        the 'is' operator can be used instead of this function.
      */
     final bool isSame(const(QtdObject) other) const
     {
@@ -198,7 +198,7 @@
         else
             assert(false);
 
-        mixin(debugHandler("onWrapperOwnershipChanged", "obj"));
+        mixin(debugHandler("onObjectOwnershipChanged", "obj"));
     }
 
     // COMPILER BUG: 3206
--- a/examples/qwt/simpleplot/build.sh	Sun Jul 11 01:59:42 2010 +0100
+++ b/examples/qwt/simpleplot/build.sh	Mon Jul 12 20:36:07 2010 +0300
@@ -1,3 +1,3 @@
 #! /bin/bash
 
-dmd simple.d -L-lqtdqwt -L-lqtdgui -L-lqtdcore -L-lcpp_qwt -L-lcpp_core -L-lcpp_gui -L-lqwt-qt4 -L-lQtGui -L-lQtCore -ofsimple
+dmd -I../../../d2 -I../../../output/build simple.d -L-lqtdqwt -L-lqtdgui -L-lqtdcore -L-lcpp_qwt -L-lcpp_core -L-lcpp_gui -L-lqwt-qt4 -L-lQtGui -L-lQtCore -ofsimple
--- a/generator/cppimplgenerator.cpp	Sun Jul 11 01:59:42 2010 +0100
+++ b/generator/cppimplgenerator.cpp	Mon Jul 12 20:36:07 2010 +0300
@@ -180,6 +180,7 @@
         table["long"] = "0";
         table["float"] = "0f";
         table["double"] = "0.0";
+        table["size_t"] = "0";
         table["java.lang.Object"] = "0";
     }
 
@@ -189,6 +190,7 @@
         return returnStr + " " + signature;
 
     Q_ASSERT(!java_type->isPrimitive());
+
     if (java_type->isJObjectWrapper())
         return returnStr + " JObjectWrapper()";
     if (java_type->isVariant())