Additional TQt for Qt4 compilation fixes

This should not affect TQt for Qt3 per usual git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1215674 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-01-19 08:24:43 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-01-19 08:24:43 +0000
commit: 96a33d90689a46ea58f812d76fdd2eaf93edecfa (patch)
tree: 756ca55bffdffc115088699dd1b76c61eb6f64bf
parent: 5783baba4a547c443e4392f51c8023d38cb9fe6a (diff)
download: tdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.tar.gz
tdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.zip
35 files changed, 113 insertions, 116 deletions
diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp
index b8994f699..ca810f390 100644
--- a/dcop/dcopserver.cpp
+++ b/dcop/dcopserver.cpp
@@ -1614,7 +1614,7 @@ static bool isRunning(const TQCString &fName, bool printNetworkId = false)
     if (::access(fName.data(), R_OK) == 0) {
 	TQFile f(fName);
 	f.open(IO_ReadOnly);
-	int size = QMIN( (qint64)1024, f.size() ); // protection against a huge file
+	int size = TQMIN( (qint64)1024, f.size() ); // protection against a huge file
 	TQCString contents( size+1 );
 	bool ok = f.readBlock( contents.data(), size ) == size;
 	contents[size] = '\0';
diff --git a/kabc/sound.h b/kabc/sound.h
index 350042cc5..1a6d58d18 100644
--- a/kabc/sound.h
+++ b/kabc/sound.h
@@ -35,7 +35,7 @@ namespace KABC {
  *  \code
  *    KTempFile tmp;
  *    if(sound.isIntern()) {
- *      tmp.file()->writeBlock( sound.data() );
+ *      tmp.file()->tqwriteBlock( sound.data() );
  *      tmp.close();
  *      KAudioPlayer::play( tmp.name() );
  *    } else if(!sound.url().isEmpty()) {
diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h
index c7dda2f73..6c765978e 100644
--- a/kate/part/kateviewinternal.h
+++ b/kate/part/kateviewinternal.h
@@ -222,7 +222,7 @@ class KateViewInternal : public TQWidget
     int scrollX;
     int scrollY;
 
-    Qt::CursorShape m_mouseCursor;
+    TQt::tqCursorShape m_mouseCursor;
 
     KateSuperCursor cursor;
     KateTextCursor displayCursor;
diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp
index 9fee1654b..ac1d8bdf5 100644
--- a/kate/part/test_regression.cpp
+++ b/kate/part/test_regression.cpp
@@ -628,7 +628,7 @@ int main(int argc, char *argv[])
                 link += TQString(" <p style=\"color:green;font-weight:bold\">%1 new passes since %2</p>")
                         .arg(regressionTest->m_passes_new)
                         .arg(regressionTest->m_failureComp->group());
-            list.writeBlock( link.latin1(), link.length() );
+            list.tqwriteBlock( link.latin1(), link.length() );
             list.close();
 	}
     }
@@ -681,12 +681,12 @@ RegressionTest::RegressionTest(KateDocument *part, KConfig *baseConfig,
     TQString s;
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><body>Follow the white rabbit";
-    f.writeBlock( s.latin1(), s.length() );
+    f.tqwriteBlock( s.latin1(), s.length() );
     f.close();
     f.setName( m_outputDir + "/index.html" );
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>";
-    f.writeBlock( s.latin1(), s.length() );
+    f.tqwriteBlock( s.latin1(), s.length() );
     f.close();
 
     curr = this;
@@ -848,7 +848,7 @@ void RegressionTest::createLink( const TQString& test, int failures )
     if (failures & NewFailure)
         link += "</span>";
     link += "<br>\n";
-    list.writeBlock( link.latin1(), link.length() );
+    list.tqwriteBlock( link.latin1(), link.length() );
     list.close();
 }
 
@@ -1020,7 +1020,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
     cl += "<div id='dom' class='diff'>" + domDiff + "</div>";
 
     cl += "</body></html>";
-    compare.writeBlock( cl.latin1(), cl.length() );
+    compare.tqwriteBlock( cl.latin1(), cl.length() );
     compare.close();
 }
 
diff --git a/kdecore/kextsock.cpp b/kdecore/kextsock.cpp
index 826e8a014..c6561bad4 100644
--- a/kdecore/kextsock.cpp
+++ b/kdecore/kextsock.cpp
@@ -1436,7 +1436,7 @@ void KExtendedSocket::flush()
 }
 
 
-TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen)
+TQT_TQIO_LONG KExtendedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
 {
   cleanError();
   if (d->status < connected || d->flags & passiveSocket)
@@ -1481,7 +1481,7 @@ TQ_LONG KExtendedSocket::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KExtendedSocket::writeBlock(const char *data, TQ_ULONG len)
+TQT_TQIO_LONG KExtendedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
 {
   cleanError();
   if (d->status < connected || d->status >= closing || d->flags & passiveSocket)
@@ -1606,7 +1606,7 @@ int KExtendedSocket::getch()
 {
   unsigned char c;
   int retval;
-  retval = readBlock((char*)&c, sizeof(c));
+  retval = tqreadBlock((char*)&c, sizeof(c));
 
   if (retval < 0)
     return retval;
@@ -1616,7 +1616,7 @@ int KExtendedSocket::getch()
 int KExtendedSocket::putch(int ch)
 {
   unsigned char c = (char)ch;
-  return writeBlock((char*)&c, sizeof(c));
+  return tqwriteBlock((char*)&c, sizeof(c));
 }
 
 // sets the emission of the readyRead signal
diff --git a/kdecore/kextsock.h b/kdecore/kextsock.h
index 4cf2d29ee..02922ec33 100644
--- a/kdecore/kextsock.h
+++ b/kdecore/kextsock.h
@@ -67,7 +67,7 @@ class KExtendedSocketPrivate;
  * only difference is that the passiveSocket flag must be passed either to
  * the constructor or to setSocketFlags(). If passiveSocket is used, the class will
  * enable functions listen() and accept() and related signals, and will
- * also disable readBlock() and writeBlock().
+ * also disable tqreadBlock() and tqwriteBlock().
  *
  * To create a Unix socket, one would pass flag unixSocket to the constructor
  * or setSocketFlags(). The hostname and service/port can be set to whatever is
@@ -677,7 +677,7 @@ public:
    * ready to receive data, it will block, unless this is a non-blocking socket.
    *
    * This function does not touch the read buffer. You can empty it by calling
-   * readBlock() with a null destination buffer.
+   * tqreadBlock() with a null destination buffer.
    */
   virtual void flush();
 
@@ -745,7 +745,7 @@ public:
    * This function returns 0, if the function detected end-of-file condition
    * (socket was closed)
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
 
   /**
    * Writes a block of data to the socket.
@@ -770,7 +770,7 @@ public:
    * The return value might be less than @p len if the output buffers cannot
    * accommodate that many bytes and -1 in the case of an errro.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
 
   /**
    * Peeks at a block of data from the socket.
diff --git a/kdecore/kmdcodec.cpp b/kdecore/kmdcodec.cpp
index 4fe968361..77badf49f 100644
--- a/kdecore/kmdcodec.cpp
+++ b/kdecore/kmdcodec.cpp
@@ -25,7 +25,7 @@
 
    The encoding and decoding utilities in KCodecs with the exception of
    quoted-printable are based on the java implementation in HTTPClient
-   package by Ronald Tschal�r Copyright (C) 1996-1999.
+   package by Ronald Tschal�r Copyright (C) 1996-1999.
 
    The quoted-printable codec as described in RFC 2045, section 6.7. is by
    Rik Hemsley (C) 2001.
diff --git a/kdecore/kqiodevicegzip_p.cpp b/kdecore/kqiodevicegzip_p.cpp
index 8439eb26e..14bb38125 100644
--- a/kdecore/kqiodevicegzip_p.cpp
+++ b/kdecore/kqiodevicegzip_p.cpp
@@ -115,7 +115,7 @@ bool KQIODeviceGZip::reset(void)
     return (gzrewind(m_gzfile)>=0);
 }
 
-TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen )
+TQT_TQIO_LONG KQIODeviceGZip::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen )
 {
     TQ_LONG result=0;
     if (m_gzfile)
@@ -126,7 +126,7 @@ TQ_LONG KQIODeviceGZip::readBlock( char *data, TQ_ULONG maxlen )
     return result;
 }
 
-TQ_LONG KQIODeviceGZip::writeBlock( const char *data, TQ_ULONG len )
+TQT_TQIO_LONG KQIODeviceGZip::tqwriteBlock( const char *data, TQT_TQIO_ULONG len )
 {
     TQ_ULONG result=0;
     if (m_gzfile)
diff --git a/kdecore/kqiodevicegzip_p.h b/kdecore/kqiodevicegzip_p.h
index 73da2281d..8c547a742 100644
--- a/kdecore/kqiodevicegzip_p.h
+++ b/kdecore/kqiodevicegzip_p.h
@@ -52,8 +52,8 @@ public:
     bool atEnd(void) const;
     bool reset (void);
 
-    TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
-    TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+    TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen );
+    TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len );
 
     int getch(void);
     int putch(int ch);
diff --git a/kdecore/ksycoca.cpp b/kdecore/ksycoca.cpp
index a3d017f9a..f6b9ffa6a 100644
--- a/kdecore/ksycoca.cpp
+++ b/kdecore/ksycoca.cpp
@@ -233,10 +233,7 @@ void KSycoca::closeDatabase()
    if (device && m_sycoca_mmap)
    {
       TQBuffer *buf = (TQBuffer *) device;
-#ifdef USE_QT4
-      static_cast<TQByteArray&>
-#endif // USE_QT4
-      (buf->buffer()).resetRawData(m_sycoca_mmap, m_sycoca_size);
+      buf->buffer().resetRawData(m_sycoca_mmap, m_sycoca_size);
       // Solaris has munmap(char*, size_t) and everything else should
       // be happy with a char* for munmap(void*, size_t)
       munmap((char*) m_sycoca_mmap, m_sycoca_size);
diff --git a/kdecore/network/kbufferedsocket.cpp b/kdecore/network/kbufferedsocket.cpp
index 85b433193..ffac2e98b 100644
--- a/kdecore/network/kbufferedsocket.cpp
+++ b/kdecore/network/kbufferedsocket.cpp
@@ -118,7 +118,7 @@ TQ_LONG KBufferedSocket::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
+TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
 {
   if (d->input)
     {
@@ -131,13 +131,13 @@ TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen)
       resetError();
       return d->input->consumeBuffer(data, maxlen);
     }
-  return KStreamSocket::readBlock(data, maxlen);
+  return KStreamSocket::tqreadBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQT_TQIO_LONG KBufferedSocket::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from)
 {
   from = peerAddress();
-  return readBlock(data, maxlen);
+  return tqreadBlock(data, maxlen);
 }
 
 TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen)
@@ -162,7 +162,7 @@ TQ_LONG KBufferedSocket::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress&
   return peekBlock(data, maxlen);
 }
 
-TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
+TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
 {
   if (state() != Connected)
     {
@@ -189,14 +189,14 @@ TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG len)
       return d->output->feedBuffer(data, len);
     }
 
-  return KStreamSocket::writeBlock(data, len);
+  return KStreamSocket::tqwriteBlock(data, len);
 }
 
-TQ_LONG KBufferedSocket::writeBlock(const char *data, TQ_ULONG maxlen,
+TQT_TQIO_LONG KBufferedSocket::tqwriteBlock(const char *data, TQT_TQIO_ULONG maxlen,
 				   const KSocketAddress&)
 {
   // ignore the third parameter
-  return writeBlock(data, maxlen);
+  return tqwriteBlock(data, maxlen);
 }
 
 void KBufferedSocket::enableRead(bool enable)
diff --git a/kdecore/network/kbufferedsocket.h b/kdecore/network/kbufferedsocket.h
index 0982a88d3..8f9dde92c 100644
--- a/kdecore/network/kbufferedsocket.h
+++ b/kdecore/network/kbufferedsocket.h
@@ -114,7 +114,7 @@ public:
   /**
    * Reads data from the socket. Make use of buffers.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
 
   /**
    * @overload
@@ -122,7 +122,7 @@ public:
    *
    * The @p from parameter is always set to @ref peerAddress()
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Peeks data from the socket.
@@ -140,7 +140,7 @@ public:
   /**
    * Writes data to the socket.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
 
   /**
    * @overload
@@ -148,7 +148,7 @@ public:
    *
    * The @p to parameter is discarded.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to);
 
   /**
    * Catch changes.
diff --git a/kdecore/network/kclientsocketbase.cpp b/kdecore/network/kclientsocketbase.cpp
index 46f7a1942..9785ce36c 100644
--- a/kdecore/network/kclientsocketbase.cpp
+++ b/kdecore/network/kclientsocketbase.cpp
@@ -311,10 +311,10 @@ TQ_LONG KClientSocketBase::waitForMore(int msecs, bool *timeout)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen)
+TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->readBlock(data, maxlen);
+  TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen);
   if (retval == -1)
     {
       copyError();
@@ -323,10 +323,10 @@ TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from)
+TQT_TQIO_LONG KClientSocketBase::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->readBlock(data, maxlen, from);
+  TQ_LONG retval = socketDevice()->tqreadBlock(data, maxlen, from);
   if (retval == -1)
     {
       copyError();
@@ -359,10 +359,10 @@ TQ_LONG KClientSocketBase::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress
   return retval;
 }
 
-TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len)
+TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->writeBlock(data, len);
+  TQ_LONG retval = socketDevice()->tqwriteBlock(data, len);
   if (retval == -1)
     {
       copyError();
@@ -371,10 +371,10 @@ TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len)
   return retval;
 }
 
-TQ_LONG KClientSocketBase::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+TQT_TQIO_LONG KClientSocketBase::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to)
 {
   resetError();
-  TQ_LONG retval = socketDevice()->writeBlock(data, len, to);
+  TQ_LONG retval = socketDevice()->tqwriteBlock(data, len, to);
   if (retval == -1)
     {
       copyError();
diff --git a/kdecore/network/kclientsocketbase.h b/kdecore/network/kclientsocketbase.h
index 63ddc3aa3..bf1c8c04e 100644
--- a/kdecore/network/kclientsocketbase.h
+++ b/kdecore/network/kclientsocketbase.h
@@ -317,13 +317,13 @@ public:
   /**
    * Reads data from a socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
 
   /**
    * @overload
    * Reads data from a socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Peeks data from the socket. Reimplemented from KSocketBase.
@@ -339,13 +339,13 @@ public:
   /**
    * Writes data to the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
 
   /**
    * @overload
    * Writes data to the socket. Reimplemented from KSocketBase.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to);
 
   /**
    * Returns the local socket address. Reimplemented from KSocketBase.
diff --git a/kdecore/network/kdatagramsocket.cpp b/kdecore/network/kdatagramsocket.cpp
index ff6ea04b3..d4bddc543 100644
--- a/kdecore/network/kdatagramsocket.cpp
+++ b/kdecore/network/kdatagramsocket.cpp
@@ -156,7 +156,7 @@ KDatagramPacket KDatagramSocket::receive()
   KSocketAddress address;
   
   // now do the reading
-  size = readBlock(data.data(), size, address);
+  size = tqreadBlock(data.data(), size, address);
   if (size < 0)
     // error has been set
     return KDatagramPacket();
@@ -167,10 +167,10 @@ KDatagramPacket KDatagramSocket::receive()
 
 TQ_LONG KDatagramSocket::send(const KDatagramPacket& packet)
 {
-  return writeBlock(packet.data(), packet.size(), packet.address());
+  return tqwriteBlock(packet.data(), packet.size(), packet.address());
 }
 
-TQ_LONG KDatagramSocket::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+TQ_LONG KDatagramSocket::tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
 {
   if (to.family() != AF_UNSPEC)
     {
@@ -179,7 +179,7 @@ TQ_LONG KDatagramSocket::writeBlock(const char *data, TQ_ULONG len, const KSocke
 	// error handling will happen below
 	socketDevice()->create(to.family(), SOCK_DGRAM, 0);
     }
-  return KClientSocketBase::writeBlock(data, len, to);
+  return KClientSocketBase::tqwriteBlock(data, len, to);
 }
 
 void KDatagramSocket::lookupFinishedLocal()
diff --git a/kdecore/network/kdatagramsocket.h b/kdecore/network/kdatagramsocket.h
index 7ecbada09..becbe404a 100644
--- a/kdecore/network/kdatagramsocket.h
+++ b/kdecore/network/kdatagramsocket.h
@@ -223,7 +223,7 @@ public:
    *
    * Connecting means only to designate the given address as the default
    * destination address for datagrams sent without destination addresses
-   * ( writeBlock(const char *, TQ_ULONG) ).
+   * ( tqwriteBlock(const char *, TQ_ULONG) ).
    *
    * @note Calling connect will not cause the socket to be bound. You have
    *       to call @ref bind explicitly.
@@ -241,7 +241,7 @@ public:
   /**
    * Writes data to the socket. Reimplemented from KClientSocketBase.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
 
   /**
    * Receives one datagram from the stream. The reading process is guaranteed
diff --git a/kdecore/network/khttpproxysocketdevice.cpp b/kdecore/network/khttpproxysocketdevice.cpp
index f4ef01564..0d72b4b3d 100644
--- a/kdecore/network/khttpproxysocketdevice.cpp
+++ b/kdecore/network/khttpproxysocketdevice.cpp
@@ -179,7 +179,7 @@ bool KHttpProxySocketDevice::parseServerReply()
   if (!d->request.isEmpty())
     {
       // send request
-      TQ_LONG written = writeBlock(d->request, d->request.length());
+      TQ_LONG written = tqwriteBlock(d->request, d->request.length());
       if (written < 0)
 	{
 	  qDebug("KHttpProxySocketDevice: would block writing request!");
@@ -227,7 +227,7 @@ bool KHttpProxySocketDevice::parseServerReply()
 	{
 	  // no, headers not yet finished...
 	  // consume data from socket
-	  readBlock(buf.data(), avail);
+	  tqreadBlock(buf.data(), avail);
 	  d->reply += buf.data();
 	  setError(IO_ConnectError, InProgress);
 	  return true;
@@ -238,7 +238,7 @@ bool KHttpProxySocketDevice::parseServerReply()
       d->reply += fullHeaders.mid(d->reply.length(), index + 4);
 
       // consume from socket
-      readBlock(buf.data(), index + 4);
+      tqreadBlock(buf.data(), index + 4);
     }
   else
     {
diff --git a/kdecore/network/ksocketbase.cpp b/kdecore/network/ksocketbase.cpp
index 1a486ee16..f5410f3e8 100644
--- a/kdecore/network/ksocketbase.cpp
+++ b/kdecore/network/ksocketbase.cpp
@@ -291,7 +291,7 @@ KActiveSocketBase::~KActiveSocketBase()
 int KActiveSocketBase::getch()
 {
   unsigned char c;
-  if (readBlock((char*)&c, 1) != 1)
+  if (tqreadBlock((char*)&c, 1) != 1)
     return -1;
 
   return c;
@@ -300,7 +300,7 @@ int KActiveSocketBase::getch()
 int KActiveSocketBase::putch(int ch)
 {
   unsigned char c = (unsigned char)ch;
-  if (writeBlock((char*)&c, 1) != 1)
+  if (tqwriteBlock((char*)&c, 1) != 1)
     return -1;
 
   return c;
diff --git a/kdecore/network/ksocketbase.h b/kdecore/network/ksocketbase.h
index b7df0c35f..8a94cbbcb 100644
--- a/kdecore/network/ksocketbase.h
+++ b/kdecore/network/ksocketbase.h
@@ -562,7 +562,7 @@ public:
    * Reimplemented from TQIODevice. See TQIODevice::readBlock for
    * more information.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG len) = 0;
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG len) = 0;
 
   /** @overload
    * Receives data and the source address.
@@ -575,7 +575,7 @@ public:
    * @param from		the address of the sender will be stored here
    * @returns the actual number of bytes read
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from) = 0;
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from) = 0;
 
   /**
    * Peeks the data in the socket.
@@ -610,7 +610,7 @@ public:
    * Reimplemented from TQIODevice. See TQIODevice::writeBlock for
    * more information.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len) = 0;
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len) = 0;
 
   /** @overload
    * Writes the given data to the destination address.
@@ -623,7 +623,7 @@ public:
    * @param to			the address to send to
    * @returns the number of bytes actually sent
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to) = 0;
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to) = 0;
 
   /**
    * Reads one character from the socket.
diff --git a/kdecore/network/ksocketbuffer.cpp b/kdecore/network/ksocketbuffer.cpp
index 4ea12ed14..ad4864be7 100644
--- a/kdecore/network/ksocketbuffer.cpp
+++ b/kdecore/network/ksocketbuffer.cpp
@@ -273,7 +273,7 @@ TQ_LONG KSocketBuffer::sendTo(KActiveSocketBase* dev, TQ_LONG len)
 	}
 
       // now try to write those bytes
-      TQ_LONG wrote = dev->writeBlock(buf, count);
+      TQ_LONG wrote = dev->tqwriteBlock(buf, count);
 
       if (wrote == -1)
 	// error?
@@ -314,7 +314,7 @@ TQ_LONG KSocketBuffer::receiveFrom(KActiveSocketBase* dev, TQ_LONG len)
 
   // now do the reading
   TQByteArray a(len);
-  len = dev->readBlock(a.data(), len);
+  len = dev->tqreadBlock(a.data(), len);
 
   if (len == -1)
     // error?
diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp
index 793642bf9..8b4789e02 100644
--- a/kdecore/network/ksocketdevice.cpp
+++ b/kdecore/network/ksocketdevice.cpp
@@ -419,7 +419,7 @@ static int do_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAddres
   return 0;
 }
 
-TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
+TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -440,7 +440,7 @@ TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
+TQT_TQIO_LONG KSocketDevice::tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -503,12 +503,12 @@ TQ_LONG KSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddress& fr
   return retval;
 }
 
-TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len)
+TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len)
 {
-  return writeBlock(data, len, KSocketAddress());
+  return tqwriteBlock(data, len, KSocketAddress());
 }
 
-TQ_LONG KSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+TQT_TQIO_LONG KSocketDevice::tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
diff --git a/kdecore/network/ksocketdevice.h b/kdecore/network/ksocketdevice.h
index 5324cd02b..5409335aa 100644
--- a/kdecore/network/ksocketdevice.h
+++ b/kdecore/network/ksocketdevice.h
@@ -216,12 +216,12 @@ public:
   /**
    * Reads data from this socket.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen);
 
   /**
    * Reads data and the source address from this socket.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQT_TQIO_LONG tqreadBlock(char *data, TQT_TQIO_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Peeks data in the socket.
@@ -236,12 +236,12 @@ public:
   /**
    * Writes data to the socket.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len);
 
   /**
    * Writes the given data to the given destination address.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual TQT_TQIO_LONG tqwriteBlock(const char *data, TQT_TQIO_ULONG len, const KSocketAddress& to);
 
   /**
    * Returns this socket's local address.
diff --git a/kdecore/network/ksockssocketdevice.cpp b/kdecore/network/ksockssocketdevice.cpp
index b9fcb6cdd..3432ef84f 100644
--- a/kdecore/network/ksockssocketdevice.cpp
+++ b/kdecore/network/ksockssocketdevice.cpp
@@ -214,7 +214,7 @@ static int socks_read_common(int sockfd, char *data, TQ_ULONG maxlen, KSocketAdd
   return 0;
 }
 
-TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
+TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen)
 {
   resetError();
   if (m_sockfd == -1)
@@ -235,7 +235,7 @@ TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen)
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::readBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
+TQ_LONG KSocksSocketDevice::tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress &from)
 {
   resetError();
   if (m_sockfd == -1)
@@ -298,12 +298,12 @@ TQ_LONG KSocksSocketDevice::peekBlock(char *data, TQ_ULONG maxlen, KSocketAddres
   return retval;
 }
 
-TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len)
+TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len)
 {
-  return writeBlock(data, len, KSocketAddress());
+  return tqwriteBlock(data, len, KSocketAddress());
 }
 
-TQ_LONG KSocksSocketDevice::writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
+TQ_LONG KSocksSocketDevice::tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to)
 {
   resetError();
   if (m_sockfd == -1)
diff --git a/kdecore/network/ksockssocketdevice.h b/kdecore/network/ksockssocketdevice.h
index 1f8453836..4db5d1e01 100644
--- a/kdecore/network/ksockssocketdevice.h
+++ b/kdecore/network/ksockssocketdevice.h
@@ -83,8 +83,8 @@ public:
   /**
    * Overrides reading.
    */
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen);
-  virtual TQ_LONG readBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
+  virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen);
+  virtual TQ_LONG tqreadBlock(char *data, TQ_ULONG maxlen, KSocketAddress& from);
 
   /**
    * Overrides peeking.
@@ -95,8 +95,8 @@ public:
   /**
    * Overrides writing.
    */
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len);
-  virtual TQ_LONG writeBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
+  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len);
+  virtual TQ_LONG tqwriteBlock(const char *data, TQ_ULONG len, const KSocketAddress& to);
 
   /**
    * Overrides getting socket address.
diff --git a/kdeprint/management/kmwlpd.cpp b/kdeprint/management/kmwlpd.cpp
index d1bb53cab..b83c9cb82 100644
--- a/kdeprint/management/kmwlpd.cpp
+++ b/kdeprint/management/kmwlpd.cpp
@@ -81,12 +81,12 @@ bool checkLpdQueue(const char *host, const char *queue)
 
 	char	res[64] = {0};
 	snprintf(res,64,"%c%s\n",(char)4,queue);
-	if (sock.writeBlock(res, strlen(res)) != (TQ_LONG)(strlen(res)))
+	if (sock.tqwriteBlock(res, strlen(res)) != (TQ_LONG)(strlen(res)))
 		return false;
 
 	char	buf[1024] = {0};
 	int	n, tot(1);
-	while ((n = sock.readBlock(res, 63)) > 0)
+	while ((n = sock.tqreadBlock(res, 63)) > 0)
 	{
 		res[n] = 0;
 		tot += n;
diff --git a/khtml/html/html_elementimpl.cpp b/khtml/html/html_elementimpl.cpp
index a5931cd41..736b5a3b9 100644
--- a/khtml/html/html_elementimpl.cpp
+++ b/khtml/html/html_elementimpl.cpp
@@ -347,17 +347,17 @@ void HTMLElementImpl::addCSSLength(int id, const DOMString &value, bool numOnly,
 }
 
 static inline bool isHexDigit( const TQChar &c ) {
-    return ( c >= '0' && c <= '9' ) ||
-	   ( c >= 'a' && c <= 'f' ) ||
-	   ( c >= 'A' && c <= 'F' );
+    return ( c >= TQChar('0') && c <= TQChar('9') ) ||
+	   ( c >= TQChar('a') && c <= TQChar('f') ) ||
+	   ( c >= TQChar('A') && c <= TQChar('F') );
 }
 
 static inline int toHex( const TQChar &c ) {
-    return ( (c >= '0' && c <= '9')
+    return ( (c >= TQChar('0') && c <= TQChar('9'))
 	     ? (c.tqunicode() - '0')
-	     : ( ( c >= 'a' && c <= 'f' )
+	     : ( ( c >= TQChar('a') && c <= TQChar('f') )
 		 ? (c.tqunicode() - 'a' + 10)
-		 : ( ( c >= 'A' && c <= 'F' )
+		 : ( ( c >= TQChar('A') && c <= TQChar('F') )
 		     ? (c.tqunicode() - 'A' + 10)
 		     : -1 ) ) );
 }
diff --git a/khtml/khtml_settings.cc b/khtml/khtml_settings.cc
index 57ff92689..405fa4234 100644
--- a/khtml/khtml_settings.cc
+++ b/khtml/khtml_settings.cc
@@ -107,7 +107,7 @@ public:
     TQStringList defaultFonts;
 
     TQValueVector<TQRegExp> adFilters;
-    TQValueList< QPair< TQString, TQChar > > m_fallbackAccessKeysAssignments;
+    TQValueList< TQPair< TQString, TQChar > > m_fallbackAccessKeysAssignments;
 };
 
 
@@ -442,7 +442,7 @@ void KHTMLSettings::init( KConfig * config, bool reset )
     d->m_fallbackAccessKeysAssignments.clear();
     for( TQStringList::ConstIterator it = accesskeys.begin(); it != accesskeys.end(); ++it )
         if( (*it).length() > 2 && (*it)[ 1 ] == ':' )
-            d->m_fallbackAccessKeysAssignments.append( qMakePair( (*it).mid( 2 ), (*it)[ 0 ] ));
+            d->m_fallbackAccessKeysAssignments.append( tqMakePair( (*it).mid( 2 ), (*it)[ 0 ] ));
   }
 
   // Colors
@@ -1043,7 +1043,7 @@ bool KHTMLSettings::autoSpellCheck() const
     return d->m_autoSpellCheck;
 }
 
-TQValueList< QPair< TQString, TQChar > > KHTMLSettings::fallbackAccessKeysAssignments() const
+TQValueList< TQPair< TQString, TQChar > > KHTMLSettings::fallbackAccessKeysAssignments() const
 {
     return d->m_fallbackAccessKeysAssignments;
 }
diff --git a/khtml/test_regression.cpp b/khtml/test_regression.cpp
index c756dc2ea..982539621 100644
--- a/khtml/test_regression.cpp
+++ b/khtml/test_regression.cpp
@@ -350,7 +350,7 @@ Value KHTMLPartFunction::call(ExecState *exec, Object &/*thisObj*/, const List &
 		char buf[1024];
 		int bytesread;
 		while (!file.atEnd()) {
-		    bytesread = file.readBlock(buf,1024);
+		    bytesread = file.tqreadBlock(buf,1024);
 		    stream.writeRawBytes(buf,bytesread);
 		}
 		file.close();
