Mercurial > projects > qtd
changeset 342:c887282e1590 qtd.0.5
removed enum experiment leftover
author | maxter <spambox@d-coding.com> |
---|---|
date | Thu, 13 May 2010 17:11:04 +0300 |
parents | 4920ef9206fe |
children | 552647ec0f82 |
files | generator/dgenerator.cpp generator/typesystem_gui.xml |
diffstat | 2 files changed, 20 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/generator/dgenerator.cpp Thu May 13 16:39:41 2010 +0300 +++ b/generator/dgenerator.cpp Thu May 13 17:11:04 2010 +0300 @@ -288,10 +288,6 @@ void DGenerator::writeEnumAliases(QTextStream &s, const AbstractMetaEnum *d_enum) { - FlagsTypeEntry *flags = d_enum->typeEntry()->flags(); - if (flags) - s << INDENT << "alias " << d_enum->name() << " " << flags->targetLangName() << ";" << endl << endl; - const AbstractMetaEnumValueList &values = d_enum->values(); for (int i=0; i<values.size(); ++i) { AbstractMetaEnumValue *enum_value = values.at(i); @@ -487,7 +483,7 @@ } static QString function_call_for_ownership(TypeSystem::Ownership owner) -{ +{ if (owner == TypeSystem::CppOwnership) { return "__setFlags(QtdObjectFlags.nativeOwnership, true)"; } else /* qtd 2 if (owner == TypeSystem::TargetLangOwnership) */ { @@ -2212,7 +2208,7 @@ { AbstractMetaFunctionList signal_funcs = signalFunctions(d_class, false); writeSignalSignatures(s, d_class, signal_funcs); - + foreach (AbstractMetaFunction *signal, signal_funcs) { writeSignal(s, signal); @@ -2401,17 +2397,17 @@ */ s << "}" << endl; // end of class scope - /* ---------------- injected free code ----------------*/ - const ComplexTypeEntry *class_type = d_class->typeEntry(); - Q_ASSERT(class_type); - - CodeSnipList code_snips = class_type->codeSnips(); - foreach (const CodeSnip &snip, code_snips) { - if (!d_class->isInterface() && snip.language == TypeSystem::TargetLangFreeCode) { - s << endl; - snip.formattedCode(s, INDENT); - } - } + /* ---------------- injected free code ----------------*/ + const ComplexTypeEntry *class_type = d_class->typeEntry(); + Q_ASSERT(class_type); + + CodeSnipList code_snips = class_type->codeSnips(); + foreach (const CodeSnip &snip, code_snips) { + if (!d_class->isInterface() && snip.language == TypeSystem::TargetLangFreeCode) { + s << endl; + snip.formattedCode(s, INDENT); + } + } /* --------------------------------------------------- */ interfaces = d_class->interfaces(); @@ -2434,7 +2430,7 @@ QString hasShellFlag = d_class->generateShellClass() ? " | QtdObjectFlags.hasShell" : ""; s << INDENT << "public this(void* native_id, QtdObjectFlags flags = QtdObjectFlags.nativeOwnership) {" << endl << INDENT << " super(native_id, flags);" << endl << endl; - + s << INDENT << "}" << endl << endl; uint exclude_attributes = AbstractMetaAttributes::Native | AbstractMetaAttributes::Abstract; @@ -2902,14 +2898,14 @@ s << INDENT << "int signalSignature(int signalId, ref stringz signature) {" << endl; { Indentation indent(INDENT); - + if (d_class->name() != "QObject") { s << INDENT << "signalId = super.signalSignature(signalId, signature);" << endl << INDENT << "if (signature)" << endl - << INDENT << " return signalId;" << endl; + << INDENT << " return signalId;" << endl; } - + s << INDENT << "if (signalId < __signalSignatures.length)" << endl << INDENT << " signature = __signalSignatures[signalId].ptr;" << endl << INDENT << "else" << endl
--- a/generator/typesystem_gui.xml Thu May 13 16:39:41 2010 +0300 +++ b/generator/typesystem_gui.xml Thu May 13 17:11:04 2010 +0300 @@ -2202,7 +2202,7 @@ <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> <modify-function signature="children()const" remove="all"/> - <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const" remove="all"/> + <modify-function signature="isBlockedByModalPanel(QGraphicsItem**)const" remove="all"/> <!-- <modify-function signature="toGraphicsObject()const" remove="all"/> --> <!-- <modify-function signature="setMatrix(QMatrix, bool)" remove="all"/> @@ -5824,8 +5824,9 @@ <modify-function signature="critical(QWidget*,QString,QString,int,int,int)" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="critical(QWidget*,QString,QString,QString,QString,QString,int,int)" remove="all"/> <!--### Obsolete in 4.3--> - <modify-function signature="information(QWidget*,QString,QString,int,int,int)" remove="all"/> <!--### Obsolete in 4.3--> + <!-- <modify-function signature="information(QWidget*,QString,QString,int,int,int)" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="information(QWidget*,QString,QString,QString,QString,QString,int,int)" remove="all"/> <!--### Obsolete in 4.3--> + <modify-function signature="information(QWidget*,const QString &,const QString &,int,int,int)" remove="all"/> <modify-function signature="question(QWidget*, QString, QString, int, int, int)" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="question(QWidget*, QString, QString, QString, QString, QString, int, int)" remove="all"/> <!--### Obsolete in 4.3--> <modify-function signature="warning(QWidget*, QString, QString, int, int, int)" remove="all"/> <!--### Obsolete in 4.3-->