changeset 337:5896535a03cd

moved enums back to classes
author maxter <spambox@d-coding.com>
date Sat, 13 Mar 2010 00:38:42 +0200
parents b0a7819153bb
children e65f08f6262b
files examples/layouts/dynamiclayouts/dialog.d generator/dgenerator.cpp generator/typesystem.h generator/typesystem_core-java.java generator/typesystem_gui-java.java qt/core/QList.d qt/core/QMetaObject.d
diffstat 7 files changed, 22 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/examples/layouts/dynamiclayouts/dialog.d	Thu Feb 11 12:59:25 2010 +0200
+++ b/examples/layouts/dynamiclayouts/dialog.d	Sat Mar 13 00:38:42 2010 +0200
@@ -96,7 +96,7 @@
 		buttonBox.setOrientation(orientation);
 		QSize newSizeHint = buttonBox.sizeHint() + QSize(spacing, spacing);
 
-		if (orientation == Qt_Orientation.Horizontal) {
+		if (orientation == Qt.Orientation.Horizontal) {
 			mainLayout.addWidget(buttonBox, 2, 0);
 			resize(size() + QSize(-1 * oldSizeHint.width(), newSizeHint.height()));
 		} else {
--- a/generator/dgenerator.cpp	Thu Feb 11 12:59:25 2010 +0200
+++ b/generator/dgenerator.cpp	Sat Mar 13 00:38:42 2010 +0200
@@ -289,7 +289,7 @@
 void DGenerator::writeEnumAlias(QTextStream &s, const AbstractMetaEnum *d_enum)
 {
     // aliases for enums to be used in easier way like QFont.Bold instead of QFont.Weight.Bold
-    s << QString("    alias %1 %2;").arg(d_enum->typeEntry()->qualifiedTargetLangName()).arg(d_enum->name()) << endl << endl;
+    //s << QString("    alias %1 %2;").arg(d_enum->typeEntry()->qualifiedTargetLangName()).arg(d_enum->name()) << endl << endl;
     const AbstractMetaEnumValueList &values = d_enum->values();
     for (int i=0; i<values.size(); ++i) {
         AbstractMetaEnumValue *enum_value = values.at(i);
@@ -297,7 +297,7 @@
         if (d_enum->typeEntry()->isEnumValueRejected(enum_value->name()))
             continue;
 
-        s << QString("    alias %1.%2 %2;").arg(d_enum->typeEntry()->qualifiedTargetLangName()).arg(enum_value->name()) << endl;
+        s << QString("    alias %1.%2 %2;").arg(d_enum->name()).arg(enum_value->name()) << endl;
     }
     s << endl;
 }
@@ -322,7 +322,7 @@
     }
 */
     // Generates Java 1.5 type enums
-    s << "public enum " << d_enum->enclosingClass()->name() << "_" << d_enum->name() << " {" << endl;
+    s << "public enum " << d_enum->name() << " {" << endl;
     const AbstractMetaEnumValueList &values = d_enum->values();
     EnumTypeEntry *entry = d_enum->typeEntry();
 
@@ -566,7 +566,6 @@
     }
 }
 
-
 void DGenerator::writeJavaCallThroughContents(QTextStream &s, const AbstractMetaFunction *d_function, uint attributes)
 {
     Q_UNUSED(attributes);
@@ -1941,13 +1940,6 @@
         }
     }
 
