Mercurial > projects > qtd
comparison 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 |
comparison
equal
deleted
inserted
replaced
308:2485419c5c63 | 309:8a0cf14e3419 |
---|---|
1903 { | 1903 { |
1904 QString minimalSignature; | 1904 QString minimalSignature; |
1905 if (isConstant()) | 1905 if (isConstant()) |
1906 minimalSignature += "const "; | 1906 minimalSignature += "const "; |
1907 minimalSignature += typeEntry()->qualifiedCppName(); | 1907 minimalSignature += typeEntry()->qualifiedCppName(); |
1908 if (hasInstantiations()) { | 1908 if (hasInstantiations() && |
1909 (static_cast<const ContainerTypeEntry *>(typeEntry()))->type() != ContainerTypeEntry::StringListContainer) | |
1910 { | |
1909 QList<AbstractMetaType *> instantiations = this->instantiations(); | 1911 QList<AbstractMetaType *> instantiations = this->instantiations(); |
1910 minimalSignature += "<"; | 1912 minimalSignature += "<"; |
1911 for (int i=0;i<instantiations.size();++i) { | 1913 for (int i=0;i<instantiations.size();++i) |
1914 { | |
1912 if (i > 0) | 1915 if (i > 0) |
1913 minimalSignature += ","; | 1916 minimalSignature += ","; |
1914 minimalSignature += instantiations.at(i)->minimalSignature(); | 1917 minimalSignature += instantiations.at(i)->minimalSignature(); |
1915 } | 1918 } |
1916 minimalSignature += ">"; | 1919 minimalSignature += ">"; |