diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 23:21:39 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-03 09:13:27 +0200 |
| commit | 79cb7ff953e300ad201caeb59618b79e1805f30e (patch) | |
| tree | 78392c45c3adc72a30d4469af658736004069362 | |
| parent | 2eb60ffe274173938c0186b0e3d7bc305ae02abe (diff) | |
| download | tdebindings-79cb7ff953e300ad201caeb59618b79e1805f30e.tar.gz tdebindings-79cb7ff953e300ad201caeb59618b79e1805f30e.zip | |
Modify smoke to handle tqt better
(cherry picked from commit 26666d3ac99b7fcf7f4d9252ebf76eb1a455454b)
| -rw-r--r-- | kalyptus/kalyptus | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index f021fdf4..44c510fa 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -859,7 +859,7 @@ sub identifyDecl # Class/Struct elsif ( $decl =~ /^\s*((?:template\s*<.*>)?) # 1 template \s*(class|struct|union|namespace) # 2 struct type - (?:\s*Q[A-Z_]*EXPORT[A-Z_]*)? + (?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)? (?:\s*Q_PACKED)? (?:\s*Q_REFCOUNT)? \s+([\w_]+ # 3 name @@ -1090,7 +1090,7 @@ sub identifyDecl $skipBlock = 1; } # explicit template instantiation, or friend template - elsif ( $decl =~ /(template|friend)\s+class\s+(?:Q[A-Z_]*EXPORT[A-Z_]*\s*)?\w+\s*<.*>\s*;/x ) { + elsif ( $decl =~ /(template|friend)\s+class\s+(?:TQ[A-Z_]*EXPORT[A-Z_]*\s*)?\w+\s*<.*>\s*;/x ) { # Nothing to be done with those. } else { @@ -1600,7 +1600,7 @@ sub newMethod $flags .= "n"; } - $retType =~ s/QM?_EXPORT[_A-Z]*\s*//; + $retType =~ s/TQM?_EXPORT[_A-Z]*\s*//; $retType =~ s/inline\s+//; $retType =~ s/extern\s+//; $retType =~ s/^\s*//g; |