Update for recent TQ changes.

17 files changed, 50 insertions, 50 deletions

diff --git a/doc/classref/dcop/DCOPClient.html b/doc/classref/dcop/DCOPClient.html
index c0fe761..c6146a3 100644
--- a/doc/classref/dcop/DCOPClient.html
+++ b/doc/classref/dcop/DCOPClient.html
@@ -448,7 +448,7 @@
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>transactionId</b> ()
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(Q_INT32)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQ_INT32)</i></td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 </ul>
 
diff --git a/doc/classref/kio/KSycocaDict.html b/doc/classref/kio/KSycocaDict.html
index a310177..2e59f53 100644
--- a/doc/classref/kio/KSycocaDict.html
+++ b/doc/classref/kio/KSycocaDict.html
@@ -70,7 +70,7 @@
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>hashKey</b> (a0)
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(Q_UINT32)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQ_UINT32)</i></td></tr>
 <tr><td>In versions KDE 3.3.0 and above only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
 <tr><td>a0</td><td>TQString</td><td></td></tr>
diff --git a/doc/classref/kio/KZipFileEntry.html b/doc/classref/kio/KZipFileEntry.html
index 642e9c2..c83b05d 100644
--- a/doc/classref/kio/KZipFileEntry.html
+++ b/doc/classref/kio/KZipFileEntry.html
@@ -47,14 +47,14 @@
 <tr><td>group</td><td>TQString</td><td></td></tr>
 <tr><td>symlink</td><td>TQString</td><td></td></tr>
 <tr><td>path</td><td>TQString</td><td></td></tr>
-<tr><td>start</td><td>Q_LONG</td><td></td></tr>
-<tr><td>uncompressedSize</td><td>Q_LONG</td><td></td></tr>
+<tr><td>start</td><td>TQ_LONG</td><td></td></tr>
+<tr><td>uncompressedSize</td><td>TQ_LONG</td><td></td></tr>
 <tr><td>encoding</td><td>int</td><td></td></tr>
-<tr><td>compressedSize</td><td>Q_LONG</td><td></td></tr>
+<tr><td>compressedSize</td><td>TQ_LONG</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>compressedSize</b> ()
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(Q_LONG)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQ_LONG)</i></td></tr>
 <tr><td>In versions KDE 3.1.0 and above only</td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>crc32</b> ()
@@ -74,7 +74,7 @@
 <tr><td>In versions KDE 3.1.0 and above only</td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>headerStart</b> ()
-<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(Q_LONG)</i></td></tr>
+<table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>(TQ_LONG)</i></td></tr>
 <tr><td>In versions KDE 3.1.0 and above only</td></tr>
 </table></td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>path</b> ()
@@ -92,14 +92,14 @@
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td>In versions KDE 3.1.0 and above only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
-<tr><td>compressedSize</td><td>Q_LONG</td><td></td></tr>
+<tr><td>compressedSize</td><td>TQ_LONG</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 <li><b>setHeaderStart</b> (headerstart)
 <table width = "100%"><tr><td width="50%" valign="top"><table><tr><td>returns <i>nothing</i></td></tr>
 <tr><td>In versions KDE 3.1.0 and above only</td></tr>
 </table><table><tr  bgcolor="#fff0ff"><th>Argument</th><th>Type</th><th>Default</th></tr>
-<tr><td>headerstart</td><td>Q_LONG</td><td></td></tr>
+<tr><td>headerstart</td><td>TQ_LONG</td><td></td></tr>
 </table>
 </td><td width="50%"><table><tr><td></td></tr></table></td></tr></table></li><hr>
 </ul>
diff --git a/doc/dcopext.html b/doc/dcopext.html
index f2786e9..48d41a5 100644
--- a/doc/dcopext.html
+++ b/doc/dcopext.html
@@ -158,7 +158,7 @@ The DCOP extensions will support any of the following C++ data types:
 <TR><TD>long</TD><TD>unsigned char</TD><TD>unsigned short</TD></TR>
 <TR><TD>unsigned int</TD><TD>unsigned long</TD><TD>uchar</TD></TR>
 <TR><TD>ushsort</TD><TD>uint</TD><TD>ulong</TD></TR>
-<TR><TD>Q_INT32</TD><TD>pid_t</TD><TD>float</TD></TR>
+<TR><TD>TQ_INT32</TD><TD>pid_t</TD><TD>float</TD></TR>
 <TR><TD>double</TD><TD>TQString</TD><TD>TQStringList</TD></TR>
 <TR><TD>TQCString</TD><TD>KURL</TD><TD>KURL::List</TD></TR>
 <TR><TD>TQSize</TD><TD>TQRect</TD><TD>TQRegion</TD></TR>
