Mercurial > projects > qtd

annotate d2/qt/core/QMetaObject.d @ 366:da4235301224

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed VoidFunc. Updated to dmd.2.047.
author Max Samukha <maxter@spambox.com>
date Wed, 23 Jun 2010 21:34:43 +0300
parents 958e8b9a89bd
children f69341b40588
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
1 module qt.core.QMetaObject;
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
2
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
3 import
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
4 qt.QGlobal,
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
5 qt.core.QObject,
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
6 qtd.QtdObject,
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
7 qtd.meta.Runtime,
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
8 qtd.meta.Compiletime,
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
9 qtd.Marshal,
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
10 qtd.MOC,
366
da4235301224 Fixed VoidFunc. Updated to dmd.2.047.
Max Samukha <maxter@spambox.com>
parents: 365
diff changeset
11 qtd.String,
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
12 std.typetuple,
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
13 std.c.stdlib;
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
14
366
da4235301224 Fixed VoidFunc. Updated to dmd.2.047.
Max Samukha <maxter@spambox.com>
parents: 365
diff changeset
15 import std.string : indexOf;
da4235301224 Fixed VoidFunc. Updated to dmd.2.047.
Max Samukha <maxter@spambox.com>
parents: 365
diff changeset
16
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
17 class QMetaArgument : Meta
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
18 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
19 }
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
20
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
21 class QMetaMethod : Meta
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
22 {
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
23 alias typeof(this) This;
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
24
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
25 // QMetaArgument[] arguments;
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
26 string signature;
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
27 int indexOfMethod;
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
28
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
29 this(string signature_, int indexOfMethod_)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
30 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
31 signature = signature_;
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
32 indexOfMethod = indexOfMethod_;
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
33 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
34
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
35 string args() const
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
36 {
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
37 int openBracket = indexOf(signature, '(');
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
38 if(signature.length - openBracket - 2 > 0)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
39 return signature[openBracket + 1 .. $-1];
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
40 else
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
41 return "";
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
42 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
43
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
44 string name() const
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
45 {
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
46 int openBracket = indexOf(signature, '(');
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
47 return signature[0..openBracket];
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
48 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
49
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
50 // mixin(Derived) or typeof(Derived) would help a lot here
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
51 static create(alias method, M : This)(uint index)
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
52 {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
53 alias ParameterTypeTuple!method Args;
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
54 return new M(.signature!(Args)(methodName!(method)), index);
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
55 }
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
56 }
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
57
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
58 class QMetaSignal : QMetaMethod
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
59 {
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
60 alias typeof(this) This;
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
61
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
62 this(string signature_, int indexOfMethod_)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
63 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
64 super(signature_, indexOfMethod_);
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
65 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
66
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
67 static This create(alias method)(uint index)
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
68 {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
69 return typeof(super).create!(method, This)(index);
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
70 }
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
71 }
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
72
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
73 class QMetaSlot : QMetaMethod
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
74 {
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
75 alias typeof(this) This;
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
76
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
77 this(string signature_, int indexOfMethod_)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
78 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
79 super(signature_, indexOfMethod_);
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
80 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
81
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
82 static This create(alias method)(uint index)
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
83 {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
84 return typeof(super).create!(method, This)(index);
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
85 }
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
86 }
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
87
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
88 class MetaObject : MetaType
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
89 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
90 MetaObject _base;
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
91 }
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
92
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
93 struct QMetaObjectNative
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
94 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
95 QMetaObjectNative *superdata;
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
96 immutable(char) *stringdata;
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
97 const(uint) *data;
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
98 void *extradata;
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
99 }
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
100
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
101 class QMetaException : Exception { this(string msg) { super(msg); } }
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
102
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
103 final class QMetaObject
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
104 {
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
105 alias typeof(this) This;
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
106
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
107 private this() {}
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
108
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
109 enum Call
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
110 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
111 InvokeMetaMethod,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
112 ReadProperty,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
113 WriteProperty,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
114 ResetProperty,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
115 QueryPropertyDesignable,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
116 QueryPropertyScriptable,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
117 QueryPropertyStored,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
118 QueryPropertyEditable,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
119 QueryPropertyUser,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
120 CreateInstance
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
121 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
122
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
123 private
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
124 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
125 QMetaObjectNative* _nativeId;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
126 QMetaObject _base; // super class
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
127 QMetaObject _firstDerived; // head of the linked list of derived classes
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
128 QMetaObject _next; // next sibling on this derivation level
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
129 QMetaMethod[] _methods;
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
130 ClassInfo _classInfo;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
131
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
132 QObject function(void* nativeId) _createWrapper;
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
133 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
134
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
135 private void addDerived(QMetaObject mo)
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
136 {
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
137 mo._next = _firstDerived;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
138 _firstDerived = mo;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
139 }
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
140
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
141 // ctor
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
142 void construct(T : QObject)(void* nativeId)
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
143 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
144 alias BaseClassesTuple!(T)[0] Base;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
145 This base;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
146 static if (is(Base : QObject))
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
147 base = Base.staticMetaObject;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
148
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
149 _nativeId = cast(QMetaObjectNative*)nativeId;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
150 T.setStaticMetaObject(this);
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
151
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
152 if (base)
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
153 {
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
154 base.addDerived(this);
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
155 _base = base;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
156 }
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
157 _classInfo = T.classinfo;
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
158
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
159
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
160 static if (isQtType!T)
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
161 {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
162 static if (is(T.ConcreteType))
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
163 alias T.ConcreteType Concrete;
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
164 else
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
165 alias T Concrete;
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
166
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
167 _createWrapper = function QObject(void* nativeId) {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
168 auto obj = new Concrete(nativeId, cast(QtdObjectFlags)(QtdObjectFlags.nativeOwnership | QtdObjectFlags.dynamicEntity));
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
169 T.__createEntity(nativeId, cast(void*)obj);
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
170 return obj;
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
171 };
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
172
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
173 T._populateMetaInfo;
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
174 }
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
175 // create run time meta-objects for user-defined signals and slots
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
176 else static if (is(typeof(T.methods)))
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
177 {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
178 int index = Base.staticMetaObject().methodCount();
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
179
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
180 static if (T.signals.length)
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
181 {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
182 foreach (signal; T.signals)
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
183 {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
184 addMethod(QMetaSignal.create!signal(index));
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
185 index++;
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
186 }
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
187 }
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
188
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
189 static if (T.slots.length)
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
190 {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
191 foreach (slot; T.slots)
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
192 {
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
193 addMethod(QMetaSlot.create!slot(index));
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
194 index++;
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
195 }
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
196 }
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
197 }
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
198 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
199
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
200 // new
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
201 static This create(T : QObject)(void* nativeId)
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
202 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
203 auto m = new This();
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
204 m.construct!T(nativeId);
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
205 return m;
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
206 }
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
207
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
208 /++
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
209 +/
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
210 QMetaObject base()
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
211 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
212 return _base;
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
213 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
214
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
215 /++
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
216 +/
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
217 QMetaObjectNative* nativeId()
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
218 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
219 return _nativeId;
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
220 }
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
221
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
222 /++
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
223 +/
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
224 ClassInfo classInfo()
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
225 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
226 return _classInfo;
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
227 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
228
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
229 const (QMetaMethod[]) methods()
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
230 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
231 return _methods;
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
232 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
233
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
234 void addMethod(QMetaMethod method_)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
235 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
236 _methods ~= method_;
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
237 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
238
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
239 QMetaMethod lookUpMethod(string slot)
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
240 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
241 foreach (method; _methods)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
242 if (method.signature == slot)
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
243 return method;
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
244 if (_base)
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
245 return _base.lookUpMethod(slot);
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
246 else
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
247 return null;
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
248 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
249
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
250 QMetaSignal lookUpSignal(string signal)
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
251 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
252 foreach (method; _methods)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
253 if (method.signature == signal && cast(QMetaSignal)method)
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
254 return cast(QMetaSignal)method;
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
255 if (_base)
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
256 return _base.lookUpSignal(signal);
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
257 else
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
258 return null;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
259 }
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
260
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
261 QMetaMethod[] lookUpMethodOverloads(string methodName)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
262 {
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
263 typeof(return) result;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
264 foreach (method; _methods)
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
265 if (method.name == methodName)
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
266 result ~= method;
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
267 if (_base)
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
268 result ~= _base.lookUpMethodOverloads(methodName);
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
269 return result;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
270 }
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
271
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
272 QMetaSignal[] lookUpSignalOverloads(string signalName)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
273 {
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
274 typeof(return) result;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
275 foreach (method; _methods)
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
276 if (method.name == signalName && cast(QMetaSignal)method)
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
277 result ~= cast(QMetaSignal)method;
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
278 if (_base)
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
279 result ~= _base.lookUpSignalOverloads(signalName);
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
280 return result;
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
281 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
282
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
283 private QMetaObject lookupDerived(void*[] moIds)
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
284 {
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
285 assert (moIds.length >= 1);
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
286
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
287 for (auto mo = _firstDerived; mo !is null; mo = mo._next)
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
288 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
289 if (mo._nativeId == moIds[0])
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
290 {
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
291 if (moIds.length == 1) // exact match found
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
292 return mo;
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
293 else // look deeper
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
294 return mo.lookupDerived(moIds[1..$]);
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
295 }
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
296 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
297
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
298 // no initialized wrapper that matches the native object.
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
299 // use the base class wrapper
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
300 return this;
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
301 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
302
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
303 QObject getObject(void* nativeObjId)
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
304 {
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
305 QObject result;
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
306
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
307 if (nativeObjId)
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
308 {
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
309 result = cast(QObject)qtd_get_d_qobject(nativeObjId);
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
310 if (!result)
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
311 {
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
312 auto moId = qtd_QObject_metaObject(nativeObjId);
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
313 if (_nativeId == moId)
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
314 result = _createWrapper(nativeObjId);
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
315 else
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
316 {
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
317 // get native metaobjects for the entire derivation lattice
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
318 // up to, but not including, the current metaobject.
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
319 size_t moCount = 1;
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
320
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
321 for (void* tmp = moId;;)
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
322 {
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
323 tmp = qtd_QMetaObject_superClass(tmp);
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
324 assert(tmp);
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
325 if (tmp == _nativeId)
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
326 break;
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
327 moCount++;
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
328 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
329
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
330 void*[] moIds = (cast(void**)alloca(moCount * (void*).sizeof))[0..moCount];
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
331
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
332 moIds[--moCount] = moId;
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
333 while (moCount > 0)
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
334 moIds[--moCount] = moId = qtd_QMetaObject_superClass(moId);
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
335
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
336 result = lookupDerived(moIds)._createWrapper(nativeObjId);
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
337 }
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
338 }
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
339 }
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
340
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
341 return result;
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
342 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
343
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
344 static void activate(QObject sender, QMetaObject m, int local_signal_index, void **argv)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
345 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
346 qtd_QMetaObject_activate_3(sender.__nativeId, m.nativeId, local_signal_index, argv);
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
347 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
348
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
349 static void activate(QObject sender, QMetaObject m, int from_local_signal_index, int to_local_signal_index, void **argv)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
350 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
351 qtd_QMetaObject_activate_4(sender.__nativeId, m.nativeId, from_local_signal_index, to_local_signal_index, argv);
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
352 }
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
353
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
354 static bool connect(const QObject sender, int signal_index,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
355 const QObject receiver, int method_index,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
356 int type = 0, int *types = null)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
357 {
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
358 return qtd_QMetaObject_connect(sender.__nativeId, signal_index, receiver.__nativeId, method_index, type, types);
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
359 }
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
360
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
361 int indexOfMethod_Cpp(string method)
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
362 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
363 return qtd_QMetaObject_indexOfMethod(_nativeId, toStringz(method));
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
364 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
365
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
366 int methodCount()
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
367 {
365
958e8b9a89bd Changeset a084e2df3776 is broken. Backing out.
Max Samukha <maxter@spambox.com>
parents: 364
diff changeset
368 return qtd_QMetaObject_methodCount(_nativeId);
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
369 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
370
337
5896535a03cd moved enums back to classes
maxter <spambox@d-coding.com>
parents: 336
diff changeset
371 static void connectImpl(QObject sender, string signalString, QObject receiver, string methodString, int type)
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
372 {
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
373 QMetaSignal[] signals;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
374 QMetaMethod[] methods;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
375 QMetaSignal signal;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
376 QMetaMethod method;
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
377
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
378 if(indexOf(signalString, '(') > 0)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
379 signal = sender.metaObject.lookUpSignal(signalString);
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
380 else
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
381 signals = sender.metaObject.lookUpSignalOverloads(signalString); // parameters not specified. Looking for a match
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
382
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
383 if(indexOf(methodString, '(') > 0)
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
384 method = receiver.metaObject.lookUpMethod(methodString);
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
385 else
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
386 methods = receiver.metaObject.lookUpMethodOverloads(methodString); // parameters not specified. Looking for a match
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
387
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
388 if(!signal && !method)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
389 {
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
390 Top:
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
391 foreach(sig; signals)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
392 foreach(meth; methods)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
393 if(startsWith(sig.args, meth.args))
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
394 {
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
395 signal = sig;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
396 method = meth;
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
397 break Top;
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
398 }
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
399 }
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
400 else if (!signal)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
401 {
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
402 foreach(sig; signals)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
403 if(startsWith(sig.args, method.args))
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
404 {
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
405 signal = sig;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
406 break;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
407 }
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
408 }
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
409 else if (!method)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
410 {
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
411 foreach(meth; methods)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
412 if(startsWith(signal.args, meth.args))
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
413 {
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
414 method = meth;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
415 break;
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
416 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
417 }
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
418
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
419 bool success = false;
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
420
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
421 if(!signal && !method)
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
422 {
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
423 success = false;
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
424 }
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
425 else
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
426 {
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
427 int signalIndex = signal.indexOfMethod;
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
428 int methodIndex = method.indexOfMethod;
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
429
337
5896535a03cd moved enums back to classes
maxter <spambox@d-coding.com>
parents: 336
diff changeset
430 success = QMetaObject.connect(sender, signalIndex, receiver, methodIndex, type);
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
431 }
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
432
323
7a3c43424dca make all examples compile with new signals/slots
eldar_ins@eldar-laptop
parents: 322
diff changeset
433 if(!success)
357
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
434 throw new QMetaException("QMetaObject: Signal " ~ signalString ~ " cannot be connected to slot " ~ methodString);
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
435 }
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
436 }
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
437
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
438 /**
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
439 */
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
440 mixin template Q_CLASSINFO(string name, string value)
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
441 {
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
442 mixin InnerAttribute!("Q_CLASSINFO", AttributeOptions.allowMultiple, name, value);
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
443 }
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
444
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
445 version (QtdUnittest)
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
446 {
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
447 unittest
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
448 {
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
449 static class Test : QObject
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
450 {
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
451 mixin Q_CLASSINFO!("author", "Sabrina Schweinsteiger");
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
452 mixin Q_CLASSINFO!("url", "http://doc.moosesoft.co.uk/1.0/");
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
453
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
454 mixin Q_OBJECT;
9784459f0750 An attempt (failed due to optlink) to improve locality of declarations exported from QtD executables
Max Samukha <maxter@spambox.com>
parents: 350
diff changeset
455 }
322
7c2cf27391c4 A slight change of the connect syntax. More sofisticated signals/slots lookup. Some fixes in examples.
eldar_ins@eldar-laptop
parents: 288
diff changeset
456 }
253
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
457 }
073b9153ed8a Rev. 264 done right.
maxter
parents:
diff changeset
458
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
459 extern(C) void qtd_QMetaObject_activate_3(void* sender, void* m, int local_signal_index, void **argv);
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
460 extern(C) void qtd_QMetaObject_activate_4(void *sender, void* m, int from_local_signal_index, int to_local_signal_index, void **argv);
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
461 extern(C) bool qtd_QMetaObject_connect(const void* sender, int signal_index,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
462 const void* receiver, int method_index,
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
463 int type, int *types);
350
31520b2c0b3c Removed dependency on parent trait and stringof
Max Samukha <maxter@spambox.com>
parents: 344
diff changeset
464
288
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
465 extern(C) int qtd_QMetaObject_indexOfMethod(void *nativeId, const(char) *method);
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
466 extern(C) int qtd_QMetaObject_methodCount(void *nativeId);
f9559a957be9 new signals and slots implementation
eldar
parents: 253
diff changeset
467
337
5896535a03cd moved enums back to classes
maxter <spambox@d-coding.com>
parents: 336
diff changeset
468 extern(C) void* qtd_QMetaObject_superClass(void* nativeId);