projects/qtd: generator/typesystem

comparison generator/typesystem_core.xml @ 253:073b9153ed8a

Rev. 264 done right. Problems: - classwizard segfaults on exit due to a bug in signals/slots or runtime. - hellogl doesn't compile with dmd2 due to a bug in the compiler backend

author	maxter
date	Sun, 30 Aug 2009 09:59:12 +0000
parents	37eed70de029
children	17b5e13364b7 f9559a957be9

comparison

equal deleted inserted replaced

-:37eed70de029
+:073b9153ed8a
 <?xml version="1.0" encoding="UTF-8"?>
-<typesystem package="qt.core" default-superclass="QtDObject">
+<typesystem package="qt.core" default-superclass="QtdObject">
 <inject-code>
 qt.Utilities.loadQtLibrary("QtCore");
 </inject-code>
 <template name="core.return_string_instead_of_char*">
 public final string %FUNCTION_NAME() {
 <modify-function signature="julianToGregorian(uint,int&amp;,int&amp;,int&amp;)">
 <remove/>
 </modify-function>
 <modify-function signature="setYMD(int, int, int)" remove="all"/> <!--### Obsolete in 4.3-->
 <inject-code>
 <import-file name="typesystem_core-java.java" quote-after-line="class QDate___" quote-before-line="}// class"/>
 </inject-code>
 <modify-function signature="weekNumber(int*)const">
 </modify-argument>
 </modify-function>
 <modify-function signature="operator=(QDir)" remove="all"/>
 <modify-function signature="operator=(QString)" remove="all"/>
 <modify-function signature="addResourceSearchPath(QString)" remove="all"/> <!--### Obsolete in 4.3-->
 <inject-code>
 <import-file name="typesystem_core-java.java" quote-after-line="class QDir___" quote-before-line="}// class"/>
 </inject-code>
 <modify-function signature="operator[](int)const" access="private"/>
 <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function>
 <modify-function signature="operator+=(QSize)"> <access modifier="private"/> </modify-function>
 <modify-function signature="operator-=(QSize)"> <access modifier="private"/> </modify-function>
 <modify-function signature="rheight()"> <remove/> </modify-function>
 <modify-function signature="rwidth()"> <remove/> </modify-function>
 <inject-code>
 <insert-template name="core.multiply-devide-add-subtract">
 <replace from="%TYPE" to="QSize"/>
 </insert-template>
 </inject-code>
 <modify-function signature="operator/=(double)"> <access modifier="private"/> </modify-function>
 <modify-function signature="operator+=(QSizeF)"> <access modifier="private"/> </modify-function>
 <modify-function signature="operator-=(QSizeF)"> <access modifier="private"/> </modify-function>
 <modify-function signature="rheight()"> <remove/> </modify-function>
 <modify-function signature="rwidth()"> <remove/> </modify-function>
 <inject-code>
 <insert-template name="core.multiply-devide-add-subtract">
 <replace from="%TYPE" to="QSizeF"/>
 </insert-template>
 </inject-code>
 <modify-function signature="operator&amp;=(QBitArray)" access="private"/>
 <modify-function signature="operator=(QBitArray)" access="private"/>
 <modify-function signature="operator^=(QBitArray)" access="private"/>
 <modify-function signature="operator|=(QBitArray)" access="private"/>
 <modify-function signature="operator~()const" access="private"/>
 <inject-code>
 <import-file name="typesystem_core-java.java" quote-after-line="class QBitArray___" quote-before-line="}// class"/>
 </inject-code>
 </value-type>
 <modify-function signature="columnsAboutToBeRemoved(QModelIndex,int,int)" private-signal="yes"/>
 <modify-function signature="columnsRemoved(QModelIndex,int,int)" private-signal="yes"/>
 <modify-function signature="modelAboutToBeReset()" private-signal="yes"/>
 <modify-function signature="modelReset()" private-signal="yes"/>
 <modify-function signature="parent()const" remove="java"/>
 <extra-includes>
 <include file-name="QStringList" location="global"/>
 <include file-name="QSize" location="global"/>
 </extra-includes>
 </value-type>
 <interface-type name="QFactoryInterface" java-name="QAbstractFactory"/>
 <value-type name="QByteArray">
 <modify-function signature="at(int)const">
 <modify-argument index="return">
 <replace-type modified-type="ubyte"/>
 </modify-argument>
 </modify-function>
 <extra-includes>
 <include file-name="QNoImplicitBoolCast" location="global"/>
 </extra-includes>
 <!-- removed functions -->
 <object-type name="QFile">
 <modify-function signature="readLink()const" remove="all"/> <!--### Obsolete in 4.3-->
 <modify-function signature="readLink(QString)" remove="all"/> <!--### Obsolete in 4.3-->
 <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/> <!-- Can't provide same API and performance -->
 <modify-function signature="unmap(unsigned char*)" remove="all"/> <!-- Can't provide same API and performance -->
 <inject-code>
 <import-file name="typesystem_core-java.java" quote-after-line="class QFile___" quote-before-line="}// class"/>
 </inject-code>
 <modify-function signature="decodeName(const char*)">
 <access modifier="private"/>
 <modify-function signature="ungetChar(char)" rename="ungetByte"/>
 <modify-function signature="getChar(char*)">
 <access modifier="private"/>
 <rename to="getByte"/>
 </modify-function>
 	<modify-function signature="write(const char*)">
 <access modifier="private"/>
 </modify-function>
 	<modify-function signature="write(const char*,long long)">
 <access modifier="private"/>
 </modify-function>
 <!--
 </modify-function>
 <modify-function signature="toUnicode(const char*)const">
 <remove/>
 </modify-function>
 <inject-code>
 <import-file name="typesystem_core-java.java" quote-after-line="class QTextCodec___" quote-before-line="}// class"/>
 </inject-code>
 <modify-function signature="convertFromUnicode(const QChar*,int,QTextCodec::ConverterState*)const">
 <object-type name="QTimeLine"/>
 <object-type name="QTranslator">
 <modify-function signature="translate(const char*,const char*,const char*,int)const">
 <remove/>
 </modify-function>
 <extra-includes>
 <include file-name="QTextCodec" location="global"/>
 </extra-includes>
 <modify-function signature="load(const unsigned char*,int)">
 <access modifier="private"/>
 <object-type name="QBuffer">
 <modify-function signature="buffer()const">
 <remove/>
 </modify-function>
 <inject-code>
 <import-file name="typesystem_core-java.java" quote-after-line="class QBuffer___" quote-before-line="}// class"/>
 </inject-code>
 <!--        <extra-includes>
 <extra-includes>
 <include file-name="QDateTime" location="global"/>
 </extra-includes>
 <modify-function signature="map(long long,long long,QFile::MemoryMapFlags)" remove="all"/>
 <modify-function signature="unmap(unsigned char*)" remove="all"/>
 <inject-code>
 <import-file name="typesystem_core-java.java" quote-after-line="class QAbstractFileEngine___" quote-before-line="}// class"/>
 </inject-code>
 </object-type>
 <modify-function signature="mapped(QWidget *)" remove="all"/>
 <modify-function signature="mapping(QWidget*)const" remove="all"/>
 <modify-function signature="setMapping(QObject*,QWidget*)" remove="all"/>
 <inject-code>
 <import-file name="typesystem_core-java.java" quote-after-line="class QSignalMapper___" quote-before-line="}// class"/>
 </inject-code>
 </modify-argument>
 </modify-function>
 </object-type>
 <object-type name="QObject">
+	<inject-code class="native">
+#ifdef CPP_SHARED
+QTD_EXPORT_VAR(qtd_delete_d_qobject);
+extern "C" DLL_PUBLIC void qtd_QObjectEntity_initCallBacks(pfunc_abstr del_d_qobj)
+{
+	QTD_EXPORT_VAR_SET(qtd_delete_d_qobject, del_d_qobj);
+}
+#endif
+extern "C" DLL_PUBLIC void* qtd_get_d_qobject(void *nativeId)
+{
+QtD_QObjectEntity *entity = QtD_QObjectEntity::getQObjectEntity((QObject*)nativeId);
+return entity ? entity-&gt;dId : NULL;
+}
+extern "C" DLL_PUBLIC void qtd_delete_qobject(void *nativeId)
+{
+delete (QObject*)nativeId;
+}
+extern "C" DLL_PUBLIC void qtd_create_qobject_entity(void* nativeId, void *dId)
+{
+	new QtD_QObjectEntity((QObject*)nativeId, dId);
+}
+extern "C" DLL_PUBLIC void* qtd_QObject_metaObject(void* nativeId)
+{
+return (void*)((QObject*)nativeId)->metaObject();
+}
+extern "C" DLL_PUBLIC void qtd_connect(void* nativeId, char* signal, int id, bool dynamicEntity)
+{
+QObject *sender = (QObject*)nativeId;
+QObject *receiver = dynamicEntity ? dynamic_cast&lt;QObject*&gt;(QtD_QObjectEntity::getQObjectEntity(sender)) : sender;
+const QMetaObject *mo = sender->metaObject();
+int nativeSigId = mo-&gt;indexOfSignal(signal);
+QMetaObject::connect(sender, nativeSigId, receiver, receiver-&gt;metaObject()-&gt;methodCount() + id);
+}
+extern "C" DLL_PUBLIC void qtd_disconnect(void* nativeId, char* signal, int id, bool dynamicEntity)
+{
+QObject *sender = (QObject*)nativeId;
+QObject *receiver = dynamicEntity ? dynamic_cast&lt;QObject*&gt;(QtD_QObjectEntity::getQObjectEntity(sender)) : sender;
+const QMetaObject *mo = sender->metaObject();
+int nativeSigId = mo-&gt;indexOfSignal(signal);
+QMetaObject::disconnect(sender, nativeSigId, receiver, receiver-&gt;metaObject()-&gt;methodCount() + id);
+}
+	</inject-code>
+	<inject-code class="java-free">
+extern(C) void* qtd_get_d_qobject(void* nativeId);
+extern(C) void qtd_delete_qobject(void* nativeId);
+extern(C) void* qtd_create_qobject_entity(void* nativeId, void* dId);
+extern(C) void* qtd_QObject_metaObject(void* nativeId);
+extern(C) void qtd_connect(void *nativeId, cstringz signal, int id, bool dynamicEntity);
+extern(C) void qtd_disconnect(void *nativeId, cstringz signal, int id, bool dynamicEntity);
+extern(C) void qtd_delete_d_qobject(void* dId)
+{
+auto obj = cast(QObject)dId;
+	if (!(obj.__flags &amp; QtdObjectFlags.dOwnership))
+	{
+		// Avoid deleting native object twice
+		obj.__setFlags(QtdObjectFlags.nativeOwnership, true);
+		delete obj;
+	}
+}
+	</inject-code>
 <modify-function signature="childEvent(QChildEvent*)">
 <modify-argument index="1" invalidate-after-use="yes"/>
 </modify-function>
 <modify-function signature="customEvent(QEvent*)">
 <modify-argument index="1" invalidate-after-use="yes"/>
 } else if (%1 !is null &amp;&amp; __gc_managed) {
 __gc_ref_list ~= this;
 __gc_managed = false;
 }
 </inject-code> -->
 </modify-function>
 <modify-function signature="deleteLater()">
 <rename to="disposeLater"/>
 </modify-function>
 <extra-includes>
 <include file-name="QVarLengthArray" location="global"/>
 </extra-includes>
