Update for recent TQ changes.

7 files changed, 82 insertions, 82 deletions

diff --git a/kalyptus/kalyptusCxxToDcopIDL.pm b/kalyptus/kalyptusCxxToDcopIDL.pm
index ad7e3eee..5ff17c02 100644
--- a/kalyptus/kalyptusCxxToDcopIDL.pm
+++ b/kalyptus/kalyptusCxxToDcopIDL.pm
@@ -131,14 +131,14 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'Q_INT16' => 'short',
-   'Q_INT32' => 'int',
-   'Q_INT8' => 'char',
-   'Q_LONG' => 'long',
-   'Q_UINT16' => 'ushort',
-   'Q_UINT32' => 'uint',
-   'Q_UINT8' => 'uchar',
-   'Q_ULONG' => 'long',
+   'TQ_INT16' => 'short',
+   'TQ_INT32' => 'int',
+   'TQ_INT8' => 'char',
+   'TQ_LONG' => 'long',
+   'TQ_UINT16' => 'ushort',
+   'TQ_UINT32' => 'uint',
+   'TQ_UINT8' => 'uchar',
+   'TQ_ULONG' => 'long',
 );
 
 }
@@ -836,7 +836,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
diff --git a/kalyptus/kalyptusCxxToJNI.pm b/kalyptus/kalyptusCxxToJNI.pm
index 088ae4de..ba5aa00e 100644
--- a/kalyptus/kalyptusCxxToJNI.pm
+++ b/kalyptus/kalyptusCxxToJNI.pm
@@ -145,18 +145,18 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'TQ_INT16' => 'short',
-   'TQ_INT32' => 'int',
-   'TQ_INT64' => 'long',
-   'TQ_INT8' => 'char',
-   'TQ_LONG' => 'long',
-   'TQ_LLONG' => 'long',
+   'TTQ_INT16' => 'short',
+   'TTQ_INT32' => 'int',
+   'TTQ_INT64' => 'long',
+   'TTQ_INT8' => 'char',
+   'TTQ_LONG' => 'long',
+   'TTQ_LLONG' => 'long',
    'TQ_ULLONG' => 'long',
-   'TQ_UINT16' => 'ushort',
-   'TQ_UINT32' => 'uint',
-   'TQ_UINT64' => 'long',
-   'TQ_UINT8' => 'uchar',
-   'TQ_ULONG' => 'long',
+   'TTQ_UINT16' => 'ushort',
+   'TTQ_UINT32' => 'uint',
+   'TTQ_UINT64' => 'long',
+   'TTQ_UINT8' => 'uchar',
+   'TTQ_ULONG' => 'long',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',
@@ -4552,7 +4552,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
diff --git a/kalyptus/kalyptusCxxToJava.pm b/kalyptus/kalyptusCxxToJava.pm
index fd4907d3..4ba16825 100644
--- a/kalyptus/kalyptusCxxToJava.pm
+++ b/kalyptus/kalyptusCxxToJava.pm
@@ -143,18 +143,18 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'TQ_INT16' => 'short',
-   'TQ_INT32' => 'int',
-   'TQ_INT64' => 'long',
-   'TQ_INT8' => 'char',
-   'TQ_LONG' => 'long',
-   'TQ_LLONG' => 'long',
+   'TTQ_INT16' => 'short',
+   'TTQ_INT32' => 'int',
+   'TTQ_INT64' => 'long',
+   'TTQ_INT8' => 'char',
+   'TTQ_LONG' => 'long',
+   'TTQ_LLONG' => 'long',
    'TQ_ULLONG' => 'long',
-   'TQ_UINT16' => 'ushort',
-   'TQ_UINT32' => 'uint',
-   'TQ_UINT64' => 'long',
-   'TQ_UINT8' => 'uchar',
-   'TQ_ULONG' => 'long',
+   'TTQ_UINT16' => 'ushort',
+   'TTQ_UINT32' => 'uint',
+   'TTQ_UINT64' => 'long',
+   'TTQ_UINT8' => 'uchar',
+   'TTQ_ULONG' => 'long',
    'pid_t' => 'int',
    'size_t' => 'int',
    'pid_t' => 'int',
