summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 23:21:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-05 23:21:39 -0600
commit26666d3ac99b7fcf7f4d9252ebf76eb1a455454b (patch)
tree863f23ef83912fbbca45b5e194a9dafb0a25b292
parent26abe38d0748c549f2458da57507614fad599d83 (diff)
downloadtdebindings-26666d3ac99b7fcf7f4d9252ebf76eb1a455454b.tar.gz
tdebindings-26666d3ac99b7fcf7f4d9252ebf76eb1a455454b.zip
Modify smoke to handle tqt better
-rw-r--r--kalyptus/kalyptus6
1 files changed, 3 insertions, 3 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 274945b3..60a2b867 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;