Changeset 342:c887282e1590

Show
Ignore:
Timestamp:
05/13/10 10:11:04 (2 years ago)
Author:
maxter <spambox@d-coding.com>
Tags:

qtd.0.5

branch:
default
Message:

removed enum experiment leftover

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • generator/dgenerator.cpp

    r341 r342  
    289289void DGenerator::writeEnumAliases(QTextStream &s, const AbstractMetaEnum *d_enum) 
    290290{ 
    291     FlagsTypeEntry *flags = d_enum->typeEntry()->flags(); 
    292     if (flags) 
    293         s << INDENT << "alias " << d_enum->name() << " " << flags->targetLangName() << ";" << endl << endl; 
    294  
    295291    const AbstractMetaEnumValueList &values = d_enum->values(); 
    296292    for (int i=0; i<values.size(); ++i) { 
    …… 
    488484 
    489485static QString function_call_for_ownership(TypeSystem::Ownership owner) 
    490 {   
     486{ 
    491487    if (owner == TypeSystem::CppOwnership) { 
    492488        return "__setFlags(QtdObjectFlags.nativeOwnership, true)"; 
    …… 
    22132209        AbstractMetaFunctionList signal_funcs = signalFunctions(d_class, false); 
    22142210        writeSignalSignatures(s, d_class, signal_funcs); 
    2215     
     2211 
    22162212        foreach (AbstractMetaFunction *signal, signal_funcs) 
    22172213        { 
    …… 
    24022398    s << "}" << endl; // end of class scope 
    24032399 
    2404     /* ---------------- injected free code ----------------*/  
    2405     const ComplexTypeEntry *class_type = d_class->typeEntry();  
    2406     Q_ASSERT(class_type);  
    2407  
    2408     CodeSnipList code_snips = class_type->codeSnips();  
    2409     foreach (const CodeSnip &snip, code_snips) {  
    2410         if (!d_class->isInterface() && snip.language == TypeSystem::TargetLangFreeCode) {  
    2411             s << endl;  
    2412             snip.formattedCode(s, INDENT);  
    2413         }  
    2414     }  
     2400    /* ---------------- injected free code ----------------*/ 
     2401    const ComplexTypeEntry *class_type = d_class->typeEntry(); 
     2402    Q_ASSERT(class_type); 
     2403 
     2404    CodeSnipList code_snips = class_type->codeSnips(); 
     2405    foreach (const CodeSnip &snip, code_snips) { 
     2406        if (!d_class->isInterface() && snip.language == TypeSystem::TargetLangFreeCode) { 
     2407            s << endl; 
     2408            snip.formattedCode(s, INDENT); 
     2409        } 
     2410    } 
    24152411    /* --------------------------------------------------- */ 
    24162412 
    …… 
    24352431            s << INDENT << "public this(void* native_id, QtdObjectFlags flags = QtdObjectFlags.nativeOwnership) {" << endl 
    24362432              << INDENT << "    super(native_id, flags);" << endl << endl; 
    2437              
     2433 
    24382434            s << INDENT << "}" << endl << endl; 
    24392435 
    …… 
    29032899    { 
    29042900        Indentation indent(INDENT); 
    2905          
     2901 
    29062902        if (d_class->name() != "QObject") 
    29072903        { 
    29082904            s << INDENT << "signalId = super.signalSignature(signalId, signature);" << endl 
    29092905              << INDENT << "if (signature)" << endl 
    2910               << INDENT << "    return signalId;" << endl;             
    2911         } 
    2912          
     2906              << INDENT << "    return signalId;" << endl; 
     2907        } 
     2908 
    29132909        s << INDENT << "if (signalId < __signalSignatures.length)" << endl 
    29142910          << INDENT << "    signature = __signalSignatures[signalId].ptr;" << endl 

  • generator/typesystem_gui.xml

    r326 r342  
    58255825      <modify-function signature="critical(QWidget*,QString,QString,int,int,int)" remove="all"/> <!--### Obsolete in 4.3--> 
    58265826      <modify-function signature="critical(QWidget*,QString,QString,QString,QString,QString,int,int)" remove="all"/> <!--### Obsolete in 4.3--> 
    5827       <modify-function signature="information(QWidget*,QString,QString,int,int,int)" remove="all"/> <!--### Obsolete in 4.3--> 
     5827      <!-- <modify-function signature="information(QWidget*,QString,QString,int,int,int)" remove="all"/> <!--### Obsolete in 4.3--> 
    58285828      <modify-function signature="information(QWidget*,QString,QString,QString,QString,QString,int,int)" remove="all"/> <!--### Obsolete in 4.3--> 
     5829      <modify-function signature="information(QWidget*,const QString &amp;,const QString &amp;,int,int,int)" remove="all"/> 
    58295830      <modify-function signature="question(QWidget*, QString, QString, int, int, int)" remove="all"/> <!--### Obsolete in 4.3--> 
    58305831      <modify-function signature="question(QWidget*, QString, QString, QString, QString, QString, int, int)" remove="all"/> <!--### Obsolete in 4.3-->