Update to latest tqt3 automated conversion

18 files changed, 93 insertions, 93 deletions

diff --git a/src/network/qdns.h b/src/network/ntqdns.h
index a14d2024f..96f09d265 100644
--- a/src/network/qdns.h
+++ b/src/network/ntqdns.h
@@ -42,10 +42,10 @@
 #define TQDNS_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qhostaddress.h"
-#include "qsocketnotifier.h"
-#include "qstringlist.h"
+#include "ntqobject.h"
+#include "ntqhostaddress.h"
+#include "ntqsocketnotifier.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qftp.h b/src/network/ntqftp.h
index 475eed1f0..86ba65822 100644
--- a/src/network/qftp.h
+++ b/src/network/ntqftp.h
@@ -42,9 +42,9 @@
 #define TQFTP_H
 
 #ifndef QT_H
-#include "qstring.h" // char*->TQString conversion
-#include "qurlinfo.h"
-#include "qnetworkprotocol.h"
+#include "ntqstring.h" // char*->TQString conversion
+#include "ntqurlinfo.h"
+#include "ntqnetworkprotocol.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qhostaddress.h b/src/network/ntqhostaddress.h
index 09986861a..17de16289 100644
--- a/src/network/qhostaddress.h
+++ b/src/network/ntqhostaddress.h
@@ -42,7 +42,7 @@
 #define TQHOSTADDRESS_H
 
 #ifndef QT_H
-#include "qstring.h"
+#include "ntqstring.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qhttp.h b/src/network/ntqhttp.h
index b71ef105e..f0f9d2ea9 100644
--- a/src/network/qhttp.h
+++ b/src/network/ntqhttp.h
@@ -42,9 +42,9 @@
 #define TQHTTP_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qnetworkprotocol.h"
-#include "qstringlist.h"
+#include "ntqobject.h"
+#include "ntqnetworkprotocol.h"
+#include "ntqstringlist.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
@@ -272,6 +272,6 @@ private:
 };
 
 #define Q_DEFINED_QHTTP
-#include "qwinexport.h"
+#include "ntqwinexport.h"
 #endif
 #endif
diff --git a/src/network/qnetwork.h b/src/network/ntqnetwork.h
index 48a1841db..0565ea514 100644
--- a/src/network/qnetwork.h
+++ b/src/network/ntqnetwork.h
@@ -42,7 +42,7 @@
 #define TQNETWORK_H
 
 #ifndef QT_H
-#include "qglobal.h"
+#include "ntqglobal.h"
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qserversocket.h b/src/network/ntqserversocket.h
index a54b04a7b..b5c2a4b88 100644
--- a/src/network/qserversocket.h
+++ b/src/network/ntqserversocket.h
@@ -42,9 +42,9 @@
 #define TQSERVERSOCKET_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qhostaddress.h"
-#include "qsocketdevice.h" // ### remove or keep for users' convenience?
+#include "ntqobject.h"
+#include "ntqhostaddress.h"
+#include "ntqsocketdevice.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 #ifndef QT_NO_NETWORK
 
diff --git a/src/network/qsocket.h b/src/network/ntqsocket.h
index ee5b38422..2a727dd30 100644
--- a/src/network/qsocket.h
+++ b/src/network/ntqsocket.h
@@ -42,9 +42,9 @@
 #define TQSOCKET_H
 
 #ifndef QT_H
-#include "qobject.h"
-#include "qiodevice.h"
-#include "qhostaddress.h" // int->TQHostAddress conversion
+#include "ntqobject.h"
+#include "ntqiodevice.h"
+#include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qsocketdevice.h b/src/network/ntqsocketdevice.h
index cfb847ce6..bd3d62225 100644
--- a/src/network/qsocketdevice.h
+++ b/src/network/ntqsocketdevice.h
@@ -42,8 +42,8 @@
 #define TQSOCKETDEVICE_H
 
 #ifndef QT_H
-#include "qiodevice.h"
-#include "qhostaddress.h" // int->TQHostAddress conversion
+#include "ntqiodevice.h"
+#include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
 #if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index 1b896e552..e6dafa6c6 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -60,23 +60,23 @@
 # undef socket
 #endif
 
-#include "qdns.h"
+#include "ntqdns.h"
 
 #ifndef QT_NO_DNS
 
-#include "qdatetime.h"
-#include "qdict.h"
-#include "qptrlist.h"
-#include "qstring.h"
-#include "qtimer.h"
-#include "qapplication.h"
-#include "qptrvector.h"
-#include "qstrlist.h"
-#include "qptrdict.h"
-#include "qfile.h"
-#include "qtextstream.h"
-#include "qsocketdevice.h"
-#include "qcleanuphandler.h"
+#include "ntqdatetime.h"
+#include "ntqdict.h"
+#include "ntqptrlist.h"
+#include "ntqstring.h"
+#include "ntqtimer.h"
+#include "ntqapplication.h"
+#include "ntqptrvector.h"
+#include "ntqstrlist.h"
+#include "ntqptrdict.h"
+#include "ntqfile.h"
+#include "ntqtextstream.h"
+#include "ntqsocketdevice.h"
+#include "ntqcleanuphandler.h"
 #include <limits.h>
 #ifdef Q_OS_MAC
 #include "../3rdparty/dlcompat/dlfcn.h"