+	<inject-code class="java">
+	  <import-file name="typesystem_core-java.java" quote-after-line="class QObject___" quote-before-line="}// class"/>
-<inject-code class="java">
+	</inject-code>
-<import-file name="typesystem_core-java.java" quote-after-line="class QObject___" quote-before-line="}// class"/>
-</inject-code>
 </object-type>
 <object-type name="QCoreApplication">
 <extra-includes>
 <include file-name="QStringList" location="global"/>
 <modify-function signature="postEvent(QObject*,QEvent*)">
 <modify-argument index="2">
 <define-ownership class="java" owner="c++"/>
 </modify-argument>
 </modify-function>
 <modify-function signature="QCoreApplication(int &amp;, char  **)">
 <inject-code class="shell">
 // qtjambi_register_variant_handler();
 </inject-code>
 </modify-function>
 <object-type name="QDynamicPropertyChangeEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::DynamicPropertyChange"/>
 <object-type name="QDataStream">
 <!-- qtd2 -->
 <modify-function signature="device() const" remove="all"/>
 <modify-function signature="setDevice(QIODevice*)">
 <modify-argument index="1">
 <reference-count action="set" variable-name="__rcDevice"/>
 </modify-argument>
 </modify-function>
 <modify-function signature="readRawData(char*,int)"> <remove/> </modify-function>
 <modify-function signature="readBytes(char&amp;*,uint&amp;)"> <remove/> </modify-function>
 <modify-function signature="writeRawData(const char*,int)"> <remove/> </modify-function>
 <modify-function signature="writeBytes(const char*,uint)"> <remove/> </modify-function>
 <template name="core.datastream_operator_shift_right">
 <insert-template name="core.stream_operator_shift_right">
 <replace from="%STREAM_TYPE" to="QDataStream"/>
 </insert-template>
 </template>
 <include file-name="QDateTime" location="global"/>
 </extra-includes>
 </object-type>
 <object-type name="QTextStream">
 <modify-function signature="setCodec(QTextCodec *)" remove="all"/>
 <modify-function signature="codec() const" remove="all"/>
 <modify-function signature="QTextStream(QByteArray *, QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
 <modify-function signature="QTextStream(QString*,QFlags&lt;QIODevice::OpenModeFlag&gt;)"> <remove/> </modify-function>
 <modify-function signature="operator&gt;&gt;(QChar&amp;)"> <remove/> </modify-function>
 <modify-function signature="operator&lt;&lt;(const void*)"> <remove/> </modify-function>
 <modify-function signature="operator&lt;&lt;(unsigned int)"> <remove/> </modify-function>
 </modify-function>
 <modify-function signature="operator&lt;&lt;(const QString&amp;)">
 <rename to="writeString"/>
 <modify-argument index="0" replace-value="this"/>
 </modify-function>
 <modify-function signature="operator&gt;&gt;(char&amp;)">
 <access modifier="private"/>
 <modify-argument index="0" replace-value="this"/>
 <rename to="operator_shift_right_byte"/>
 </modify-function>
 </namespace-type>
 <value-type name="QFuture" generate="no">
 <modify-function signature="operator T() const" remove="all"/>
 <modify-function signature="operator=(const QFuture &amp;)" remove="all"/>
 <modify-function signature="operator==(const QFuture &amp;)const">
 <modify-argument index="1">
 <replace-type modified-type="qt.core.QFuture"/>
 <conversion-rule class="native">
 <insert-template name="convert_qtjambifuture_to_native"/>
 </modify-function>
 </value-type>
 <value-type name="QtJambiVoidFuture" java-name="QFutureVoid">
 <modify-function signature="resultCount()const" remove="all"/>
 <modify-function signature="isResultReadyAt(int)const" remove="all"/>
 <modify-function signature="QFuture(const QFuture &amp;)">
 <modify-argument index="1">
 <replace-type modified-type="qt.core.QFutureVoid"/>
 <conversion-rule class="native">
 <insert-template name="convert_futurevoid_to_native"/>
 </value-type>
 <object-type name="QFutureWatcherBase">
 <modify-function signature="connectNotify(const char *)" remove="all"/>
 <modify-function signature="disconnectNotify(const char *)" remove="all"/>
 <inject-code class="shell-declaration">
 // private, pure virtual and considered internal
 // we need to reimplement them so it will compile
 QFutureInterfaceBase dummyBase;
 </inject-code>
 </object-type>
 <object-type name="QFutureWatcher" generate="no">
 <modify-function signature="future()const" remove="all"/>
 <modify-function signature="setFuture(const QFuture &amp;)">
 <modify-argument index="1">
 <replace-type modified-type="qt.core.QFuture&lt;T&gt;"/>
 <conversion-rule class="native">
 <insert-template name="convert_qtjambifuture_to_native"/>

Mercurial > projects > qtd

comparison generator/typesystem_core.xml @ 253:073b9153ed8a