Mercurial > projects > qtd

diff generator/cppheadergenerator.cpp @ 254:34a37904ff77

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(none)
author maxter
date Sun, 30 Aug 2009 10:59:56 +0000
parents 37eed70de029
children 17b5e13364b7 f9559a957be9
line wrap: on
line diff
--- a/generator/cppheadergenerator.cpp	Sun Aug 30 09:59:12 2009 +0000
+++ b/generator/cppheadergenerator.cpp	Sun Aug 30 10:59:56 2009 +0000
@@ -178,13 +178,15 @@
 
     s << "class " << shellClassName(java_class)
       << " : public " << java_class->qualifiedCppName();
-    if (java_class->hasVirtualFunctions())
-        s << ", public Qtd_QObjectEntity";
+    if (java_class->isQObject())
+        s << ", public QtD_QObjectEntity";
+    else if(java_class->hasVirtualFunctions())
+        s << ", public QtD_Entity";
     s << endl  << "{" << endl;
 
     if (java_class->isQObject()) {
       s << "public:" << endl
-        << "  Q_OBJECT_CHECK" << endl;
+        << "  Q_OBJECT_CHECK" << endl
 //        << "  mutable const QMetaObject *m_meta_object;" << endl;
 
 /*      if (java_class->hasVirtualSlots()) {
@@ -193,9 +195,9 @@
 */
 //      s << "  const QMetaObject *metaObject() const;" << endl
 //        << "  void *qt_metacast(const char *);" << endl
-//        << "  QT_TR_FUNCTIONS" << endl
-//        << "  virtual int qt_metacall(QMetaObject::Call, int, void **);" << endl
-      s << "private:" << endl;
+//        << "  QT_TR_FUNCTIONS" << end
+      << "  virtual int qt_metacall(QMetaObject::Call, int, void **);" << endl
+      << "private:" << endl;
     }