@@ -1598,7 +1598,7 @@ void TQDnsSocket::answer()
 
 
 /*!
-    \class TQDns qdns.h
+    \class TQDns ntqdns.h
     \brief The TQDns class provides asynchronous DNS lookups.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 78f29e8cd..441cdda5c 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -38,22 +38,22 @@
 **
 **********************************************************************/
 
-#include "qftp.h"
+#include "ntqftp.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL_FTP
 
-#include "qsocket.h"
-#include "qsocketdevice.h"
-#include "qurlinfo.h"
-#include "qurloperator.h"
-#include "qstringlist.h"
-#include "qregexp.h"
-#include "qtimer.h"
-#include "qfileinfo.h"
-#include "qptrdict.h" // binary compatibility
+#include "ntqsocket.h"
+#include "ntqsocketdevice.h"
+#include "ntqurlinfo.h"
+#include "ntqurloperator.h"
+#include "ntqstringlist.h"
+#include "ntqregexp.h"
+#include "ntqtimer.h"
+#include "ntqfileinfo.h"
+#include "ntqptrdict.h" // binary compatibility
 
 #ifndef QT_NO_TEXTCODEC
-#include "qtextcodec.h"
+#include "ntqtextcodec.h"
 #endif
 
 //#define TQFTPPI_DEBUG
@@ -1064,7 +1064,7 @@ static void delete_d( const TQFtp* foo )
  *
  *********************************************************************/
 /*!
-    \class TQFtp qftp.h
+    \class TQFtp ntqftp.h
     \brief The TQFtp class provides an implementation of the FTP protocol.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/qhostaddress.cpp b/src/network/qhostaddress.cpp
index 360045282..43d614cc9 100644
--- a/src/network/qhostaddress.cpp
+++ b/src/network/qhostaddress.cpp
@@ -38,8 +38,8 @@
 **
 **********************************************************************/
 
-#include "qhostaddress.h"
-#include "qstringlist.h"
+#include "ntqhostaddress.h"
+#include "ntqstringlist.h"
 
 #ifndef QT_NO_NETWORK
 class TQHostAddressPrivate
@@ -83,7 +83,7 @@ TQHostAddressPrivate::TQHostAddressPrivate(const Q_IPV6ADDR &a_) : a(0), isIp4(F
 }
 
 /*!
-    \class TQHostAddress qhostaddress.h
+    \class TQHostAddress ntqhostaddress.h
     \brief The TQHostAddress class provides an IP address.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp
index 4d8cc3e53..b8a110e58 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/qhttp.cpp
@@ -38,19 +38,19 @@
 **
 **********************************************************************/
 
-#include "qhttp.h"
+#include "ntqhttp.h"
 
 #ifndef QT_NO_NETWORKPROTOCOL_HTTP
 
-#include "qsocket.h"
-#include "qtextstream.h"
-#include "qmap.h"
-#include "qstring.h"
-#include "qstringlist.h"
-#include "qcstring.h"
-#include "qbuffer.h"
-#include "qurloperator.h"
-#include "qtimer.h"
+#include "ntqsocket.h"
+#include "ntqtextstream.h"
+#include "ntqmap.h"
+#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqcstring.h"
+#include "ntqbuffer.h"
+#include "ntqurloperator.h"
+#include "ntqtimer.h"
 #include "private/qinternal_p.h"
 
 //#define TQHTTP_DEBUG
@@ -332,7 +332,7 @@ void TQHttpCloseRequest::start( TQHttp *http )
  ****************************************************/
 
 /*!
-    \class TQHttpHeader qhttp.h
+    \class TQHttpHeader ntqhttp.h
     \brief The TQHttpHeader class contains header information for HTTP.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -674,7 +674,7 @@ void TQHttpHeader::setContentType( const TQString& type )
  ****************************************************/
 
 /*!
-    \class TQHttpResponseHeader qhttp.h
+    \class TQHttpResponseHeader ntqhttp.h
     \brief The TQHttpResponseHeader class contains response header information for HTTP.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -837,7 +837,7 @@ TQString TQHttpResponseHeader::toString() const
  ****************************************************/
 
 /*!
-    \class TQHttpRequestHeader qhttp.h
+    \class TQHttpRequestHeader ntqhttp.h
     \brief The TQHttpRequestHeader class contains request header information for
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
@@ -1011,7 +1011,7 @@ TQString TQHttpRequestHeader::toString() const
  *
  ****************************************************/
 /*!
-    \class TQHttp qhttp.h
+    \class TQHttp ntqhttp.h
     \brief The TQHttp class provides an implementation of the HTTP protocol.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/qnetwork.cpp b/src/network/qnetwork.cpp
index 5f5d3cdb8..a3e8a7443 100644
--- a/src/network/qnetwork.cpp
+++ b/src/network/qnetwork.cpp
@@ -38,17 +38,17 @@
 **
 **********************************************************************/
 