@@ -642,7 +642,7 @@ int main(int argc, char *argv[])
             link = TQString( "<hr>%1 failures. (%2 expected failures)" )
                    .arg(regressionTest->m_failures_work )
                    .arg( regressionTest->m_failures_fail );
-            list.writeBlock( link.latin1(), link.length() );
+            list.tqwriteBlock( link.latin1(), link.length() );
             list.close();
 	}
     }
@@ -697,12 +697,12 @@ RegressionTest::RegressionTest(KHTMLPart *part, const TQString &baseDir, const T
     TQString s;
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><body>Follow the white rabbit";
-    f.writeBlock( s.latin1(), s.length() );
+    f.tqwriteBlock( s.latin1(), s.length() );
     f.close();
     f.setName( m_outputDir + "/index.html" );
     f.open( IO_WriteOnly | IO_Truncate );
     s = "<html><frameset cols=150,*><frame src=links.html><frame name=content src=empty.html>";
-    f.writeBlock( s.latin1(), s.length() );
+    f.tqwriteBlock( s.latin1(), s.length() );
     f.close();
 
     m_paintBuffer = 0;
@@ -1032,7 +1032,7 @@ void RegressionTest::createLink( const TQString& test, int failures )
     if ( failures & PaintFailure )
         link += "P";
     link += "]<br>\n";
-    list.writeBlock( link.latin1(), link.length() );
+    list.tqwriteBlock( link.latin1(), link.length() );
     list.close();
 }
 
