diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-05 23:29:35 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-07-03 09:13:28 +0200 |
| commit | 106d706e3e48426a74c1c2483ea59aedc38437c5 (patch) | |
| tree | ab2e83a6005712e26ef3c30bd88d5d7657a890ab | |
| parent | 79cb7ff953e300ad201caeb59618b79e1805f30e (diff) | |
| download | tdebindings-106d706e3e48426a74c1c2483ea59aedc38437c5.tar.gz tdebindings-106d706e3e48426a74c1c2483ea59aedc38437c5.zip | |
Fix kalyptus/tqt
(cherry picked from commit 2ef253fb5ad347e446bf9c0a0f891d8d9ac7eb5c)
| -rw-r--r-- | kalyptus/kalyptus | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 44c510fa..41a41df6 100644 --- a/kalyptus/kalyptus +++ b/kalyptus/kalyptus @@ -860,6 +860,7 @@ sub identifyDecl elsif ( $decl =~ /^\s*((?:template\s*<.*>)?) # 1 template \s*(class|struct|union|namespace) # 2 struct type (?:\s*TQ[A-Z_]*EXPORT[A-Z_]*)? + (?:\s*Q[A-Z_]*EXPORT[A-Z_]*)? (?:\s*Q_PACKED)? (?:\s*Q_REFCOUNT)? \s+([\w_]+ # 3 name @@ -1093,6 +1094,10 @@ sub identifyDecl elsif ( $decl =~ /(template|friend)\s+class\s+(?:TQ[A-Z_]*EXPORT[A-Z_]*\s*)?\w+\s*<.*>\s*;/x ) { # Nothing to be done with those. } + # explicit template instantiation, or friend template + elsif ( $decl =~ /(template|friend)\s+class\s+(?:Q[A-Z_]*EXPORT[A-Z_]*\s*)?\w+\s*<.*>\s*;/x ) { + # Nothing to be done with those (same as above, but for QT not TQT). + } else { ## decl is unidentified. @@ -1601,6 +1606,7 @@ sub newMethod } $retType =~ s/TQM?_EXPORT[_A-Z]*\s*//; + $retType =~ s/QM?_EXPORT[_A-Z]*\s*//; $retType =~ s/inline\s+//; $retType =~ s/extern\s+//; $retType =~ s/^\s*//g; |