# HG changeset patch
# User eldar
# Date 1247439656 0
# Node ID 1d272f0bfefa84541da1e89de66dad7307f13745
# Parent  a212c97edcd22836d6175205219c6541c400fd7e
more D2 fixed

diff -r a212c97edcd2 -r 1d272f0bfefa build/core.makefile
--- a/build/core.makefile	Sun Jul 12 21:03:57 2009 +0000
+++ b/build/core.makefile	Sun Jul 12 23:00:56 2009 +0000
@@ -29,7 +29,10 @@
 core_link_d += 
 
 ## Module specific cpp files.
-core_cpp_files += cpp/qt_qtd/qtd_core.cpp cpp/qt_qtd/ArrayOpsPrimitive_shell.cpp
+core_cpp_files += cpp/qt_qtd/qtd_core.cpp cpp/qt_qtd/ArrayOpsPrimitive_shell.cpp \
+cpp/qt_core/QPoint_shell.cpp cpp/qt_core/QPointF_shell.cpp cpp/qt_core/QRect_shell.cpp cpp/qt_core/QRectF_shell.cpp \
+cpp/qt_core/QSize_shell.cpp cpp/qt_core/QSizeF_shell.cpp cpp/qt_core/QLine_shell.cpp cpp/qt_core/QLineF_shell.cpp \
+cpp/qt_core/QModelIndex_shell.cpp cpp/qt_core/QVariant_shell.cpp
 
 ## Module specific d files.
 core_d_files += $(QTD_CORE:%=qt/%.d) qt/core/ArrayOps2
diff -r a212c97edcd2 -r 1d272f0bfefa demos/interview/build
--- a/demos/interview/build	Sun Jul 12 21:03:57 2009 +0000
+++ b/demos/interview/build	Sun Jul 12 23:00:56 2009 +0000
@@ -1,4 +1,4 @@
 #! /bin/bash
 
 drcc -name interview interview.qrc -o qrc_interview.d
-dmd main.d model.d qrc_interview.d -L-L../../lib -L-lqtdgui -L-lqtdcore -I../../ -I../../qt/d1 -L-lQtGui -L-lQtCore
+dmd main.d model_d2.d qrc_interview.d -L-L../../lib -L-lqtdgui -L-lqtdcore -I../../ -I../../qt/d2 -L-lQtGui -L-lQtCore
diff -r a212c97edcd2 -r 1d272f0bfefa examples/widgets/analogclock/AnalogClock.d
--- a/examples/widgets/analogclock/AnalogClock.d	Sun Jul 12 21:03:57 2009 +0000
+++ b/examples/widgets/analogclock/AnalogClock.d	Sun Jul 12 23:00:56 2009 +0000
@@ -47,7 +47,6 @@
 import qt.gui.QPaintEvent;
 import qt.gui.QPainter;
 
