summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Lima <hugo.lima@openbossa.org>2009-09-09 15:01:00 -0300
committerHugo Lima <hugo.lima@openbossa.org>2009-09-10 10:36:12 -0300
commit705549f07ee4366ef20f4918e376edd510cb3495 (patch)
tree659bf988f17478401821d0e9d9a2ccb1fcc5f6a6
parent1e4c0e20901bab30da774569abb7f8b40101d4c8 (diff)
downloadshiboken-705549f07ee4366ef20f4918e376edd510cb3495.tar.gz
shiboken-705549f07ee4366ef20f4918e376edd510cb3495.tar.xz
shiboken-705549f07ee4366ef20f4918e376edd510cb3495.zip
Do not create implicity conversions for ctors removed by typesystem.
-rw-r--r--headergenerator.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/headergenerator.cpp b/headergenerator.cpp
index e6f1a00b..35d021c8 100644
--- a/headergenerator.cpp
+++ b/headergenerator.cpp
@@ -249,6 +249,9 @@ void HeaderGenerator::writeTypeConverterImpl(QTextStream& s, const TypeEntry* ty
}
bool firstImplicitIf = true;
foreach (const AbstractMetaFunction* ctor, implicitConverters) {
+ if (ctor->isModifiedRemoved())
+ continue;
+
const AbstractMetaType* argType = ctor->arguments().first()->type();
s << INDENT;
if (firstImplicitIf)
@@ -299,8 +302,8 @@ void HeaderGenerator::finishGeneration()
s_pts << endl << "// Global enums" << endl;
foreach (const AbstractMetaEnum* cppEnum, globalEnums()) {
QString incFile = cppEnum->includeFile().split(QDir::separator()).takeLast();
- if (!incFile.isEmpty() && !classIncludes.contains(QString("<%1>").arg(incFile)))
- enumIncludes << incFile;
+ if (!incFile.isEmpty())
+ enumIncludes << cppEnum->includeFile();
writeTypeCheckMacro(s_pts, cppEnum->typeEntry());
s_pts << endl;
writeTypeConverterDecl(convDecl, cppEnum->typeEntry());