summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-27 17:14:41 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-02 19:04:45 +0200
commita9c64e7a807d469d0c3695cd9ab23ab1b4c289b3 (patch)
tree03043df87869e4a198f8cbd51c6368ec9bc9fb5b
parent48f0f62a9acb654cdb2547d81ae75c159ee48a2e (diff)
downloadtdelibs-a9c64e7a807d469d0c3695cd9ab23ab1b4c289b3.tar.gz
tdelibs-a9c64e7a807d469d0c3695cd9ab23ab1b4c289b3.zip
Attempt to force dcopidl to accept the TQ_OBJECT macro
(cherry picked from commit aa492f2e083fb5d31ce98c0e24dd87c12fdd3ed2)
-rw-r--r--dcop/dcopidlng/kalyptus7
1 files changed, 6 insertions, 1 deletions
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 9a3709fc0..e970812b2 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -115,6 +115,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
Q_WS_QWS => 'undef',
Q_WS_MAC => 'undef',
Q_OBJECT => <<'CODE',
+ TQ_OBJECT => <<'CODE',
public:
virtual QMetaObject *metaObject() const;
virtual const char *className() const;
@@ -373,7 +374,7 @@ sub readSourceLine
=head2 readCxxLine
Reads a C++ source line, skipping comments, blank lines,
- preprocessor tokens and the Q_OBJECT macro
+ preprocessor tokens and the Q_OBJECT/TQ_OBJECT macros
=cut
@@ -405,6 +406,10 @@ LOOP:
push @inputqueue, @codeqobject;
next;
}
+ if ( $p =~ /^\s*TQ_OBJECT/ ) {
+ push @inputqueue, @codeqobject;
+ next;
+ }
# Hack, waiting for real handling of preprocessor defines
$p =~ s/QT_STATIC_CONST/static const/;
$p =~ s/KSVG_GET/KJS::Value get();/;