diff --git a/extensions/dcopexport.py b/extensions/dcopexport.py
index fc4aaa9..4269d67 100644
--- a/extensions/dcopexport.py
+++ b/extensions/dcopexport.py
@@ -55,7 +55,7 @@ from qt import TQString, TQCString, TQDataStream, IO_ReadOnly, IO_WriteOnly
 
 numericTypes = ["char", "bool", "short", "int", "long", "uchar", "ushort", "uint", "ulong",
                 "unsigned char", "unsigned short", "unsigned int", "unsigned long",
-                "Q_INT32", "pid_t", "float", "double"]
+                "TQ_INT32", "pid_t", "float", "double"]
 stringTypes  = ["TQString", "TQCString"]
 
 class DCOPExObj (DCOPObject):
diff --git a/extensions/dcopext.py b/extensions/dcopext.py
index 837835c..5956d26 100644
--- a/extensions/dcopext.py
+++ b/extensions/dcopext.py
@@ -40,7 +40,7 @@ from tdecore import dcop_add, dcop_next
 #
 #      I think 64 bit types would be:
 #      long long, unsigned long long, long long int, unsigned long long int,
-#      TQ_LLONG, TQ_ULLONG, TQ_INT64, TQ_UINT64
+#      TQ_LLONG, TQ_ULLONG, TTQ_INT64, TTQ_UINT64
 #
 #      and on some (most?) systems:
 #      TQtOffset
@@ -49,8 +49,8 @@ from tdecore import dcop_add, dcop_next
 # but python has a complex type
 POD               = set(['char','short','int','long','float','double'])
 typedefIntTypes   = set(["uchar", "ushort", "uint", "ulong",
-                         "Q_INT8", "Q_INT16", "Q_INT32", "Q_LONG",
-                         "Q_UINT8", "Q_UINT16", "Q_UINT32", "Q_ULONG",
+                         "TQ_INT8", "Q_INT16", "TQ_INT32", "TQ_LONG",
+                         "TQ_UINT8", "Q_UINT16", "TQ_UINT32", "Q_ULONG",
                          "sitze_t", "ssize_t", "int8_t", "int16_t", "int32_t",
 			 "uint8_t", "uint16_t", "uint32_t", "pid_t", "uid_t",
 			 "off_t"])
diff --git a/pytde350.prj b/pytde350.prj
index 3299d00..ca90813 100644
--- a/pytde350.prj
+++ b/pytde350.prj
@@ -85,10 +85,10 @@ define     = "Q_WS_X11", "1"
 define     = "\(TQt::ALT \<\< 1\)", "16777216"
 define     = "\(TQt::META\)", "16777216"
 define     = "enum\ URIMode\ m_iUriMode\ \:\ 3\;", ""
-define     = "Q_INT32", "long"
-define     = "Q_UINT32", "ulong"
-define     = "Q_INT64", "longlong"
-define     = "Q_UINT64", "ulonglong"
+define     = "TQ_INT32", "long"
+define     = "TQ_UINT32", "ulong"
+define     = "TQ_INT64", "longlong"
+define     = "TQ_UINT64", "ulonglong"
 define     = "mutable union", "union"
 define     = "TDECORE_EXPORT", ""
 define     = "KDE_EXPORT", ""
diff --git a/pytde351.prj b/pytde351.prj
index d941ba7..e9c317b 100644
--- a/pytde351.prj
+++ b/pytde351.prj
@@ -85,10 +85,10 @@ define     = "Q_WS_X11", "1"
 define     = "\(TQt::ALT \<\< 1\)", "16777216"
 define     = "\(TQt::META\)", "16777216"
 define     = "enum\ URIMode\ m_iUriMode\ \:\ 3\;", ""
-define     = "Q_INT32", "long"
-define     = "Q_UINT32", "ulong"
-define     = "Q_INT64", "longlong"
-define     = "Q_UINT64", "ulonglong"
+define     = "TQ_INT32", "long"
+define     = "TQ_UINT32", "ulong"
+define     = "TQ_INT64", "longlong"
+define     = "TQ_UINT64", "ulonglong"
 define     = "mutable union", "union"
 define     = "TDECORE_EXPORT", ""
 define     = "KDE_EXPORT", ""
diff --git a/pytde352.prj b/pytde352.prj
index 789c667..fc6847e 100644
--- a/pytde352.prj
+++ b/pytde352.prj
@@ -85,10 +85,10 @@ define     = "Q_WS_X11", "1"
 define     = "\(TQt::ALT \<\< 1\)", "16777216"
 define     = "\(TQt::META\)", "16777216"
 define     = "enum\ URIMode\ m_iUriMode\ \:\ 3\;", ""