@@ -2391,7 +2391,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
diff --git a/kalyptus/kalyptusCxxToKimono.pm b/kalyptus/kalyptusCxxToKimono.pm
index 1cb5dbf5..a2a103fd 100644
--- a/kalyptus/kalyptusCxxToKimono.pm
+++ b/kalyptus/kalyptusCxxToKimono.pm
@@ -79,9 +79,9 @@ BEGIN
      'char*' => '$',
      'TQCOORD*' => '?',
      'TQRgb*' => '?',
-     'Q_UINT64' => '$',
-     'Q_INT64' => '$',
-     'Q_LLONG' => '$',
+     'TQ_UINT64' => '$',
+     'TQ_INT64' => '$',
+     'TQ_LLONG' => '$',
      'tquint64' => '$',
      'qint64' => '$',
      'long long' => '$',
@@ -146,21 +146,21 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'Q_INT16' => 'short',
+   'TQ_INT16' => 'short',
    'qint16' => 'short',
-   'Q_INT32' => 'int',
+   'TQ_INT32' => 'int',
    'qint32' => 'int',
    'qint32&' => 'int&',
-   'Q_INT8' => 'char',
+   'TQ_INT8' => 'char',
    'qint8' => 'char',
-   'Q_LONG' => 'long',
-   'Q_UINT16' => 'ushort',
+   'TQ_LONG' => 'long',
+   'TQ_UINT16' => 'ushort',
    'tquint16' => 'ushort',
-   'Q_UINT32' => 'uint',
+   'TQ_UINT32' => 'uint',
    'tquint32' => 'uint',
-   'Q_UINT8' => 'uchar',
+   'TQ_UINT8' => 'uchar',
    'tquint8' => 'uchar',
-   'Q_ULONG' => 'long',
+   'TQ_ULONG' => 'long',
    'qreal' => 'double',
    'pid_t' => 'int',
    'size_t' => 'int',
@@ -2585,7 +2585,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
diff --git a/kalyptus/kalyptusCxxToSmoke.pm b/kalyptus/kalyptusCxxToSmoke.pm
index 8aa6897f..4c81e93a 100644
--- a/kalyptus/kalyptusCxxToSmoke.pm
+++ b/kalyptus/kalyptusCxxToSmoke.pm
@@ -72,9 +72,9 @@ BEGIN
      'char*' => '$',
      'TQCOORD*' => '?',
      'TQRgb*' => '?',
-     'Q_UINT64' => '$',
-     'Q_INT64' => '$',
-     'Q_LLONG' => '$',
+     'TQ_UINT64' => '$',
+     'TQ_INT64' => '$',
+     'TQ_LLONG' => '$',
      'tquint64' => '$',
      'qint64' => '$',
      'long long' => '$',
@@ -140,21 +140,21 @@ BEGIN
    'TQEventLoop::ProcessEventsFlags' => 'uint',
    'TQStyle::SCFlags' => 'int',
    'TQStyle::SFlags' => 'int',
-   'Q_INT16' => 'short',
+   'TQ_INT16' => 'short',
    'qint16' => 'short',
-   'Q_INT32' => 'int',
+   'TQ_INT32' => 'int',
    'qint32' => 'int',
    'qint32&' => 'int&',
-   'Q_INT8' => 'char',
+   'TQ_INT8' => 'char',
    'qint8' => 'char',
-   'Q_LONG' => 'long',
-   'Q_UINT16' => 'ushort',
+   'TQ_LONG' => 'long',
+   'TQ_UINT16' => 'ushort',
    'tquint16' => 'ushort',
-   'Q_UINT32' => 'uint',
+   'TQ_UINT32' => 'uint',
    'tquint32' => 'uint',
-   'Q_UINT8' => 'uchar',
+   'TQ_UINT8' => 'uchar',
    'tquint8' => 'uchar',
-   'Q_ULONG' => 'long',
+   'TQ_ULONG' => 'long',
    'qreal' => 'double',
    'pid_t' => 'int',
    'size_t' => 'int',
