Mercurial > projects > qtd
diff generator/abstractmetalang.cpp @ 309:8a0cf14e3419 signals
wrong merge
author | eldar_ins@eldar-laptop |
---|---|
date | Wed, 23 Dec 2009 04:48:11 +0500 |
parents | 2485419c5c63 |
children | 0cc996b7a601 |
line wrap: on
line diff
--- a/generator/abstractmetalang.cpp Wed Dec 23 04:45:55 2009 +0500 +++ b/generator/abstractmetalang.cpp Wed Dec 23 04:48:11 2009 +0500 @@ -1905,10 +1905,13 @@ if (isConstant()) minimalSignature += "const "; minimalSignature += typeEntry()->qualifiedCppName(); - if (hasInstantiations()) { + if (hasInstantiations() && + (static_cast<const ContainerTypeEntry *>(typeEntry()))->type() != ContainerTypeEntry::StringListContainer) + { QList<AbstractMetaType *> instantiations = this->instantiations(); minimalSignature += "<"; - for (int i=0;i<instantiations.size();++i) { + for (int i=0;i<instantiations.size();++i) + { if (i > 0) minimalSignature += ","; minimalSignature += instantiations.at(i)->minimalSignature();