Mercurial > projects > qtd
changeset 6:374a61671448
wrapped QRect
author | eldar |
---|---|
date | Wed, 13 May 2009 23:40:31 +0000 |
parents | 834feae7809b |
children | b8a79f9fba5a |
files | cpp/qt_core/QVariant_shell.cpp generator/typesystem_core.xml generator/typesystem_gui-java.java generator/typesystem_gui.xml qt/core/QVariant.d |
diffstat | 5 files changed, 33 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/cpp/qt_core/QVariant_shell.cpp Wed May 13 19:45:58 2009 +0000 +++ b/cpp/qt_core/QVariant_shell.cpp Wed May 13 23:40:31 2009 +0000 @@ -796,27 +796,23 @@ } // QVariant::toRect() const -extern "C" DLL_PUBLIC void* qtd_QVariant_toRect +extern "C" DLL_PUBLIC QRect qtd_QVariant_toRect (void* __this_nativeId) { QVariant_QtDShell *__qt_this = (QVariant_QtDShell *) __this_nativeId; QRect __qt_return_value = __qt_this->toRect(); - void* __java_return_value = (void*) new QRect(__qt_return_value); - - return __java_return_value; + return __qt_return_value; } // QVariant::toRectF() const -extern "C" DLL_PUBLIC void* qtd_QVariant_toRectF +extern "C" DLL_PUBLIC QRectF qtd_QVariant_toRectF (void* __this_nativeId) { QVariant_QtDShell *__qt_this = (QVariant_QtDShell *) __this_nativeId; QRectF __qt_return_value = __qt_this->toRectF(); - void* __java_return_value = (void*) new QRectF(__qt_return_value); - - return __java_return_value; + return __qt_return_value; } // QVariant::toRegExp() const
--- a/generator/typesystem_core.xml Wed May 13 19:45:58 2009 +0000 +++ b/generator/typesystem_core.xml Wed May 13 23:40:31 2009 +0000 @@ -382,6 +382,8 @@ <rejection class="QSizeF"/> <rejection class="QPoint"/> <rejection class="QPointF"/> + <rejection class="QRect"/> + <rejection class="QRectF"/> <rejection class="QLine"/> <rejection class="QLineF"/> @@ -851,25 +853,25 @@ </inject-code> </value-type> - <value-type name="QRect"> - <modify-function signature="getCoords(int*,int*,int*,int*)const"> <remove/> </modify-function> + <value-type name="QRect" wrap="struct"> +<!-- <modify-function signature="getCoords(int*,int*,int*,int*)const"> <remove/> </modify-function> <modify-function signature="getRect(int*,int*,int*,int*)const"> <remove/> </modify-function> <modify-function signature="operator&=(QRect)"> <remove/> </modify-function> <modify-function signature="operator|=(QRect)"> <remove/> </modify-function> <modify-function signature="operator&(QRect)const"> <remove/> </modify-function> - <modify-function signature="operator|(QRect)const"> <remove/> </modify-function> + <modify-function signature="operator|(QRect)const"> <remove/> </modify-function> --> <modify-function signature="intersect(const QRect&)const" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="unite(const QRect&)const" remove="all"/> <!--### Obsolete in 4.3--> </value-type> - <value-type name="QRectF"> - <modify-function signature="getCoords(double*,double*,double*,double*)const"> <remove/> </modify-function> + <value-type name="QRectF" wrap="struct"> +<!-- <modify-function signature="getCoords(double*,double*,double*,double*)const"> <remove/> </modify-function> <modify-function signature="getRect(double*,double*,double*,double*)const"> <remove/> </modify-function> <modify-function signature="operator&=(QRectF)"> <remove/> </modify-function> <modify-function signature="operator|=(QRectF)"> <remove/> </modify-function> <modify-function signature="operator&(QRectF)const"> <remove/> </modify-function> - <modify-function signature="operator|(QRectF)const"> <remove/> </modify-function> + <modify-function signature="operator|(QRectF)const"> <remove/> </modify-function> --> <modify-function signature="intersect(const QRectF&)const" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="unite(const QRectF&)const" remove="all"/> <!--### Obsolete in 4.3--> @@ -1924,7 +1926,7 @@ </object-type> <value-type name="QLine" wrap="struct"/> - <value-type name="QLineF" wrap="struct" > + <value-type name="QLineF" wrap="struct"> <inject-code> <import-file name="typesystem_core-java.java" quote-after-line="class QLineF___" quote-before-line="}// class"/> </inject-code>
--- a/generator/typesystem_gui-java.java Wed May 13 19:45:58 2009 +0000 +++ b/generator/typesystem_gui-java.java Wed May 13 23:40:31 2009 +0000 @@ -1084,6 +1084,13 @@ qtd_QPainter_drawPoints_nativepointerQPointF_int(nativeId, points.ptr, points.length); } + public final void drawRects(QRect[] rects) { + qtd_QPainter_drawRects_nativepointerQRect_int(nativeId, rects.ptr, rects.length); + } + + public final void drawRects(QRectF[] rects) { + qtd_QPainter_drawRects_nativepointerQRectF_int(nativeId, rects.ptr, rects.length); + } /* public static QPaintDeviceInterface redirected(QPaintDeviceInterface device, qt.core.QPoint offset) { return redirected(device, offset == null ? null : offset.nativePointer());
--- a/generator/typesystem_gui.xml Wed May 13 19:45:58 2009 +0000 +++ b/generator/typesystem_gui.xml Wed May 13 23:40:31 2009 +0000 @@ -7277,13 +7277,18 @@ </modify-function> <modify-function signature="drawRects(const QRect *, int)"> - <remove/> + <access modifier="private"/> </modify-function> <modify-function signature="drawRects(const QRectF *, int)"> + <access modifier="private"/> + </modify-function> + + <!-- removed stuff --> + <modify-function signature="drawRects(const QVector<QRect> &)"> <remove/> </modify-function> <modify-function signature="drawRects(const QVector<QRectF> &)"> - <rename to="drawRectsF"/> + <remove/> </modify-function> <modify-function signature="drawLines(const QVector<QLine> &)">
--- a/qt/core/QVariant.d Wed May 13 19:45:58 2009 +0000 +++ b/qt/core/QVariant.d Wed May 13 23:40:31 2009 +0000 @@ -179,13 +179,13 @@ public this(QRect rect) { - void* __qt_return_value = qtd_QVariant_QVariant_QRect(rect is null ? null : rect.nativeId); + void* __qt_return_value = qtd_QVariant_QVariant_QRect(&rect); super(__qt_return_value); } public this(QRectF rect) { - void* __qt_return_value = qtd_QVariant_QVariant_QRectF(rect is null ? null : rect.nativeId); + void* __qt_return_value = qtd_QVariant_QVariant_QRectF(&rect); super(__qt_return_value); } @@ -375,13 +375,11 @@ } public final QRect toRect() { - void* __qt_return_value = qtd_QVariant_toRect(nativeId); - return new QRect(__qt_return_value, false); + return qtd_QVariant_toRect(nativeId); } public final QRectF toRectF() { - void* __qt_return_value = qtd_QVariant_toRectF(nativeId); - return new QRectF(__qt_return_value, false); + return qtd_QVariant_toRectF(nativeId); } public final QRegExp toRegExp() { @@ -517,8 +515,8 @@ bool* ok0); private extern(C) QPoint qtd_QVariant_toPoint(void* __this_nativeId); private extern(C) QPointF qtd_QVariant_toPointF(void* __this_nativeId); -private extern(C) void* qtd_QVariant_toRect(void* __this_nativeId); -private extern(C) void* qtd_QVariant_toRectF(void* __this_nativeId); +private extern(C) QRect qtd_QVariant_toRect(void* __this_nativeId); +private extern(C) QRectF qtd_QVariant_toRectF(void* __this_nativeId); private extern(C) void* qtd_QVariant_toRegExp(void* __this_nativeId); private extern(C) QSize qtd_QVariant_toSize(void* __this_nativeId); private extern(C) QSizeF qtd_QVariant_toSizeF(void* __this_nativeId);