changeset 187:34fe79a9915b

fix forward references caused by unneeded import of ArrayOps2
author eldar
date Sat, 11 Jul 2009 11:17:44 +0000
parents d5af7c48b733
children 7dd099050621
files generator/dgenerator.cpp
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/generator/dgenerator.cpp	Sat Jul 04 13:41:21 2009 +0000
+++ b/generator/dgenerator.cpp	Sat Jul 11 11:17:44 2009 +0000
@@ -1900,7 +1900,14 @@
         else if (d_class->name() == "QApplication")
             s << "private import qt.gui.ArrayOps;" << endl;
 
-        s << "private import " << d_class->package() << ".ArrayOps2;" << endl;
+        /*
+           we don't need to import ArrayOps2 for anything else than QObjects,
+           for example if it is done in the namespaces, it may cause circular
+           imports forward references and shit. If ArrayOps2 is expanded later
+           for other usages - then restrict it just for namespaces/interfaces
+        */
+        if(d_class->isQObject())
+            s << "private import " << d_class->package() << ".ArrayOps2;" << endl;
 
         if (!d_class->enums().isEmpty())
             s << "public import " << d_class->package() << "." << d_class->name() << "_enum;" << endl << endl;