-define     = "Q_INT32", "long"
-define     = "Q_UINT32", "ulong"
-define     = "Q_INT64", "longlong"
-define     = "Q_UINT64", "ulonglong"
+define     = "TQ_INT32", "long"
+define     = "TQ_UINT32", "ulong"
+define     = "TQ_INT64", "longlong"
+define     = "TQ_UINT64", "ulonglong"
 define     = "mutable union", "union"
 define     = "TDECORE_EXPORT", ""
 define     = "KDE_EXPORT", ""
diff --git a/pytde353.prj b/pytde353.prj
index fab0202..24b6219 100644
--- a/pytde353.prj
+++ b/pytde353.prj
@@ -85,10 +85,10 @@ define     = "Q_WS_X11", "1"
 define     = "\(TQt::ALT \<\< 1\)", "16777216"
 define     = "\(TQt::META\)", "16777216"
 define     = "enum\ URIMode\ m_iUriMode\ \:\ 3\;", ""
-define     = "Q_INT32", "long"
-define     = "Q_UINT32", "ulong"
-define     = "Q_INT64", "longlong"
-define     = "Q_UINT64", "ulonglong"
+define     = "TQ_INT32", "long"
+define     = "TQ_UINT32", "ulong"
+define     = "TQ_INT64", "longlong"
+define     = "TQ_UINT64", "ulonglong"
 define     = "mutable union", "union"
 define     = "TDECORE_EXPORT", ""
 define     = "KDE_EXPORT", ""
diff --git a/sip/dcop/dcopclient.sip b/sip/dcop/dcopclient.sip
index ddc5fae..35503d2 100644
--- a/sip/dcop/dcopclient.sip
+++ b/sip/dcop/dcopclient.sip
@@ -88,7 +88,7 @@ public:
     virtual bool         process (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&);
     DCOPClientTransaction* beginTransaction ();
     void                 endTransaction (DCOPClientTransaction*, TQCString&, TQByteArray&);
-    Q_INT32              transactionId ();
+    TQ_INT32              transactionId ();
     bool                 isApplicationRegistered (const TQCString&);
     QCStringList         registeredApplications ();
     QCStringList         remoteObjects (const TQCString&, bool* = 0);
diff --git a/sip/kio/kfilterdev.sip b/sip/kio/kfilterdev.sip
index eb24d16..635d089 100644
--- a/sip/kio/kfilterdev.sip
+++ b/sip/kio/kfilterdev.sip
@@ -46,8 +46,8 @@ public:
     virtual TQIODevice::Offset at () const;
     virtual bool         at (TQIODevice::Offset);
     virtual bool         atEnd () const;
-//ig     virtual Q_LONG       readBlock (char*, Q_ULONG);
-//ig     virtual Q_LONG       writeBlock (const char*, Q_ULONG);
+//ig     virtual TQ_LONG       readBlock (char*, Q_ULONG);
+//ig     virtual TQ_LONG       writeBlock (const char*, Q_ULONG);
     virtual int          getch ();
     virtual int          putch (int);
     virtual int          ungetch (int);
diff --git a/sip/kio/ksycocadict.sip b/sip/kio/ksycocadict.sip
index ae92d04..5cc527a 100644
--- a/sip/kio/ksycocadict.sip
+++ b/sip/kio/ksycocadict.sip
@@ -43,7 +43,7 @@ public:
     void                 save (TQDataStream&);
 
 protected:
-    Q_UINT32             hashKey (const TQString&);
+    TQ_UINT32             hashKey (const TQString&);
 
 };  // class KSycocaDict
 
diff --git a/sip/kio/kzip.sip b/sip/kio/kzip.sip
index 6fcfabc..8d281e7 100644
--- a/sip/kio/kzip.sip
+++ b/sip/kio/kzip.sip
@@ -102,12 +102,12 @@ class KZipFileEntry : KArchiveFile
 
 
 public:
-                         KZipFileEntry (KZip*, const TQString&, int, int, const TQString&, const TQString&, const TQString&, const TQString&, Q_LONG, Q_LONG, int, Q_LONG);
+                         KZipFileEntry (KZip*, const TQString&, int, int, const TQString&, const TQString&, const TQString&, const TQString&, TQ_LONG, TQ_LONG, int, TQ_LONG);
     int                  encoding () const;
-    Q_LONG               compressedSize () const;
-    void                 setCompressedSize (Q_LONG);
-    void                 setHeaderStart (Q_LONG);
-    Q_LONG               headerStart () const;
+    TQ_LONG               compressedSize () const;
+    void                 setCompressedSize (TQ_LONG);
+    void                 setHeaderStart (TQ_LONG);
+    TQ_LONG               headerStart () const;
     ulong                crc32 () const;
     void                 setCRC32 (ulong);
     TQString              path () const;
