Mercurial > projects > qtd

comparison generator/dgenerator.cpp @ 187:34fe79a9915b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix forward references caused by unneeded import of ArrayOps2
author eldar
date Sat, 11 Jul 2009 11:17:44 +0000
parents 4fcf7ba2a791
children 7dd099050621
comparison
equal deleted inserted replaced
186:d5af7c48b733 187:34fe79a9915b
1898 if (d_class->name() == "QCoreApplication") 1898 if (d_class->name() == "QCoreApplication")
1899 s << "private import qt.core.ArrayOps;" << endl; 1899 s << "private import qt.core.ArrayOps;" << endl;
1900 else if (d_class->name() == "QApplication") 1900 else if (d_class->name() == "QApplication")
1901 s << "private import qt.gui.ArrayOps;" << endl; 1901 s << "private import qt.gui.ArrayOps;" << endl;
1902 1902
1903 s << "private import " << d_class->package() << ".ArrayOps2;" << endl; 1903 /*
1904 we don't need to import ArrayOps2 for anything else than QObjects,
1905 for example if it is done in the namespaces, it may cause circular
1906 imports forward references and shit. If ArrayOps2 is expanded later
1907 for other usages - then restrict it just for namespaces/interfaces
1908 */
1909 if(d_class->isQObject())
1910 s << "private import " << d_class->package() << ".ArrayOps2;" << endl;
1904 1911
1905 if (!d_class->enums().isEmpty()) 1912 if (!d_class->enums().isEmpty())
1906 s << "public import " << d_class->package() << "." << d_class->name() << "_enum;" << endl << endl; 1913 s << "public import " << d_class->package() << "." << d_class->name() << "_enum;" << endl << endl;
1907 1914
1908 s << "// automatic imports-------------" << endl; 1915 s << "// automatic imports-------------" << endl;