Mercurial > projects > qtd

changeset 315:2049c3abd348 lifetime

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more cleanup
author maxter <spambox@d-coding.com>
date Wed, 23 Dec 2009 23:54:39 +0200
parents 80b52f5e97b6
children f04e6d82d3d4
files cpp/qt_qtd/qtd_core.cpp d1/qt/QDefines.d d1/qtd/CMakeLists.txt d2/qt/QDefines.d d2/qtd/CMakeLists.txt d2/qtd/QtdObject.d generator/dgenerator.cpp
diffstat 7 files changed, 8 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/cpp/qt_qtd/qtd_core.cpp	Wed Dec 23 23:17:36 2009 +0200
+++ b/cpp/qt_qtd/qtd_core.cpp	Wed Dec 23 23:54:39 2009 +0200
@@ -11,17 +11,6 @@
 
 #include "qtd_core.h"
 #include <iostream>
-#include <QCryptographicHash>
-
-extern "C" DLL_PUBLIC void* qtd_test_Object()
-{
-    return new QCryptographicHash(QCryptographicHash::Md5);
-}
-
-extern "C" DLL_PUBLIC void qtd_test_delete_Object(void* obj)
-{
-    delete (QCryptographicHash*)obj;
-}
 
 extern "C" DLL_PUBLIC QModelIndex qtd_to_QModelIndex(QModelIndexAccessor mia)
 {
--- a/d1/qt/QDefines.d	Wed Dec 23 23:17:36 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-module qt.QDefines;
-
-const char[] QT_VERSION_STR = "4.5.1";
-const int QT_VERSION = 263425;
--- a/d1/qtd/CMakeLists.txt	Wed Dec 23 23:17:36 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-set(QT_QTD_SRCS_D
-Str.d
-)
--- a/d2/qt/QDefines.d	Wed Dec 23 23:17:36 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-module qt.QDefines;
-
-const char[] QT_VERSION_STR = "4.5.1";
-const int QT_VERSION = 263425;
--- a/d2/qtd/CMakeLists.txt	Wed Dec 23 23:17:36 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-set(QT_QTD_SRCS_D
-Str.d
-)
--- a/d2/qtd/QtdObject.d	Wed Dec 23 23:17:36 2009 +0200
+++ b/d2/qtd/QtdObject.d	Wed Dec 23 23:54:39 2009 +0200
@@ -290,6 +290,7 @@
 	/**
 	     
 	*/
+    /+
 	void __ownership(QtdOwnership native)
 	{
 		switch(own)
@@ -310,6 +311,7 @@
 				assert(false);
 		}
 	}
+    +/
 	
 	/**
 		Returns true if garbage collection for this object is disabled.
@@ -351,15 +353,13 @@
     this(void* nativeId, QtdObjectFlags flags = QtdObjectFlags.none)
     {
     	super(nativeId, flags);
-        if (!(__flags & QtdObjectFlags.canHaveDups)
-            && !(__flags & QtdObjectFlags.hasDId))
+        if (!(__flags & QtdObjectFlags.hasDId))
         	metaObject.addRef(this);
     }
     
     ~this()
     {
-    	if (!(__flags & QtdObjectFlags.canHaveDups)
-    	    && !(__flags & QtdObjectFlags.hasDId))
+    	if (!(__flags & QtdObjectFlags.hasDId))
 	    	metaObject.removeRef(this);
     }
     
@@ -379,8 +379,10 @@
     }
 }
 
+/+
 extern(C) void qtd_ownership(void* dId, QtdOwnership own)
 {
 	auto obj = cast(QtdObjectBase)dId;
 	obj.__ownership = own;
-}
\ No newline at end of file
+}
++/
\ No newline at end of file
--- a/generator/dgenerator.cpp	Wed Dec 23 23:17:36 2009 +0200
+++ b/generator/dgenerator.cpp	Wed Dec 23 23:54:39 2009 +0200
@@ -2461,7 +2461,7 @@
 //        writeConversionFunction(s, d_class);
 
     if (d_class->hasConstructors() && d_class->polymorphicBase() == d_class)
-        s << "extern(C) void qtd_" << d_class->name() << "_destructor(void *ptr);" << endl << endl;
+        s << "extern(C) void qtd_" << d_class->name() << "_delete(void *ptr);" << endl << endl;
 
     // qtd
     s << endl << "// C wrappers" << endl;