diff --git a/sip/tdecore/bytearray.sip b/sip/tdecore/bytearray.sip
index e8c00f0..507ef3c 100644
--- a/sip/tdecore/bytearray.sip
+++ b/sip/tdecore/bytearray.sip
@@ -139,7 +139,7 @@ void dcop_next (TQDataStream&, TQCString&);
 %MethodCode
     if (*a1 == "char")
     {
-        Q_INT8 res;
+        TQ_INT8 res;
         *a0 >> res;
         return PyInt_FromLong ((long)res);
     }
@@ -169,7 +169,7 @@ void dcop_next (TQDataStream&, TQCString&);
     }
     if (*a1 == "uchar" || *a1 == "unsigned char")
     {
-        Q_UINT8 res;
+        TQ_UINT8 res;
         *a0 >> res;
         return PyInt_FromLong ((long)res);
     }
@@ -185,9 +185,9 @@ void dcop_next (TQDataStream&, TQCString&);
         *a0 >> res;
         return PyLong_FromLong (res);
     }
-    else if (*a1 == "Q_INT32")
+    else if (*a1 == "TQ_INT32")
     {
-        Q_INT32 res;
+        TQ_INT32 res;
         *a0 >> res;
         return PyLong_FromLong ((long)res);
     }
@@ -433,7 +433,7 @@ void dcop_next (TQDataStream&, TQCString&);
 void dcop_add (TQDataStream& s, int value, const TQCString& type_)
 {
     if (type_ == "char")
-        s << (Q_INT8)value;
+        s << (TQ_INT8)value;
     else if (type_ == "bool")
         s << (bool)value;
     else if (type_ == "short")
@@ -443,7 +443,7 @@ void dcop_add (TQDataStream& s, int value, const TQCString& type_)
     else if (type_ == "long")
         s << (long)value;
     else if (type_== "uchar" || type_ == "unsigned char")
-        s << (Q_UINT8)value;
+        s << (TQ_UINT8)value;
     else if (type_ == "ushort" || type_ == "unsigned short")
         s << (ushort)value;
     else if (type_ == "uint" || type_ == "unsigned int")
diff --git a/sip/tdecore/kconfigskeleton.sip b/sip/tdecore/kconfigskeleton.sip
index 4891755..467ebb2 100644
--- a/sip/tdecore/kconfigskeleton.sip
+++ b/sip/tdecore/kconfigskeleton.sip
@@ -593,14 +593,14 @@ public:
     class PyItemInt64 : public KConfigSkeleton::ItemInt64
     {
     public:
-        PyItemInt64(const TQString &group, const TQString &key, Q_INT64 val, Q_INT64 defaultValue=0) :
+        PyItemInt64(const TQString &group, const TQString &key, TQ_INT64 val, TQ_INT64 defaultValue=0) :
             KConfigSkeleton::ItemInt64(group, key, this->value, defaultValue)
         {
             value = val;
         };
 
     private:
-        Q_INT64 value;
+        TQ_INT64 value;
     };
 
     Py_BEGIN_ALLOW_THREADS
@@ -787,14 +787,14 @@ public:
     class PyItemUInt64 : public KConfigSkeleton::ItemUInt64
     {
     public:
-        PyItemUInt64(const TQString &group, const TQString &key, Q_UINT64 val, Q_UINT64 defaultValue = 0) :
+        PyItemUInt64(const TQString &group, const TQString &key, TQ_UINT64 val, TQ_UINT64 defaultValue = 0) :
             KConfigSkeleton::ItemUInt64(group, key, this->value, defaultValue)
         {
             value = val;
         };
 
     private:
-        Q_UINT64 value;
+        TQ_UINT64 value;
     };
 
     Py_BEGIN_ALLOW_THREADS
diff --git a/sip/tdecore/kstddirs.sip b/sip/tdecore/kstddirs.sip
index 3e6ea5b..a066ec9 100644
--- a/sip/tdecore/kstddirs.sip
+++ b/sip/tdecore/kstddirs.sip
@@ -37,7 +37,7 @@ public:
     bool                 addResourceType (const char*, const TQString&);
     bool                 addResourceDir (const char*, const TQString&);
     TQString              findResource (const char*, const TQString&) const;
-    Q_UINT32             calcResourceHash (const char*, const TQString&, bool) const;
+    TQ_UINT32             calcResourceHash (const char*, const TQString&, bool) const;
     TQStringList          findDirs (const char*, const TQString&) const;
     TQString              findResourceDir (const char*, const TQString&) const;
     TQStringList          findAllResources (const char*, const TQString& = TQString::null, bool = 0, bool = 0) const;