-import tango.io.Stdout;
 
 class AnalogClock : public QWidget
 {
@@ -64,12 +63,12 @@
 
     void paintEvent(QPaintEvent event)
     {
-        static const QPoint[3] hourHand = [
+        const QPoint[3] hourHand = [
             QPoint(7, 8),
             QPoint(-7, 8),
             QPoint(0, -40)
         ];
-        static const QPoint[3] minuteHand = [
+        const QPoint[3] minuteHand = [
             QPoint(7, 8),
             QPoint(-7, 8),
             QPoint(0, -70)
diff -r a212c97edcd2 -r 1d272f0bfefa examples/widgets/analogclock/build.sh
--- a/examples/widgets/analogclock/build.sh	Sun Jul 12 21:03:57 2009 +0000
+++ b/examples/widgets/analogclock/build.sh	Sun Jul 12 23:00:56 2009 +0000
@@ -1,3 +1,3 @@
 #! /bin/bash
 
-dmd main.d AnalogClock.d -I../../../ -I../../../qt/d1 -L-L../../../lib -L-lqtdgui -L-lqtdcore -L-lQtCore -L-lQtGui -ofanalogclock
+dmd main.d AnalogClock.d -I../../../ -I../../../qt/d2 -L-L../../../lib -L-lqtdgui -L-lqtdcore -L-lQtCore -L-lQtGui -ofanalogclock
diff -r a212c97edcd2 -r 1d272f0bfefa examples/widgets/analogclock/main.d
--- a/examples/widgets/analogclock/main.d	Sun Jul 12 21:03:57 2009 +0000
+++ b/examples/widgets/analogclock/main.d	Sun Jul 12 23:00:56 2009 +0000
@@ -41,7 +41,7 @@
 import AnalogClock;
 
 
-int main(char[][] args)
+int main(string[] args)
 {
     scope app = new QApplication(args);
     scope clock = new AnalogClock;
diff -r a212c97edcd2 -r 1d272f0bfefa generator/typesystem_gui-java.java
--- a/generator/typesystem_gui-java.java	Sun Jul 12 21:03:57 2009 +0000
+++ b/generator/typesystem_gui-java.java	Sun Jul 12 23:00:56 2009 +0000
@@ -1012,51 +1012,51 @@
         setBrush(new QBrush(pm));
     }
     
-    public final void drawConvexPolygon(QPoint[] points) {
+    public final void drawConvexPolygon(in QPoint[] points) {
         qtd_QPainter_drawConvexPolygon_nativepointerQPoint_int(nativeId, points.ptr, points.length);
     }
     
-    public final void drawConvexPolygon(QPointF[] points) {
+    public final void drawConvexPolygon(in QPointF[] points) {
         qtd_QPainter_drawConvexPolygon_nativepointerQPointF_int(nativeId, points.ptr, points.length);
     }
     
-    public final void drawLines(QLine[] lines) {
+    public final void drawLines(in QLine[] lines) {
         qtd_QPainter_drawLines_nativepointerQLine_int(nativeId, lines.ptr, lines.length);
     }
 
-    public final void drawLines(QLineF[] lines) {
+    public final void drawLines(in QLineF[] lines) {
         qtd_QPainter_drawLines_nativepointerQLineF_int(nativeId, lines.ptr, lines.length);
     }
     
-    public final void drawPolygon(QPoint[] points, Qt_FillRule fillRule = Qt_FillRule.OddEvenFill) {
+    public final void drawPolygon(in QPoint[] points, Qt_FillRule fillRule = Qt_FillRule.OddEvenFill) {
         qtd_QPainter_drawPolygon_nativepointerQPoint_int_FillRule(nativeId, points.ptr, points.length, fillRule);
     }
 
-    public final void drawPolygon(QPointF[] points, Qt_FillRule fillRule = Qt_FillRule.OddEvenFill) {
+    public final void drawPolygon(in QPointF[] points, Qt_FillRule fillRule = Qt_FillRule.OddEvenFill) {
         qtd_QPainter_drawPolygon_nativepointerQPointF_int_FillRule(nativeId, points.ptr, points.length, fillRule);
     }
 
-    public final void drawPolyline(QPoint[] points) {
+    public final void drawPolyline(in QPoint[] points) {
         qtd_QPainter_drawPolyline_nativepointerQPoint_int(nativeId, points.ptr, points.length);
     }
 
-    public final void drawPolyline(QPointF[] points) {
+    public final void drawPolyline(in QPointF[] points) {
         qtd_QPainter_drawPolyline_nativepointerQPointF_int(nativeId, points.ptr, points.length);
     }
     
-    public final void drawPoints(QPoint[] points) {
+    public final void drawPoints(in QPoint[] points) {
         qtd_QPainter_drawPoints_nativepointerQPoint_int(nativeId, points.ptr, points.length);
     }
 
-    public final void drawPoints(QPointF[] points) {
+    public final void drawPoints(in QPointF[] points) {
         qtd_QPainter_drawPoints_nativepointerQPointF_int(nativeId, points.ptr, points.length);
     }
     
-    public final void drawRects(QRect[] rects) {
+    public final void drawRects(in QRect[] rects) {
         qtd_QPainter_drawRects_nativepointerQRect_int(nativeId, rects.ptr, rects.length);
     }
 
-    public final void drawRects(QRectF[] rects) {
+    public final void drawRects(in QRectF[] rects) {
         qtd_QPainter_drawRects_nativepointerQRectF_int(nativeId, rects.ptr, rects.length);
     }
 /*