Automated update from Qt3

1 files changed, 31 insertions, 31 deletions

diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 34d9acea2..385156f0b 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -43,11 +43,11 @@
 
 #define TQT_REAL_TQT 1
 
-#define QT_VERSION_STR   "3.4.0"
+#define TQT_VERSION_STR   "3.4.0"
 /*
-   QT_VERSION is (major << 16) + (minor << 8) + patch.
+   TQT_VERSION is (major << 16) + (minor << 8) + patch.
  */
-#define QT_VERSION 0x030400
+#define TQT_VERSION 0x030400
 
 /*
    The operating system, must be one of: (Q_OS_x)
@@ -321,7 +321,7 @@
    members of a packed struct. (Pointers are OK, because then you
    supposedly know what you are doing.) */
 #  if (defined(__arm__) || defined(__ARMEL__)) && !defined(__ARM_EABI__) && !defined(QT_MOC_CPP)
-#    define Q_PACKED __attribute__ ((packed))
+#    define TQ_PACKED __attribute__ ((packed))
 #    if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 || __GNUC__ > 3
 #      define Q_NO_PACKED_REFERENCE
 #    endif
@@ -548,8 +548,8 @@
 #  error "TQt has not been tested with this compiler - talk to qt-bugs@trolltech.com"
 #endif
 
-#ifndef Q_PACKED
-#  define Q_PACKED
+#ifndef TQ_PACKED
+#  define TQ_PACKED
 #endif
 
 
@@ -607,10 +607,10 @@
    Some classes do not permit copies to be made of an object.
    These classes contains a private copy constructor and operator=
    to disable copying (the compiler gives an error message).
-   Undefine Q_DISABLE_COPY to turn off this checking.
+   Undefine TQ_DISABLE_COPY to turn off this checking.
 */
 
-#define Q_DISABLE_COPY
+#define TQ_DISABLE_COPY
 
 #if defined(__cplusplus)
 
@@ -692,7 +692,7 @@ const bool true = TRUE;
 #define TQMIN(a, b)	((a) < (b) ? (a) : (b))
 #define TQABS(a)	((a) >= 0  ? (a) : -(a))
 
-inline int qRound( double d )
+inline int tqRound( double d )
 {
     return d >= 0.0 ? int(d + 0.5) : int( d - ((int)d-1) + 0.5 ) + ((int)d-1);
 }
@@ -726,13 +726,13 @@ typedef long			Q_LONG;		// word up to 64 bit signed
 typedef unsigned long		Q_ULONG;	// word up to 64 bit unsigned
 #endif
 #if defined(Q_OS_WIN) && !defined(Q_CC_GNU)
-#  define Q_INT64_C(c) 		c ## i64	// signed 64 bit constant
-#  define Q_UINT64_C(c)		c ## ui64	// unsigned 64 bit constant
+#  define TQ_INT64_C(c) 		c ## i64	// signed 64 bit constant
+#  define TQ_UINT64_C(c)		c ## ui64	// unsigned 64 bit constant
 typedef __int64			Q_INT64;	// 64 bit signed
 typedef unsigned __int64	Q_UINT64;	// 64 bit unsigned
 #else
-#  define Q_INT64_C(c) 		c ## LL		// signed 64 bit constant
-#  define Q_UINT64_C(c)		c ## ULL	// unsigned 64 bit constant
+#  define TQ_INT64_C(c) 		c ## LL		// signed 64 bit constant
+#  define TQ_UINT64_C(c)		c ## ULL	// unsigned 64 bit constant
 typedef long long		Q_INT64;	// 64 bit signed
 typedef unsigned long long	Q_UINT64;	// 64 bit unsigned
 #endif
@@ -782,37 +782,37 @@ class TQDataStream;
 #endif
 
 
-#ifndef QT_BUILD_KEY
-#define QT_BUILD_KEY "unspecified"
+#ifndef TQT_BUILD_KEY
+#define TQT_BUILD_KEY "unspecified"
 #endif
 
 // prune to local config
 #include "ntqmodules.h"
-#ifndef QT_MODULE_DIALOGS
+#ifndef TQT_MODULE_DIALOGS
 # define QT_NO_DIALOG
 #endif
-#ifndef QT_MODULE_ICONVIEW
+#ifndef TQT_MODULE_ICONVIEW
 # define QT_NO_ICONVIEW
 #endif
-#ifndef QT_MODULE_WORKSPACE
+#ifndef TQT_MODULE_WORKSPACE
 # define QT_NO_WORKSPACE
 #endif
-#ifndef QT_MODULE_NETWORK
+#ifndef TQT_MODULE_NETWORK
 #define QT_NO_NETWORK
 #endif
-#ifndef QT_MODULE_CANVAS
+#ifndef TQT_MODULE_CANVAS
 # define QT_NO_CANVAS
 #endif
-#ifndef QT_MODULE_TABLE
+#ifndef TQT_MODULE_TABLE
 #define QT_NO_TABLE
 #endif
-#ifndef QT_MODULE_XML
+#ifndef TQT_MODULE_XML
 # define QT_NO_XML
 #endif
-#ifndef QT_MODULE_OPENGL
+#ifndef TQT_MODULE_OPENGL
 # define QT_NO_OPENGL
 #endif
-#if !defined(QT_MODULE_SQL)
+#if !defined(TQT_MODULE_SQL)
 # define QT_NO_SQL
 #endif
 
@@ -863,7 +863,7 @@ class TQDataStream;
 #    define Q_EXPORT  __declspec(dllexport)
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
-#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  elif defined(QT_DLL)		/* use a TQt DLL library */
 #    define Q_EXPORT  __declspec(dllimport)
 #    define Q_TEMPLATEDLL
@@ -874,18 +874,18 @@ class TQDataStream;
 #        define Q_TEMPLATE_EXTERN
 #      endif
 #    endif
-#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  endif
 #elif defined(Q_OS_LINUX) && defined(Q_CC_BOR)
 #  if defined(QT_SHARED)	/* create a TQt shared library */
 #    define Q_EXPORT  __declspec(dllexport)
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
-#    undef  Q_DISABLE_COPY	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  else
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
-#    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
+#    undef  TQ_DISABLE_COPY 	/* avoid unresolved externals */
 #  endif
 #elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
 #    define Q_EXPORT __attribute__((visibility("default")))
@@ -1042,14 +1042,14 @@ Q_EXPORT void fatal( const char *, ... )	// print fatal message and exit
 Q_EXPORT bool qt_check_pointer( bool c, const char *, int );
 
 #if defined(QT_CHECK_NULL)
-#  define Q_CHECK_PTR(p) (qt_check_pointer((p)==0,__FILE__,__LINE__))
+#  define TQ_CHECK_PTR(p) (qt_check_pointer((p)==0,__FILE__,__LINE__))
 #else
-#  define Q_CHECK_PTR(p)
+#  define TQ_CHECK_PTR(p)
 #endif
 
 #if !defined(QT_NO_COMPAT)			// compatibility with TQt 2
 #  if !defined(CHECK_PTR)
-#    define CHECK_PTR(x) Q_CHECK_PTR(x)
+#    define CHECK_PTR(x) TQ_CHECK_PTR(x)
 #  endif
 #endif // QT_NO_COMPAT