Mercurial > projects > qtd

diff generator/cppheadergenerator.cpp @ 355:08c1ca7975ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obviated redundant virtual dispatch callbacks
author Max Samukha <maxter@spambox.com>
date Tue, 25 May 2010 17:23:11 +0300
parents 98b211f3ee34
children
line wrap: on
line diff
--- a/generator/cppheadergenerator.cpp	Mon May 24 23:43:30 2010 +0300
+++ b/generator/cppheadergenerator.cpp	Tue May 25 17:23:11 2010 +0300
@@ -126,7 +126,7 @@
       << "#define " << include_block << endl << endl
 //      << "#include <qtjambi_core.h>" << endl
       << "#include <QtCore/QHash>" << endl
-      << "#include <QObjectEntity.h>" << endl;
+      << "#include <qtd_core.h>" << endl;
 
     Include inc = java_class->typeEntry()->include();
     s << "#include ";
@@ -178,10 +178,11 @@
 
     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->isQObject()) {
+        s << ", public QObjectLink";
+    }
+    else if (java_class->isPolymorphic())
+        s << ", public QtdObjectLink";
     s << endl  << "{" << endl;
 
     if (java_class->isQObject()) {