From 8767713ab09296bf7c13c87e06c8d235da42869b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 14 Feb 2012 21:13:36 -0600 Subject: [PATCH] Update various qt function definitions and static methods for tqt3 --- ChangeLog.CVS | 2 +- ChangeLog.CVS.delta | 2 +- doc/en/PerlQt.pod | 6 +++--- doc/en/index.html | 6 +++--- doc/fr/PerlQt.pod | 6 +++--- doc/fr/index.html | 6 +++--- kalyptus/ChangeLog | 2 +- kalyptus/kalyptus | 6 +++--- kalyptus/kalyptusDataDict.pm | 2 +- puic/form.cpp | 6 +++--- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/ChangeLog.CVS b/ChangeLog.CVS index b396db0..0c957b9 100644 --- a/ChangeLog.CVS +++ b/ChangeLog.CVS @@ -170,7 +170,7 @@ * PerlTQt/: TQt.pm, TQt.xs, handlers.cpp: - implemented TQByteArray Marshaller (from/to Perl string, tied if needed) - Still needs some thought /wrt to Utf8 handling (think qCompress/qUncompress) + Still needs some thought /wrt to Utf8 handling (think qCompress/tqUncompress) With TQDataStream static operators and this, we get a nice object serializer :) diff --git a/ChangeLog.CVS.delta b/ChangeLog.CVS.delta index 84062b6..756155e 100644 --- a/ChangeLog.CVS.delta +++ b/ChangeLog.CVS.delta @@ -170,7 +170,7 @@ * PerlTQt/: TQt.pm, TQt.xs, handlers.cpp: - implemented TQByteArray Marshaller (from/to Perl string, tied if needed) - Still needs some thought /wrt to Utf8 handling (think qCompress/qUncompress) + Still needs some thought /wrt to Utf8 handling (think qCompress/tqUncompress) With TQDataStream static operators and this, we get a nice object serializer :) diff --git a/doc/en/PerlQt.pod b/doc/en/PerlQt.pod index 5593aa9..62ac845 100644 --- a/doc/en/PerlQt.pod +++ b/doc/en/PerlQt.pod @@ -962,16 +962,16 @@ C. Hence, you shall access this namespace either with a fully qualified call: - TQt::GlobalSpace::qUncompress( $buffer ) + TQt::GlobalSpace::tqUncompress( $buffer ) Or directly, after importation in the current namespace: use TQt::GlobalSpace; - qUncompress( $buffer ) + tqUncompress( $buffer ) Of course, you may selectively import a few functions: - use TQt::GlobalSpace qw( qUncompress bitBlt ) + use TQt::GlobalSpace qw( tqUncompress bitBlt ) B GlobalSpace has also operators, such has the one performing an addition on two TQt::Point(). Those operators are called automatically. diff --git a/doc/en/index.html b/doc/en/index.html index 4386c5d..c9fe274 100644 --- a/doc/en/index.html +++ b/doc/en/index.html @@ -903,7 +903,7 @@ TQt has also some utilitarian functions such as bitBlt, qCompress, etc. 
- TQt::GlobalSpace::qUncompress( $buffer )
+ TQt::GlobalSpace::tqUncompress( $buffer )

Or directly, after importation in the current namespace:

@@ -911,14 +911,14 @@ TQt has also some utilitarian functions such as bitBlt, qCompress, etc. 
  use TQt::GlobalSpace;
- qUncompress( $buffer )
+ tqUncompress( $buffer )

Of course, you may selectively import a few functions:

- use TQt::GlobalSpace qw( qUncompress bitBlt )
+ use TQt::GlobalSpace qw( tqUncompress bitBlt )

Note: GlobalSpace has also operators, such has the one performing an addition on two diff --git a/doc/fr/PerlQt.pod b/doc/fr/PerlQt.pod index b92cbdf..a9d1fc4 100644 --- a/doc/fr/PerlQt.pod +++ b/doc/fr/PerlQt.pod @@ -997,16 +997,16 @@ C. Vous pourrez donc y accéder soit par un appel pleinement qualifié : - TQt::GlobalSpace::qUncompress( $buffer ) + TQt::GlobalSpace::tqUncompress( $buffer ) Soit en important préalablement ces fonctions dans l'espace de nom courant : use TQt::GlobalSpace; - qUncompress( $buffer ) + tqUncompress( $buffer ) Bien entendu, vous pouvez aussi n'importer que les fonctions souhaitées : - use TQt::GlobalSpace qw( qUncompress bitBlt ) + use TQt::GlobalSpace qw( tqUncompress bitBlt ) B GlobalSpace renferme également des opérateurs de portée globale, tels celui permettant d'aditionner deux TQt::Point(). Ces opérateurs seront appelés diff --git a/doc/fr/index.html b/doc/fr/index.html index 18fde1c..06275b8 100644 --- a/doc/fr/index.html +++ b/doc/fr/index.html @@ -931,7 +931,7 @@ TQt dispose de fonctions utilitaires, telles bitBlt, qCompress, etc. 

- TQt::GlobalSpace::qUncompress( $buffer )
+ TQt::GlobalSpace::tqUncompress( $buffer )

Soit en important préalablement ces fonctions dans l'espace de nom courant :

@@ -939,14 +939,14 @@ TQt dispose de fonctions utilitaires, telles bitBlt, qCompress, etc. 
  use TQt::GlobalSpace;
- qUncompress( $buffer )
+ tqUncompress( $buffer )

Bien entendu, vous pouvez aussi n'importer que les fonctions souhaitées :

- use TQt::GlobalSpace qw( qUncompress bitBlt )
+ use TQt::GlobalSpace qw( tqUncompress bitBlt )

N.B: GlobalSpace renferme également des opérateurs de portée globale, tels diff --git a/kalyptus/ChangeLog b/kalyptus/ChangeLog index fd2235b..f623302 100644 --- a/kalyptus/ChangeLog +++ b/kalyptus/ChangeLog @@ -81,7 +81,7 @@ 2004-06-29 Richard Dale - * 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 diff --git a/kalyptus/kalyptus b/kalyptus/kalyptus index 15e7a27..261c179 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 586ddf3..cf551fa 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', diff --git a/puic/form.cpp b/puic/form.cpp index 55ee7a7..f909b26 100644 --- a/puic/form.cpp +++ b/puic/form.cpp @@ -43,7 +43,7 @@ #if( TQT_VERSION < 0x030101 ) # include -static TQByteArray qUncompress( const uchar* data, int nbytes ) +static TQByteArray tqUncompress( const uchar* data, int nbytes ) { if ( !data ) { #if defined(TQT_CHECK_RANGE) @@ -117,13 +117,13 @@ static TQByteArray unzipXPM( TQString data, ulong& length ) r += l - 'a' + 10; ba[ i ] = r; } - // qUncompress() expects the first 4 bytes to be the expected length of the + // tqUncompress() expects the first 4 bytes to be the expected length of the // uncompressed data ba[0] = ( length & 0xff000000 ) >> 24; ba[1] = ( length & 0x00ff0000 ) >> 16; ba[2] = ( length & 0x0000ff00 ) >> 8; ba[3] = ( length & 0x000000ff ); - TQByteArray baunzip = qUncompress( ba, baSize ); + TQByteArray baunzip = tqUncompress( ba, baSize ); delete[] ba; return baunzip; }