-    // Enums aliases outside of the class - hack
-    if (!d_class->enums().isEmpty()) {
-        auxFile.isDone = false;
-        foreach (AbstractMetaEnum *d_enum, d_class->enums())
-            writeEnum(auxFile.stream, d_enum);
-    }
-
     // Auxiliary file contents should have been written at this point
     if (!auxFile.isDone)
     {
@@ -2114,6 +2106,12 @@
 
     Indentation indent(INDENT);
 
+    // Enums
+    if (!d_class->enums().isEmpty()) {
+        foreach (AbstractMetaEnum *d_enum, d_class->enums())
+            writeEnum(s, d_enum);
+    }
+
     // Define variables for reference count mechanism
     if (!d_class->isInterface() && !d_class->isNamespace()) {
         QHash<QString, int> variables;
--- a/generator/typesystem.h	Thu Feb 11 12:59:25 2010 +0200
+++ b/generator/typesystem.h	Sat Mar 13 00:38:42 2010 +0200
@@ -657,8 +657,8 @@
     QString targetLangName() const { return m_java_name; }
     QString javaQualifier() const;
     QString qualifiedTargetLangName() const {
-        return javaQualifier() + '_' + targetLangName();
-//        return targetLangName();
+        return javaQualifier() + '.' + targetLangName();
+        //return targetLangName();
     }
 
     QString jniName() const;
--- a/generator/typesystem_core-java.java	Thu Feb 11 12:59:25 2010 +0200
+++ b/generator/typesystem_core-java.java	Sat Mar 13 00:38:42 2010 +0200
@@ -155,9 +155,9 @@
         return result;
     }
     
-    static void connect(QObject sender, string signal, QObject receiver, string method)
+    static void connect(QObject sender, string signal, QObject receiver, string method, int type = 0)
     {
-        QMetaObject.connectImpl(sender, signal, receiver, method);
+        QMetaObject.connectImpl(sender, signal, receiver, method, type);
     }
 }// class
 
--- a/generator/typesystem_gui-java.java	Thu Feb 11 12:59:25 2010 +0200
+++ b/generator/typesystem_gui-java.java	Sat Mar 13 00:38:42 2010 +0200
@@ -1028,11 +1028,11 @@
         qtd_QPainter_drawLines_nativepointerQLineF_int(__nativeId, lines.ptr, lines.length);
     }
     
-    public final void drawPolygon(in 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(in 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);
     }
 
@@ -1703,7 +1703,7 @@
         return getItem_private(_parent, title, label, items, current, editable, &ok, flags);
     }
 
-    public static string getText(QWidget _parent, string title, string label, QLineEdit_EchoMode echo = QLineEdit_EchoMode.Normal, string text = null, ref bool ok = false, int flags = 0) {
+    public static string getText(QWidget _parent, string title, string label, QLineEdit.EchoMode echo = QLineEdit.EchoMode.Normal, string text = null, ref bool ok = false, int flags = 0) {
         string res;
         qtd_QInputDialog_getText_private_QWidget_string_string_EchoMode_string_nativepointerbool_WindowFlags(&res, _parent is null ? null : _parent.__nativeId, title, label, echo, text, &ok, flags);
         return res;
--- a/qt/core/QList.d	Thu Feb 11 12:59:25 2010 +0200
+++ b/qt/core/QList.d	Sat Mar 13 00:38:42 2010 +0200
@@ -91,6 +91,7 @@
 }
 
 struct QListData {
+private:
     struct Data {
         Atomic!int ref_;
         int alloc, begin, end;
@@ -355,7 +356,7 @@
             ref T t()
             {
                 static if(TI.isLarge || TI.isStatic)
-                    return *cast(T*)(v);
+                    return *cast(T*)(this.v);
                 else
                     return *cast(T*)(&this);
             }
--- a/qt/core/QMetaObject.d	Thu Feb 11 12:59:25 2010 +0200
+++ b/qt/core/QMetaObject.d	Sat Mar 13 00:38:42 2010 +0200
@@ -312,7 +312,7 @@
         return qtd_QMetaObject_methodCount(_nativeId);
     }
     
-    static void connectImpl(QObject sender, string signalString, QObject receiver, string methodString)
+    static void connectImpl(QObject sender, string signalString, QObject receiver, string methodString, int type)
     {
         QMetaSignal[] signals;
         QMetaMethod[] methods;
@@ -370,7 +370,7 @@
         {
             int signalIndex = signal.indexOfMethod;
             int methodIndex = method.indexOfMethod;
-            success = QMetaObject.connect(sender, signalIndex, receiver, methodIndex);
+            success = QMetaObject.connect(sender, signalIndex, receiver, methodIndex, type);
         }
         
         if(!success)
@@ -387,4 +387,4 @@
 extern(C) int qtd_QMetaObject_indexOfMethod(void *nativeId, const(char) *method);
 extern(C) int qtd_QMetaObject_methodCount(void *nativeId);
 
-extern(C) void* qtd_QMetaObject_superClass(void* nativeId);
\ No newline at end of file
+extern(C) void* qtd_QMetaObject_superClass(void* nativeId);