Mercurial > projects > qtd

diff generator/cppheadergenerator.cpp @ 252:37eed70de029

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More things broken than fixed. Rolling back to 263
author maxter
date Sat, 22 Aug 2009 12:50:58 +0000
parents 7664de4a55e5
children 34a37904ff77
line wrap: on
line diff
--- a/generator/cppheadergenerator.cpp	Thu Aug 20 19:08:32 2009 +0000
+++ b/generator/cppheadergenerator.cpp	Sat Aug 22 12:50:58 2009 +0000
@@ -178,15 +178,13 @@
 
     s << "class " << shellClassName(java_class)
       << " : public " << java_class->qualifiedCppName();
-    if (java_class->isQObject())
-        s << ", public QtD_QObjectEntity";
-    else if(java_class->hasVirtualFunctions())
-        s << ", public QtD_Entity";
+    if (java_class->hasVirtualFunctions())
+        s << ", public Qtd_QObjectEntity";
     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()) {
@@ -195,9 +193,9 @@
 */
 //      s << "  const QMetaObject *metaObject() const;" << endl
 //        << "  void *qt_metacast(const char *);" << endl
-//        << "  QT_TR_FUNCTIONS" << end
-      << "  virtual int qt_metacall(QMetaObject::Call, int, void **);" << endl
-      << "private:" << endl;
+//        << "  QT_TR_FUNCTIONS" << endl
+//        << "  virtual int qt_metacall(QMetaObject::Call, int, void **);" << endl
+      s << "private:" << endl;
     }