-#include "qnetwork.h"
+#include "ntqnetwork.h"
 
 #ifndef QT_NO_NETWORK
 
-#include "qnetworkprotocol.h"
+#include "ntqnetworkprotocol.h"
 
 // protocols
-#include "qftp.h"
-#include "qhttp.h"
+#include "ntqftp.h"
+#include "ntqhttp.h"
 
-/*! \file qnetwork.h */
+/*! \file ntqnetwork.h */
 /*!
     \relates TQUrlOperator
 
@@ -56,7 +56,7 @@
     You must call this function before you use TQUrlOperator for
     these protocols.
 
-    This function is declared in \l qnetwork.h.
+    This function is declared in \l ntqnetwork.h.
 */
 void qInitNetworkProtocols()
 {
diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp
index 706be57ee..04dc965ef 100644
--- a/src/network/qserversocket.cpp
+++ b/src/network/qserversocket.cpp
@@ -38,11 +38,11 @@
 **
 **********************************************************************/
 
-#include "qserversocket.h"
+#include "ntqserversocket.h"
 
 #ifndef QT_NO_NETWORK
 
-#include "qsocketnotifier.h"
+#include "ntqsocketnotifier.h"
 
 class TQServerSocketPrivate {
 public:
@@ -54,7 +54,7 @@ public:
 
 
 /*!
-    \class TQServerSocket qserversocket.h
+    \class TQServerSocket ntqserversocket.h
     \brief The TQServerSocket class provides a TCP-based server.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp
index 14e45b7dc..8e69aa7cc 100644
--- a/src/network/qsocket.cpp
+++ b/src/network/qsocket.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "qsocket.h"
+#include "ntqsocket.h"
 #ifndef QT_NO_NETWORK
-#include "qptrlist.h"
-#include "qtimer.h"
-#include "qsocketdevice.h"
-#include "qdns.h"
+#include "ntqptrlist.h"
+#include "ntqtimer.h"
+#include "ntqsocketdevice.h"
+#include "ntqdns.h"
 #include "private/qinternal_p.h"
 
 #include <string.h>
@@ -224,7 +224,7 @@ void TQSocketPrivate::setSocketDevice( TQSocket *q, TQSocketDevice *device )
 }
 
 /*!
-    \class TQSocket qsocket.h
+    \class TQSocket ntqsocket.h
     \brief The TQSocket class provides a buffered TCP connection.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/qsocketdevice.cpp b/src/network/qsocketdevice.cpp
index 270d74571..c09cbb59a 100644
--- a/src/network/qsocketdevice.cpp
+++ b/src/network/qsocketdevice.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "qsocketdevice.h"
+#include "ntqsocketdevice.h"
 #ifndef QT_NO_NETWORK
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 #include <string.h>
 
 
@@ -60,7 +60,7 @@ public:
 
 
 /*!
-    \class TQSocketDevice qsocketdevice.h
+    \class TQSocketDevice ntqsocketdevice.h
     \brief The TQSocketDevice class provides a platform-independent low-level socket API.
 \if defined(commercial)
     It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>.
diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp
index fe7c619cc..a5adfef06 100644
--- a/src/network/qsocketdevice_unix.cpp
+++ b/src/network/qsocketdevice_unix.cpp
@@ -80,11 +80,11 @@ static inline int qt_socket_socket(int domain, int type, int protocol)
 # undef socket
 #endif
 
-#include "qsocketdevice.h"
+#include "ntqsocketdevice.h"
 
 #ifndef QT_NO_NETWORK
 
-#include "qwindowdefs.h"
+#include "ntqwindowdefs.h"
 
 #include <errno.h>
 #include <sys/types.h>
diff --git a/src/network/qt_network.pri b/src/network/qt_network.pri
index 86fcf24d4..537f2b99d 100644
--- a/src/network/qt_network.pri
+++ b/src/network/qt_network.pri
@@ -1,14 +1,14 @@
 # Qt network module
 
 network {
-	HEADERS += $$NETWORK_H/qdns.h \
-		    $$NETWORK_H/qftp.h \
-		    $$NETWORK_H/qhttp.h \
-		    $$NETWORK_H/qhostaddress.h \
-		    $$NETWORK_H/qnetwork.h \
-		    $$NETWORK_H/qserversocket.h \
-		    $$NETWORK_H/qsocket.h \
-		    $$NETWORK_H/qsocketdevice.h
+	HEADERS += $$NETWORK_H/ntqdns.h \
+		    $$NETWORK_H/ntqftp.h \
+		    $$NETWORK_H/ntqhttp.h \
+		    $$NETWORK_H/ntqhostaddress.h \
+		    $$NETWORK_H/ntqnetwork.h \
+		    $$NETWORK_H/ntqserversocket.h \
+		    $$NETWORK_H/ntqsocket.h \
+		    $$NETWORK_H/ntqsocketdevice.h
 	NETWORK_SOURCES	= $$NETWORK_CPP/qdns.cpp \
 		    $$NETWORK_CPP/qftp.cpp \
 		    $$NETWORK_CPP/qhttp.cpp \