diff options
| -rw-r--r-- | kalyptus/kalyptus | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 056a7d4..74cae50 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -535,14 +535,20 @@ LOOP: # ); # - next if ( $p =~ /^\s*TQ_ENUMS/ # ignore TQ_ENUMS + next if ( $p =~ /^\s*Q_ENUMS/ # ignore Q_ENUMS + || $p =~ /^\s*TQ_ENUMS/ # and TQ_ENUMS || $p =~ /^\s*TQ_OBJECT/ # and TQ_OBJECT || $p =~ /^\s*Q_FLAGS/ # and Q_FLAGS + || $p =~ /^\s*TQ_FLAGS/ # and TQ_FLAGS || $p =~ /^\s*Q_DECLARE_FLAGS/ # and Q_DECLARE_FLAGS + || $p =~ /^\s*TQ_DECLARE_FLAGS/ # and TQ_DECLARE_FLAGS + || ( !$qt4 && $p =~ /^\s*Q_PROPERTY/ ) # and Q_PROPERTY || ( !$qt4 && $p =~ /^\s*TQ_PROPERTY/ ) # and TQ_PROPERTY || $p =~ /^\s*TQDOC_PROPERTY/ || $p =~ /^\s*Q_GADGET/ + || $p =~ /^\s*Q_OVERRIDE/ # and Q_OVERRIDE || $p =~ /^\s*TQ_OVERRIDE/ # and TQ_OVERRIDE + || $p =~ /^\s*Q_SETS/ || $p =~ /^\s*TQ_SETS/ || $p =~ /^\s*Q_DUMMY_COMPARISON_OPERATOR/ || $p =~ /^\s*K_SYCOCATYPE/ # and K_SYCOCA stuff @@ -727,7 +733,10 @@ sub readDecl $declNodeType = "c"; return $l; } - elsif ( $l =~ /TQ_PROPERTY/ ) { # property + elsif ( $l =~ /Q_PROPERTY/ ) { # property + return $l; + } + elsif ( $l =~ /TQ_PROPERTY/ ) { # property return $l; } @@ -809,12 +818,17 @@ sub identifyDecl elsif ( $declNodeType eq "k" ) { $cNode->AddProp( "DcopExported", 1 ); } - # properties - elsif ( $decl =~ s/TQ_PROPERTY// ) { + # properties + elsif ( $decl =~ s/Q_PROPERTY// ) { print "Property: <$1>\n" if $debug; $newNode = newProperty( $decl ); } + elsif ( $decl =~ s/TQ_PROPERTY// ) { + print "Property: <$1>\n" if $debug; + + $newNode = newProperty( $decl ); + } # Typedef struct/class elsif ( $decl =~ /^\s*typedef \s+(struct|union|class|enum) |