@@ -1056,7 +1056,7 @@ void RegressionTest::doJavascriptReport( const TQString &test )
     text.replace( '\n', "<br>\n" );
     cl += text;
     cl += "</tt></body></html>";
-    compare.writeBlock( cl.latin1(), cl.length() );
+    compare.tqwriteBlock( cl.latin1(), cl.length() );
     compare.close();
 }
 
@@ -1248,7 +1248,7 @@ void RegressionTest::doFailureReport( const TQString& test, int failures )
     cl += "<div id='dom' class='diff'>" + domDiff + "</div>";
 
     cl += "</body></html>";
-    compare.writeBlock( cl.latin1(), cl.length() );
+    compare.tqwriteBlock( cl.latin1(), cl.length() );
     compare.close();
 }
 
diff --git a/kio/kio/kfilterdev.cpp b/kio/kio/kfilterdev.cpp
index 187b16654..c1f4d7953 100644
--- a/kio/kio/kfilterdev.cpp
+++ b/kio/kio/kfilterdev.cpp
@@ -236,7 +236,7 @@ bool KFilterDev::atEnd() const
                                      && d->ungetchBuffer.isEmpty();
 }
 
-TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
+TQT_TQIO_LONG KFilterDev::tqreadBlock( char *data, TQT_TQIO_ULONG maxlen )
 {
     Q_ASSERT ( filter->mode() == IO_ReadOnly );
     //kdDebug(7005) << "KFilterDev::readBlock maxlen=" << maxlen << endl;
@@ -355,7 +355,7 @@ TQ_LONG KFilterDev::readBlock( char *data, TQ_ULONG maxlen )
     return dataReceived;
 }
 
