Automated update from Qt3

9 files changed, 18 insertions, 18 deletions

diff --git a/src/network/ntqdns.h b/src/network/ntqdns.h
index 96f09d265..fdf255a72 100644
--- a/src/network/ntqdns.h
+++ b/src/network/ntqdns.h
@@ -48,7 +48,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_DNS
 #else
 #define TQM_EXPORT_DNS Q_EXPORT
@@ -61,7 +61,7 @@
 class TQDnsPrivate;
 
 class TQM_EXPORT_DNS TQDns: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum RecordType {
 	None,
@@ -153,7 +153,7 @@ private:
 // TQDnsSocket are sockets that are used for DNS lookup
 
 class TQDnsSocket: public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
     // note: Private not public.  This class contains NO public API.
 protected:
     TQDnsSocket( TQObject *, const char * );
diff --git a/src/network/ntqftp.h b/src/network/ntqftp.h
index 86ba65822..af4036fb6 100644
--- a/src/network/ntqftp.h
+++ b/src/network/ntqftp.h
@@ -47,7 +47,7 @@
 #include "ntqnetworkprotocol.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_FTP
 #else
 #define TQM_EXPORT_FTP Q_EXPORT
@@ -61,7 +61,7 @@ class TQFtpCommand;
 
 class TQM_EXPORT_FTP TQFtp : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQFtp(); // ### TQt 4.0: get rid of this overload
diff --git a/src/network/ntqhostaddress.h b/src/network/ntqhostaddress.h
index 17de16289..2ae4a8ea1 100644
--- a/src/network/ntqhostaddress.h
+++ b/src/network/ntqhostaddress.h
@@ -45,7 +45,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
diff --git a/src/network/ntqhttp.h b/src/network/ntqhttp.h
index f0f9d2ea9..278493506 100644
--- a/src/network/ntqhttp.h
+++ b/src/network/ntqhttp.h
@@ -47,7 +47,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_HTTP
 #define TQM_TEMPLATE_EXTERN_HTTP
 #else
@@ -168,7 +168,7 @@ private:
 
 class TQM_EXPORT_HTTP TQHttp : public TQNetworkProtocol
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQHttp();
diff --git a/src/network/ntqnetwork.h b/src/network/ntqnetwork.h
index 0565ea514..2431b9ef5 100644
--- a/src/network/ntqnetwork.h
+++ b/src/network/ntqnetwork.h
@@ -45,7 +45,7 @@
 #include "ntqglobal.h"
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
diff --git a/src/network/ntqserversocket.h b/src/network/ntqserversocket.h
index b5c2a4b88..7d1510302 100644
--- a/src/network/ntqserversocket.h
+++ b/src/network/ntqserversocket.h
@@ -48,7 +48,7 @@
 #endif // QT_H
 #ifndef QT_NO_NETWORK
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
@@ -59,7 +59,7 @@ class TQServerSocketPrivate;
 
 class TQM_EXPORT_NETWORK TQServerSocket : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQServerSocket( Q_UINT16 port, int backlog = 1,
 		   TQObject *parent=0, const char *name=0 );
diff --git a/src/network/ntqsocket.h b/src/network/ntqsocket.h
index 2a727dd30..545647ee5 100644
--- a/src/network/ntqsocket.h
+++ b/src/network/ntqsocket.h
@@ -47,7 +47,7 @@
 #include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
@@ -60,7 +60,7 @@ class TQSocketDevice;
 
 class TQM_EXPORT_NETWORK TQSocket : public TQObject, public TQIODevice
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Error {
 	ErrConnectionRefused,
@@ -146,7 +146,7 @@ private:
     void         setSocketIntern( int socket );
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSocket( const TQSocket & );
     TQSocket &operator=( const TQSocket & );
 #endif
diff --git a/src/network/ntqsocketdevice.h b/src/network/ntqsocketdevice.h
index bd3d62225..a8a5b83cd 100644
--- a/src/network/ntqsocketdevice.h
+++ b/src/network/ntqsocketdevice.h
@@ -46,7 +46,7 @@
 #include "ntqhostaddress.h" // int->TQHostAddress conversion
 #endif // QT_H
 
-#if !defined( QT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
+#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
 #else
 #define TQM_EXPORT_NETWORK Q_EXPORT
@@ -160,7 +160,7 @@ private:
     Protocol	 getProtocol() const;
 
 private:	// Disabled copy constructor and operator=
-#if defined(Q_DISABLE_COPY)
+#if defined(TQ_DISABLE_COPY)
     TQSocketDevice( const TQSocketDevice & );
     TQSocketDevice &operator=( const TQSocketDevice & );
 #endif
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 441cdda5c..ec09fde4e 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -64,7 +64,7 @@ class TQFtpPI;
 
 class TQFtpDTP : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum ConnectState {
@@ -158,7 +158,7 @@ private:
 
 class TQFtpPI : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TQFtpPI( TQObject *parent = 0 );