comparison generator/typesystem_core-java.java @ 336:b0a7819153bb

fixed signal branch merge problems
author maxter@maxter
date Thu, 11 Feb 2010 12:59:25 +0200
parents 24ebea513d66
children 5896535a03cd
comparison
equal deleted inserted replaced
335:1e9092e20a67 336:b0a7819153bb
153 153
154 find(children); 154 find(children);
155 return result; 155 return result;
156 } 156 }
157 157
158 static void connect(QObject sender, string signal, QObject receiver, string method, int type = 0) 158 static void connect(QObject sender, string signal, QObject receiver, string method)
159 { 159 {
160 QMetaObject.connectImpl(sender, signal, receiver, method, type); 160 QMetaObject.connectImpl(sender, signal, receiver, method);
161 } 161 }
162 }// class 162 }// class
163 163
164 abstract class QAbstractItemModel___ extends QAbstractItemModel { 164 abstract class QAbstractItemModel___ extends QAbstractItemModel {
165 /* private native boolean setData_native(long id, int row, int col, Object value, int role); 165 /* private native boolean setData_native(long id, int row, int col, Object value, int role);