@@ -1893,7 +1893,7 @@ sub registerType($$) {
     }
 
     # Apply typedefs, and store the resulting type.
-    # For instance, if $type was Q_UINT16&, realType will be ushort
+    # For instance, if $type was TQ_UINT16&, realType will be ushort
     $allTypes{$type}{realType} = applyTypeDef( $realType );
 
     # In the first phase we only create entries into allTypes.
diff --git a/kalyptus/kalyptusCxxToSwig.pm b/kalyptus/kalyptusCxxToSwig.pm
index f25387e7..555cf30f 100644
--- a/kalyptus/kalyptusCxxToSwig.pm
+++ b/kalyptus/kalyptusCxxToSwig.pm
@@ -82,14 +82,14 @@ BEGIN
    'TQStyle::SFlags' => 'int',
    'TQStyleOption&' => 'int&',
    'const TQStyleOption&' => 'const int&',
-   'Q_INT16' => 'short',
-   'Q_INT32' => 'int',
-   'Q_INT8' => 'char',
-   'Q_LONG' => 'long',
-   'Q_UINT16' => 'ushort',
-   'Q_UINT32' => 'uint',
-   'Q_UINT8' => 'uchar',
-   'Q_ULONG' => 'long',
+   'TQ_INT16' => 'short',
+   'TQ_INT32' => 'int',
+   'TQ_INT8' => 'char',
+   'TQ_LONG' => 'long',
+   'TQ_UINT16' => 'ushort',
+   'TQ_UINT32' => 'uint',
+   'TQ_UINT8' => 'uchar',
+   'TQ_ULONG' => 'long',
 );
 	# Page footer
 
diff --git a/kalyptus/kalyptusDataDict.pm b/kalyptus/kalyptusDataDict.pm
index 7c3bffb3..df8c8890 100644
--- a/kalyptus/kalyptusDataDict.pm
+++ b/kalyptus/kalyptusDataDict.pm
@@ -2271,24 +2271,24 @@ BEGIN
 'TQXmlSimpleReader*'  =>  'qt_QXmlSimpleReader*' ,
 'TQXtApplication*' => 'qt_QXtApplication*',
 'TQXtWidget*' => 'qt_QXtWidget*',
-'Q_INT16&' => 'short',
-'Q_INT16' => 'short',
-'Q_INT32&' => 'int',
-'Q_INT32' => 'int',
-'Q_INT8&' => 'char',
-'Q_INT8' => 'char',
-'Q_LONG&' => 'long',
-'Q_LONG' => 'long',
+'TQ_INT16&' => 'short',
+'TQ_INT16' => 'short',
+'TQ_INT32&' => 'int',
+'TQ_INT32' => 'int',
+'TQ_INT8&' => 'char',
+'TQ_INT8' => 'char',
+'TQ_LONG&' => 'long',
+'TQ_LONG' => 'long',
 'TQ_PACKED*' => 'void*',
-'Q_UINT16&' => 'unsigned short',
-'Q_UINT16' => 'unsigned short',
-'Q_UINT32&' => 'unsigned int',
-'Q_UINT32' => 'unsigned int',
-'Q_UINT8&' => 'unsigned char',
-'Q_UINT8' => 'unsigned char',
-'Q_UINT8*'  =>  'unsigned char*' ,
-'Q_ULONG&' => 'long',
-'Q_ULONG' => 'long',
+'TQ_UINT16&' => 'unsigned short',
+'TQ_UINT16' => 'unsigned short',
+'TQ_UINT32&' => 'unsigned int',
+'TQ_UINT32' => 'unsigned int',
+'TQ_UINT8&' => 'unsigned char',
+'TQ_UINT8' => 'unsigned char',
+'TQ_UINT8*'  =>  'unsigned char*' ,
+'TQ_ULONG&' => 'long',
+'TQ_ULONG' => 'long',
 'Qt*'  =>  'qt_Qt*' ,
 'TQt::ArrowType'  =>  'int' ,
 'TQt::BackgroundMode' => 'int',