-TQ_LONG KFilterDev::writeBlock( const char *data /*0 to finish*/, TQ_ULONG len )
+TQT_TQIO_LONG KFilterDev::tqwriteBlock( const char *data /*0 to finish*/, TQT_TQIO_ULONG len )
 {
     Q_ASSERT ( filter->mode() == IO_WriteOnly );
     // If we had an error, return 0.
diff --git a/kio/kio/kfilterdev.h b/kio/kio/kfilterdev.h
index 7d8fe5288..edd180ad8 100644
--- a/kio/kio/kfilterdev.h
+++ b/kio/kio/kfilterdev.h
@@ -91,8 +91,8 @@ public:
 
     virtual bool atEnd() const;
 
-    virtual TQ_LONG readBlock( char *data, TQ_ULONG maxlen );
-    virtual TQ_LONG writeBlock( const char *data, TQ_ULONG len );
+    virtual TQT_TQIO_LONG tqreadBlock( char *data, TQT_TQIO_ULONG maxlen );
+    virtual TQT_TQIO_LONG tqwriteBlock( const char *data, TQT_TQIO_ULONG len );
     //int readLine( char *data, uint maxlen );
 
     virtual int getch();
diff --git a/kio/kio/klimitediodevice.h b/kio/kio/klimitediodevice.h
index 1b82e2e49..9d59c890e 100644
--- a/kio/kio/klimitediodevice.h
+++ b/kio/kio/klimitediodevice.h
@@ -73,17 +73,17 @@ public:
     virtual Offset size() const { return m_length; }
 #endif // USE_QT4
 
-    virtual TQ_LONG readBlock ( char * data, TQ_ULONG maxlen )
+    virtual TQT_TQIO_LONG tqreadBlock ( char * data, TQT_TQIO_ULONG maxlen )
     {
-        maxlen = QMIN( maxlen, m_length - at() ); // Apply upper limit
+        maxlen = TQMIN( maxlen, m_length - at() ); // Apply upper limit
         return m_dev->readBlock( data, maxlen );
     }
-    virtual TQ_LONG writeBlock ( const char *, TQ_ULONG ) { return -1; } // unsupported
+    virtual TQT_TQIO_LONG tqwriteBlock ( const char *, TQT_TQIO_ULONG ) { return -1; } // unsupported
     virtual int putch( int ) { return -1; } // unsupported
 
     virtual int getch() {
         char c[2];
-        if ( readBlock(c, 1) == -1)
+        if ( tqreadBlock(c, 1) == -1)
             return -1;
         else
             return c[0];
diff --git a/kio/kio/kzip.cpp b/kio/kio/kzip.cpp
index 1e1dd6241..d7b6123be 100644
--- a/kio/kio/kzip.cpp
+++ b/kio/kio/kzip.cpp
@@ -1114,7 +1114,7 @@ bool KZip::prepareWriting_impl(const TQString &name, const TQString &user,
     }
 
     // delete entries in the filelist with the same filename as the one we want
-    // to save, so that we don�t have duplicate file entries when viewing the zip
+    // to save, so that we don�t have duplicate file entries when viewing the zip
     // with konqi...
     // CAUTION: the old file itself is still in the zip and won't be removed !!!
     TQPtrListIterator<KZipFileEntry> it( d->m_fileList );
diff --git a/kio/tests/jobtest.cpp b/kio/tests/jobtest.cpp
index 93b250075..ecd351a08 100644
--- a/kio/tests/jobtest.cpp
+++ b/kio/tests/jobtest.cpp
@@ -160,7 +160,7 @@ static void createTestFile( const TQString& path )
     TQFile f( path );
     if ( !f.open( IO_WriteOnly ) )
         kdFatal() << "Can't create " << path << endl;
-    f.writeBlock( "Hello world", 11 );
+    f.tqwriteBlock( "Hello world", 11 );
     f.close();
     setTimeStamp( path );
 }
diff --git a/kio/tests/kfiltertest.cpp b/kio/tests/kfiltertest.cpp
index 901dec14e..e070418e4 100644
--- a/kio/tests/kfiltertest.cpp
+++ b/kio/tests/kfiltertest.cpp
@@ -35,7 +35,7 @@ void test_block( const TQString & fileName )
 
     TQByteArray array(1024);
     int n;
-    while ( ( n = dev->readBlock( array.data(), array.size() ) ) )
+    while ( ( n = dev->tqreadBlock( array.data(), array.size() ) ) )
     {
         kdDebug() << "readBlock returned " << n << endl << endl;
         // TQCString s(array,n+1); // Terminate with 0 before printing
@@ -55,9 +55,9 @@ void test_block_write( const TQString & fileName )
     if ( !dev->open( IO_WriteOnly ) ) { kdWarning() << "open failed " << endl; return; }
 
     TQCString s("hello\n");
-    int ret = dev->writeBlock( s, s.size()-1 );
+    int ret = dev->tqwriteBlock( s, s.size()-1 );
     kdDebug() << "writeBlock ret=" << ret << endl;
-    //ret = dev->writeBlock( s, s.size()-1 );
+    //ret = dev->tqwriteBlock( s, s.size()-1 );
     //kdDebug() << "writeBlock ret=" << ret << endl;
     dev->close();
     delete dev;
diff --git a/kmdi/test/mainwidget.cpp b/kmdi/test/mainwidget.cpp
index b7ac2d31d..e1be80cd3 100644
--- a/kmdi/test/mainwidget.cpp
+++ b/kmdi/test/mainwidget.cpp
@@ -90,7 +90,7 @@ MainWidget::~MainWidget()
     TQString s = doc.toString();
     TQFile f("/tmp/dc.txt");
     f.open(IO_ReadWrite);
-    f.writeBlock(s.latin1(), s.length());
+    f.tqwriteBlock(s.latin1(), s.length());
     f.close();
 }
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-01-19 08:24:43 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-01-19 08:24:43 +0000
commit	96a33d90689a46ea58f812d76fdd2eaf93edecfa (patch)
tree	756ca55bffdffc115088699dd1b76c61eb6f64bf
parent	5783baba4a547c443e4392f51c8023d38cb9fe6a (diff)
download	tdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.tar.gz tdelibs-96a33d90689a46ea58f812d76fdd2eaf93edecfa.zip