summaryrefslogtreecommitdiffstats
path: root/kalyptus
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-14 21:17:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-14 21:17:02 -0600
commit3fda03faf1b67aa1221099f3a2153a0aa40811ef (patch)
tree99c8ff09fb5c748c0e2fbb19e56f102476c2eb49 /kalyptus
parent7e7a6b6965f6463062bf5b60feca8b50d4434b96 (diff)
downloadtdebindings-3fda03faf1b67aa1221099f3a2153a0aa40811ef.tar.gz
tdebindings-3fda03faf1b67aa1221099f3a2153a0aa40811ef.zip
Update various qt function definitions and static methods for tqt3
Diffstat (limited to 'kalyptus')
-rw-r--r--kalyptus/ChangeLog2
-rw-r--r--kalyptus/kalyptus6
-rw-r--r--kalyptus/kalyptusDataDict.pm2
3 files changed, 5 insertions, 5 deletions
diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog
index fd2235be..f6233022 100644
--- a/kalyptus/ChangeLog
+++ b/kalyptus/ChangeLog
@@ -81,7 +81,7 @@
2004-06-29 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
- * Java methods now generated for qCompress and qUncompress methods - Michal Ceresna
+ * Java methods now generated for qCompress and tqUncompress methods - Michal Ceresna
reported that the methods missing from the QtJava api.
2004-06-25 Richard Dale <Richard_Dale@tipitina.demon.co.uk>
diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus
index 15e7a272..261c1795 100644
--- a/kalyptus/kalyptus
+++ b/kalyptus/kalyptus
@@ -142,7 +142,7 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
QT_NO_REMOTE => 'QT_NO_REMOTE',
QT_ACCESSIBILITY_SUPPORT => 'QT_ACCESSIBILITY_SUPPORT',
Q_WS_X11 => 'Q_WS_X11',
- Q_DISABLE_COPY => 'Q_DISABLE_COPY',
+ TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
Q_WS_QWS => 'undef',
Q_WS_MAC => 'undef',
Q_OBJECT => <<'CODE',
@@ -499,7 +499,7 @@ LOOP:
$p =~ s/QT_MOC_COMPAT//;
$p =~ s/Q_EXPORT_CODECS_BIG5//;
$p =~ s/QT_COMPAT / /;
- $p =~ s/Q_DISABLE_COPY\((\w+)\)/$1(const $1 &);\n$1 &operator=(const $1 &);/;
+ $p =~ s/TQ_DISABLE_COPY\((\w+)\)/$1(const $1 &);\n$1 &operator=(const $1 &);/;
$p =~ s/TQWIDGETSIZE_MAX/32767/; # Qt/E uses this #define as an enum value - yuck!
$p =~ s/Q_SIGNALS/signals/;
$p =~ s/ASYNC/void/;
@@ -861,7 +861,7 @@ sub identifyDecl
\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*TQ_PACKED)?
(?:\s*Q_REFCOUNT)?
\s+([\w_]+ # 3 name
(?:<[\w_ :,]+?>)? # maybe explicit template
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index 586ddf3e..cf551fa0 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -2279,7 +2279,7 @@ BEGIN
'Q_INT8' => 'char',
'Q_LONG&' => 'long',
'Q_LONG' => 'long',
-'Q_PACKED*' => 'void*',
+'TQ_PACKED*' => 'void*',
'Q_UINT16&' => 'unsigned short',
'Q_UINT16' => 'unsigned short',
'Q_UINT32&' => 'unsigned int',