Replace Q_EXPORT_*/Q_EXTERN defines with TQ_EXPORT_*/TQ_EXTERN

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

42 files changed, 317 insertions, 317 deletions

diff --git a/src/tools/ntqbitarray.h b/src/tools/ntqbitarray.h
index c63e4ac3..b6e6e545 100644
--- a/src/tools/ntqbitarray.h
+++ b/src/tools/ntqbitarray.h
@@ -52,7 +52,7 @@
 
 class TQBitArray;
 
-class Q_EXPORT TQBitVal
+class TQ_EXPORT TQBitVal
 {
 private:
     TQBitArray *array;
@@ -69,7 +69,7 @@ public:
   TQBitArray class
  *****************************************************************************/
 
-class Q_EXPORT TQBitArray : public TQByteArray
+class TQ_EXPORT TQBitArray : public TQByteArray
 {
 public:
     TQBitArray();
@@ -135,9 +135,9 @@ inline bool TQBitArray::operator[]( int index ) const
   Misc. TQBitArray operator functions
  *****************************************************************************/
 
-Q_EXPORT TQBitArray operator&( const TQBitArray &, const TQBitArray & );
-Q_EXPORT TQBitArray operator|( const TQBitArray &, const TQBitArray & );
-Q_EXPORT TQBitArray operator^( const TQBitArray &, const TQBitArray & );
+TQ_EXPORT TQBitArray operator&( const TQBitArray &, const TQBitArray & );
+TQ_EXPORT TQBitArray operator|( const TQBitArray &, const TQBitArray & );
+TQ_EXPORT TQBitArray operator^( const TQBitArray &, const TQBitArray & );
 
 
 inline TQBitVal::operator int()
@@ -162,8 +162,8 @@ inline TQBitVal &TQBitVal::operator=( bool v )
   TQBitArray stream functions
  *****************************************************************************/
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBitArray & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBitArray & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBitArray & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQBitArray & );
 #endif
 
 #endif // TQBITARRAY_H
diff --git a/src/tools/ntqbuffer.h b/src/tools/ntqbuffer.h
index e50f1917..e4ba2411 100644
--- a/src/tools/ntqbuffer.h
+++ b/src/tools/ntqbuffer.h
@@ -47,7 +47,7 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQBuffer : public TQIODevice
+class TQ_EXPORT TQBuffer : public TQIODevice
 {
 public:
     TQBuffer();
diff --git a/src/tools/ntqcstring.h b/src/tools/ntqcstring.h
index e009b0c0..e0054bf3 100644
--- a/src/tools/ntqcstring.h
+++ b/src/tools/ntqcstring.h
@@ -53,38 +53,38 @@
   Safe and portable C string functions; extensions to standard string.h
  *****************************************************************************/
 
-Q_EXPORT void *tqmemmove( void *dst, const void *src, uint len );
+TQ_EXPORT void *tqmemmove( void *dst, const void *src, uint len );
 
-Q_EXPORT char *tqstrdup( const char * );
+TQ_EXPORT char *tqstrdup( const char * );
 
-Q_EXPORT inline uint tqstrlen( const char *str )
+TQ_EXPORT inline uint tqstrlen( const char *str )
 { return str ? (uint)strlen(str) : 0u; }
 
-Q_EXPORT inline char *qstrcpy( char *dst, const char *src )
+TQ_EXPORT inline char *qstrcpy( char *dst, const char *src )
 { return src ? strcpy(dst, src) : 0; }
 
-Q_EXPORT char *tqstrncpy( char *dst, const char *src, uint len );
+TQ_EXPORT char *tqstrncpy( char *dst, const char *src, uint len );
 
-Q_EXPORT inline int qstrcmp( const char *str1, const char *str2 )
+TQ_EXPORT inline int qstrcmp( const char *str1, const char *str2 )
 {
     return ( str1 && str2 ) ? strcmp( str1, str2 )
 			    : ( str1 ? 1 : ( str2 ? -1 : 0 ) );
 }
 
-Q_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len )
+TQ_EXPORT inline int tqstrncmp( const char *str1, const char *str2, uint len )
 {
     return ( str1 && str2 ) ? strncmp( str1, str2, len )
 			    : ( str1 ? 1 : ( str2 ? -1 : 0 ) );
 }
 
-Q_EXPORT int tqstricmp( const char *, const char * );
+TQ_EXPORT int tqstricmp( const char *, const char * );
 
-Q_EXPORT int tqstrnicmp( const char *, const char *, uint len );
+TQ_EXPORT int tqstrnicmp( const char *, const char *, uint len );
 
 
 // tqChecksum: Internet checksum
 
-Q_EXPORT TQ_UINT16 tqChecksum( const char *s, uint len );
+TQ_EXPORT TQ_UINT16 tqChecksum( const char *s, uint len );
 
 /*****************************************************************************
   TQByteArray class
@@ -106,11 +106,11 @@ typedef TQMemArray<char> TQByteArray;
 #endif
 
 #ifndef TQT_NO_COMPRESS
-Q_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes );
-Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes );
-Q_EXPORT inline TQByteArray tqCompress( const TQByteArray& data)
+TQ_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes );
+TQ_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes );
+TQ_EXPORT inline TQByteArray tqCompress( const TQByteArray& data)
 { return tqCompress( (const uchar*)data.data(), data.size() ); }
-Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data )
+TQ_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data )
 { return tqUncompress( (const uchar*)data.data(), data.size() ); }
 #endif
 
@@ -118,8 +118,8 @@ Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data )
   TQByteArray stream functions
  *****************************************************************************/
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQByteArray & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQByteArray & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & );
 #endif
 
 /*****************************************************************************
@@ -128,7 +128,7 @@ Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & );
 
 class TQRegExp;
 
-class Q_EXPORT TQCString : public TQByteArray	// C string class
+class TQ_EXPORT TQCString : public TQByteArray	// C string class
 {
 public:
     TQCString() {}				// make null string
@@ -230,8 +230,8 @@ private:
   TQCString stream functions
  *****************************************************************************/
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCString & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCString & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCString & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQCString & );
 #endif
 
 /*****************************************************************************
@@ -288,61 +288,61 @@ inline TQCString::operator const char *() const
   TQCString non-member operators
  *****************************************************************************/
 
-Q_EXPORT inline bool operator==( const TQCString &s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator==( const TQCString &s1, const TQCString &s2 )
 { return qstrcmp( s1.data(), s2.data() ) == 0; }
 
-Q_EXPORT inline bool operator==( const TQCString &s1, const char *s2 )
+TQ_EXPORT inline bool operator==( const TQCString &s1, const char *s2 )
 { return qstrcmp( s1.data(), s2 ) == 0; }
 
-Q_EXPORT inline bool operator==( const char *s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator==( const char *s1, const TQCString &s2 )
 { return qstrcmp( s1, s2.data() ) == 0; }
 
-Q_EXPORT inline bool operator!=( const TQCString &s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator!=( const TQCString &s1, const TQCString &s2 )
 { return qstrcmp( s1.data(), s2.data() ) != 0; }
 
-Q_EXPORT inline bool operator!=( const TQCString &s1, const char *s2 )
+TQ_EXPORT inline bool operator!=( const TQCString &s1, const char *s2 )
 { return qstrcmp( s1.data(), s2 ) != 0; }
 
-Q_EXPORT inline bool operator!=( const char *s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator!=( const char *s1, const TQCString &s2 )
 { return qstrcmp( s1, s2.data() ) != 0; }
 
-Q_EXPORT inline bool operator<( const TQCString &s1, const TQCString& s2 )
+TQ_EXPORT inline bool operator<( const TQCString &s1, const TQCString& s2 )
 { return qstrcmp( s1.data(), s2.data() ) < 0; }
 
-Q_EXPORT inline bool operator<( const TQCString &s1, const char *s2 )
+TQ_EXPORT inline bool operator<( const TQCString &s1, const char *s2 )
 { return qstrcmp( s1.data(), s2 ) < 0; }
 
-Q_EXPORT inline bool operator<( const char *s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator<( const char *s1, const TQCString &s2 )
 { return qstrcmp( s1, s2.data() ) < 0; }
 
-Q_EXPORT inline bool operator<=( const TQCString &s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator<=( const TQCString &s1, const TQCString &s2 )
 { return qstrcmp( s1.data(), s2.data() ) <= 0; }
 
-Q_EXPORT inline bool operator<=( const TQCString &s1, const char *s2 )
+TQ_EXPORT inline bool operator<=( const TQCString &s1, const char *s2 )
 { return qstrcmp( s1.data(), s2 ) <= 0; }
 
-Q_EXPORT inline bool operator<=( const char *s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator<=( const char *s1, const TQCString &s2 )
 { return qstrcmp( s1, s2.data() ) <= 0; }
 
-Q_EXPORT inline bool operator>( const TQCString &s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator>( const TQCString &s1, const TQCString &s2 )
 { return qstrcmp( s1.data(), s2.data() ) > 0; }
 
-Q_EXPORT inline bool operator>( const TQCString &s1, const char *s2 )
+TQ_EXPORT inline bool operator>( const TQCString &s1, const char *s2 )
 { return qstrcmp( s1.data(), s2 ) > 0; }
 
-Q_EXPORT inline bool operator>( const char *s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator>( const char *s1, const TQCString &s2 )
 { return qstrcmp( s1, s2.data() ) > 0; }
 
-Q_EXPORT inline bool operator>=( const TQCString &s1, const TQCString& s2 )
+TQ_EXPORT inline bool operator>=( const TQCString &s1, const TQCString& s2 )
 { return qstrcmp( s1.data(), s2.data() ) >= 0; }
 
-Q_EXPORT inline bool operator>=( const TQCString &s1, const char *s2 )
+TQ_EXPORT inline bool operator>=( const TQCString &s1, const char *s2 )
 { return qstrcmp( s1.data(), s2 ) >= 0; }
 
-Q_EXPORT inline bool operator>=( const char *s1, const TQCString &s2 )
+TQ_EXPORT inline bool operator>=( const char *s1, const TQCString &s2 )
 { return qstrcmp( s1, s2.data() ) >= 0; }
 
-Q_EXPORT inline const TQCString operator+( const TQCString &s1,
+TQ_EXPORT inline const TQCString operator+( const TQCString &s1,
 					  const TQCString &s2 )
 {
     TQCString tmp( s1.data() );
@@ -350,28 +350,28 @@ Q_EXPORT inline const TQCString operator+( const TQCString &s1,
     return tmp;
 }
 
-Q_EXPORT inline const TQCString operator+( const TQCString &s1, const char *s2 )
+TQ_EXPORT inline const TQCString operator+( const TQCString &s1, const char *s2 )
 {
     TQCString tmp( s1.data() );
     tmp += s2;
     return tmp;
 }
 
-Q_EXPORT inline const TQCString operator+( const char *s1, const TQCString &s2 )
+TQ_EXPORT inline const TQCString operator+( const char *s1, const TQCString &s2 )
 {
     TQCString tmp( s1 );
     tmp += s2;
     return tmp;
 }
 
-Q_EXPORT inline const TQCString operator+( const TQCString &s1, char c2 )
+TQ_EXPORT inline const TQCString operator+( const TQCString &s1, char c2 )
 {
     TQCString tmp( s1.data() );
     tmp += c2;
     return tmp;
 }
 
-Q_EXPORT inline const TQCString operator+( char c1, const TQCString &s2 )
+TQ_EXPORT inline const TQCString operator+( char c1, const TQCString &s2 )
 {
     TQCString tmp;
     tmp += c1;
diff --git a/src/tools/ntqdatastream.h b/src/tools/ntqdatastream.h
index 47c6c2d3..9cd74f66 100644
--- a/src/tools/ntqdatastream.h
+++ b/src/tools/ntqdatastream.h
@@ -47,7 +47,7 @@
 #endif // QT_H
 
 #ifndef TQT_NO_DATASTREAM
-class Q_EXPORT TQDataStream				// data stream class
+class TQ_EXPORT TQDataStream				// data stream class
 {
 public:
     TQDataStream();
diff --git a/src/tools/ntqdatetime.h b/src/tools/ntqdatetime.h
index f4d989d1..f64a86ec 100644
--- a/src/tools/ntqdatetime.h
+++ b/src/tools/ntqdatetime.h
@@ -52,7 +52,7 @@
   TQDate class
  *****************************************************************************/
 
-class Q_EXPORT TQDate
+class TQ_EXPORT TQDate
 {
 public:
     TQDate() { jd = 0; }
@@ -114,8 +114,8 @@ private:
     uint	 jd;
     friend class TQDateTime;
 #ifndef TQT_NO_DATASTREAM
-    friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & );
-    friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & );
+    friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & );
+    friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & );
 #endif
 };
 
@@ -124,7 +124,7 @@ private:
   TQTime class
  *****************************************************************************/
 
-class Q_EXPORT TQTime
+class TQ_EXPORT TQTime
 {
 public:
     TQTime() { ds=0; }				// set null time
@@ -175,8 +175,8 @@ private:
     uint   ds;
     friend class TQDateTime;
 #ifndef TQT_NO_DATASTREAM
-    friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & );
-    friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & );
+    friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & );
+    friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & );
 #endif
 };
 
@@ -185,7 +185,7 @@ private:
   TQDateTime class
  *****************************************************************************/
 
-class Q_EXPORT TQDateTime
+class TQ_EXPORT TQDateTime
 {
 public:
     TQDateTime() {}				// set null date and null time
@@ -231,8 +231,8 @@ private:
     TQDate  d;
     TQTime  t;
 #ifndef TQT_NO_DATASTREAM
-    friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime &);
-    friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & );
+    friend TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime &);
+    friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & );
 #endif
 };
 
@@ -242,12 +242,12 @@ private:
  *****************************************************************************/
 
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & );
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & );
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & );
 #endif // TQT_NO_DATASTREAM
 
 #endif // TQDATETIME_H
diff --git a/src/tools/ntqdir.h b/src/tools/ntqdir.h
index 332cc960..657f1f7e 100644
--- a/src/tools/ntqdir.h
+++ b/src/tools/ntqdir.h
@@ -55,7 +55,7 @@ class TQStringList;
 template <class T> class TQDeepCopy;
 
 
-class Q_EXPORT TQDir
+class TQ_EXPORT TQDir
 {
 public:
     enum FilterSpec { Dirs	    = 0x001,
diff --git a/src/tools/ntqfile.h b/src/tools/ntqfile.h
index c007d5cb..0fc684b9 100644
--- a/src/tools/ntqfile.h
+++ b/src/tools/ntqfile.h
@@ -50,7 +50,7 @@
 class TQDir;
 class TQFilePrivate;
 
-class Q_EXPORT TQFile : public TQIODevice			// file I/O device class
+class TQ_EXPORT TQFile : public TQIODevice			// file I/O device class
 {
 public:
     TQFile();
diff --git a/src/tools/ntqfileinfo.h b/src/tools/ntqfileinfo.h
index 86cfe6b2..eab7f63d 100644
--- a/src/tools/ntqfileinfo.h
+++ b/src/tools/ntqfileinfo.h
@@ -52,7 +52,7 @@ struct TQFileInfoCache;
 template <class T> class TQDeepCopy;
 
 
-class Q_EXPORT TQFileInfo
+class TQ_EXPORT TQFileInfo
 {
 public:
     enum PermissionSpec {
diff --git a/src/tools/ntqgarray.h b/src/tools/ntqgarray.h
index 76a5cf34..4d239dd6 100644
--- a/src/tools/ntqgarray.h
+++ b/src/tools/ntqgarray.h
@@ -46,7 +46,7 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQGArray					// generic array
+class TQ_EXPORT TQGArray					// generic array
 {
 friend class TQBuffer;
 public:
diff --git a/src/tools/ntqgcache.h b/src/tools/ntqgcache.h
index d9a3e1ed..cbcb0723 100644
--- a/src/tools/ntqgcache.h
+++ b/src/tools/ntqgcache.h
@@ -53,7 +53,7 @@ class TQCListIt;
 class TQCDict;
 
 
-class Q_EXPORT TQGCache : public TQPtrCollection	// generic LRU cache
+class TQ_EXPORT TQGCache : public TQPtrCollection	// generic LRU cache
 {
 friend class TQGCacheIterator;
 protected:
@@ -98,7 +98,7 @@ private:
 };
 
 
-class Q_EXPORT TQGCacheIterator			// generic cache iterator
+class TQ_EXPORT TQGCacheIterator			// generic cache iterator
 {
 protected:
     TQGCacheIterator( const TQGCache & );
diff --git a/src/tools/ntqgdict.h b/src/tools/ntqgdict.h
index ace621ab..c3f8fb36 100644
--- a/src/tools/ntqgdict.h
+++ b/src/tools/ntqgdict.h
@@ -104,7 +104,7 @@ private:
 };
 
 
-class Q_EXPORT TQGDict : public TQPtrCollection	// generic dictionary class
+class TQ_EXPORT TQGDict : public TQPtrCollection	// generic dictionary class
 {
 public:
     uint	count() const	{ return numItems; }
@@ -167,7 +167,7 @@ private:
 };
 
 
-class Q_EXPORT TQGDictIterator			// generic dictionary iterator
+class TQ_EXPORT TQGDictIterator			// generic dictionary iterator
 {
 friend class TQGDict;
 public:
diff --git a/src/tools/ntqglist.h b/src/tools/ntqglist.h
index a3fce491..247c4f68 100644
--- a/src/tools/ntqglist.h
+++ b/src/tools/ntqglist.h
@@ -45,7 +45,7 @@
 #include "ntqptrcollection.h"
 #endif // QT_H
 
-class Q_EXPORT TQLNode
+class TQ_EXPORT TQLNode
 {
 friend class TQGList;
 friend class TQGListIterator;
@@ -63,7 +63,7 @@ class TQMutex;
 class TQGListPrivate;
 class TQGListIteratorList; // internal helper class
 
-class Q_EXPORT TQGList : public TQPtrCollection	// doubly linked generic list
+class TQ_EXPORT TQGList : public TQPtrCollection	// doubly linked generic list
 {
 friend class TQGListIterator;
 friend class TQGListIteratorList;
@@ -212,15 +212,15 @@ inline TQPtrCollection::Item TQGList::clast() const
  *****************************************************************************/
 
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQGList & );
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGList & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQGList & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGList & );
 #endif
 
 /*****************************************************************************
   TQGListIterator class
  *****************************************************************************/
 
-class Q_EXPORT TQGListIterator			// TQGList iterator
+class TQ_EXPORT TQGListIterator			// TQGList iterator
 {
 friend class TQGList;
 friend class TQGListIteratorList;
@@ -265,7 +265,7 @@ inline TQPtrCollection::Item TQGListIterator::get() const
     return curNode ? curNode->data : 0;
 }
 
-class Q_EXPORT TQGListStdIterator
+class TQ_EXPORT TQGListStdIterator
 {
 public:
     inline TQGListStdIterator( TQLNode* n ) : node( n ){}
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 040d846b..f249b705 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -846,12 +846,12 @@ class TQString;
 #    if defined(QT_DLL)
 #      undef QT_DLL
 #    endif
-#    define Q_EXPORT  __declspec(dllexport)
+#    define TQ_EXPORT  __declspec(dllexport)
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
 #    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
 #  elif defined(QT_DLL)		/* use a TQt DLL library */
-#    define Q_EXPORT  __declspec(dllimport)
+#    define TQ_EXPORT  __declspec(dllimport)
 #    define Q_TEMPLATEDLL
 #    ifndef Q_TEMPLATE_EXTERN
 #      if defined(Q_CC_MSVC_NET)
@@ -864,7 +864,7 @@ class TQString;
 #  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 TQ_EXPORT  __declspec(dllexport)
 #    define Q_TEMPLATEDLL
 #    define Q_TEMPLATE_EXTERN
 #    undef  TQ_DISABLE_COPY	/* avoid unresolved externals */
@@ -874,7 +874,7 @@ class TQString;
 #    undef  TQ_DISABLE_COPY 	/* avoid unresolved externals */
 #  endif
 #elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
-#    define Q_EXPORT __attribute__((visibility("default")))
+#    define TQ_EXPORT __attribute__((visibility("default")))
 #    undef QT_MAKEDLL		/* ignore these for other platforms */
 #    undef QT_DLL
 #else
@@ -882,8 +882,8 @@ class TQString;
 #  undef QT_DLL
 #endif
 
-#ifndef Q_EXPORT
-#  define Q_EXPORT
+#ifndef TQ_EXPORT
+#  define TQ_EXPORT
 #endif
 
 
@@ -892,7 +892,7 @@ class TQString;
 //
 
 #if defined(Q_WS_WIN)
-extern Q_EXPORT bool qt_winunicode;
+extern TQ_EXPORT bool qt_winunicode;
 #endif
 
 
@@ -900,13 +900,13 @@ extern Q_EXPORT bool qt_winunicode;
 // System information
 //
 
-Q_EXPORT const char *tqVersion();
-Q_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian );
-Q_EXPORT bool tqSharedBuild();
+TQ_EXPORT const char *tqVersion();
+TQ_EXPORT bool tqSysInfo( int *wordSize, bool *bigEndian );
+TQ_EXPORT bool tqSharedBuild();
 #if defined(Q_OS_MAC)
 int qMacVersion();
 #elif defined(Q_WS_WIN)
-Q_EXPORT int qWinVersion();
+TQ_EXPORT int qWinVersion();
 #if defined(UNICODE)
 #define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi }
 #define QT_WA_INLINE( uni, ansi ) ( qt_winunicode ? uni : ansi )
@@ -961,31 +961,31 @@ Q_EXPORT int qWinVersion();
 #endif
 
 
-Q_EXPORT void tqDebug( const TQString& );     // print debug message
-Q_EXPORT void tqDebug( const TQCString& );    // print debug message
-Q_EXPORT void tqDebug( const char *, ... )    // print debug message
+TQ_EXPORT void tqDebug( const TQString& );     // print debug message
+TQ_EXPORT void tqDebug( const TQCString& );    // print debug message
+TQ_EXPORT void tqDebug( const char *, ... )    // print debug message
 #if defined(Q_CC_GNU) && !defined(__INSURE__)
     __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
 
-Q_EXPORT void tqWarning( const TQString& );   // print warning message
-Q_EXPORT void tqWarning( const TQCString& );  // print warning message
-Q_EXPORT void tqWarning( const char *, ... )  // print warning message
+TQ_EXPORT void tqWarning( const TQString& );   // print warning message
+TQ_EXPORT void tqWarning( const TQCString& );  // print warning message
+TQ_EXPORT void tqWarning( const char *, ... )  // print warning message
 #if defined(Q_CC_GNU) && !defined(__INSURE__)
     __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
 
-Q_EXPORT void tqFatal( const TQString& );     // print fatal message and exit
-Q_EXPORT void tqFatal( const TQCString& );    // print fatal message and exit
-Q_EXPORT void tqFatal( const char *, ... )    // print fatal message and exit
+TQ_EXPORT void tqFatal( const TQString& );     // print fatal message and exit
+TQ_EXPORT void tqFatal( const TQCString& );    // print fatal message and exit
+TQ_EXPORT void tqFatal( const char *, ... )    // print fatal message and exit
 #if defined(Q_CC_GNU)
     __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
 
-Q_EXPORT void tqSystemWarning( const char *, int code = -1 );
+TQ_EXPORT void tqSystemWarning( const char *, int code = -1 );
 
 
 #if !defined(Q_ASSERT)
@@ -1009,7 +1009,7 @@ Q_EXPORT void tqSystemWarning( const char *, int code = -1 );
 #endif // TQT_NO_COMPAT
 
 
-Q_EXPORT bool tqt_check_pointer( bool c, const char *, int );
+TQ_EXPORT bool tqt_check_pointer( bool c, const char *, int );
 
 #if defined(QT_CHECK_NULL)
 #  define TQ_CHECK_PTR(p) (tqt_check_pointer((p)==0,__FILE__,__LINE__))
@@ -1020,34 +1020,34 @@ Q_EXPORT bool tqt_check_pointer( bool c, const char *, int );
 enum TQtMsgType { TQtDebugMsg, TQtWarningMsg, TQtFatalMsg };
 
 typedef void (*TQtMsgHandler)(TQtMsgType, const char *);
-Q_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler );
+TQ_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler );
 
 #if !defined(TQT_NO_COMPAT)			// compatibility with TQt 2
 typedef TQtMsgHandler msg_handler;
 #endif // TQT_NO_COMPAT
 
-Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE );
+TQ_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE );
 
-Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc,
+TQ_EXPORT void tqObsolete( const char *obj, const char *oldfunc,
 		   const char *newfunc );
-Q_EXPORT void tqObsolete( const char *obj, const char *oldfunc );
-Q_EXPORT void tqObsolete( const char *message );
+TQ_EXPORT void tqObsolete( const char *obj, const char *oldfunc );
+TQ_EXPORT void tqObsolete( const char *message );
 
 
 //
 // Install paths from configure
 //
 
-Q_EXPORT const char *tqInstallPath();
-Q_EXPORT const char *tqInstallPathDocs();
-Q_EXPORT const char *tqInstallPathHeaders();
-Q_EXPORT const char *tqInstallPathLibs();
-Q_EXPORT const char *tqInstallPathBins();
-Q_EXPORT const char *tqInstallPathPlugins();
-Q_EXPORT const char *tqInstallPathData();
-Q_EXPORT const char *tqInstallPathTranslations();
-Q_EXPORT const char *tqInstallPathSysconf();
-Q_EXPORT const char *tqInstallPathShare();
+TQ_EXPORT const char *tqInstallPath();
+TQ_EXPORT const char *tqInstallPathDocs();
+TQ_EXPORT const char *tqInstallPathHeaders();
+TQ_EXPORT const char *tqInstallPathLibs();
+TQ_EXPORT const char *tqInstallPathBins();
+TQ_EXPORT const char *tqInstallPathPlugins();
+TQ_EXPORT const char *tqInstallPathData();
+TQ_EXPORT const char *tqInstallPathTranslations();
+TQ_EXPORT const char *tqInstallPathSysconf();
+TQ_EXPORT const char *tqInstallPathShare();
 
 #endif /* __cplusplus */
 
diff --git a/src/tools/ntqgvector.h b/src/tools/ntqgvector.h
index ad4b81f9..4702c0e4 100644
--- a/src/tools/ntqgvector.h
+++ b/src/tools/ntqgvector.h
@@ -46,7 +46,7 @@
 #endif // QT_H
 
 
-class Q_EXPORT TQGVector : public TQPtrCollection	// generic vector
+class TQ_EXPORT TQGVector : public TQPtrCollection	// generic vector
 {
 friend class TQGList;				// needed by TQGList::toVector
 public:
@@ -117,8 +117,8 @@ private:
  *****************************************************************************/
 
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQGVector & );
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGVector & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQGVector & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGVector & );
 #endif
 
 #endif // TQGVECTOR_H
diff --git a/src/tools/ntqiodevice.h b/src/tools/ntqiodevice.h
index 543ab851..c9001bc1 100644
--- a/src/tools/ntqiodevice.h
+++ b/src/tools/ntqiodevice.h
@@ -88,7 +88,7 @@
 #define IO_UnspecifiedError	8		// unspecified error
 
 
-class Q_EXPORT TQIODevice
+class TQ_EXPORT TQIODevice
 {
 public:
     typedef TQ_ULONG Offset;
diff --git a/src/tools/ntqlibrary.h b/src/tools/ntqlibrary.h
index 046d8685..df9af20b 100644
--- a/src/tools/ntqlibrary.h
+++ b/src/tools/ntqlibrary.h
@@ -49,7 +49,7 @@
 
 class TQLibraryPrivate;
 
-class Q_EXPORT TQLibrary
+class TQ_EXPORT TQLibrary
 {
 public:
     TQLibrary( const TQString& filename );
diff --git a/src/tools/ntqlocale.h b/src/tools/ntqlocale.h
index 5cfaa32c..1cbc54ba 100644
--- a/src/tools/ntqlocale.h
+++ b/src/tools/ntqlocale.h
@@ -43,7 +43,7 @@
 
 struct TQLocalePrivate;
 
-class Q_EXPORT TQLocale
+class TQ_EXPORT TQLocale
 {
     friend class TQString;
 
diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h
index f34f665c..f1c41be9 100644
--- a/src/tools/ntqmap.h
+++ b/src/tools/ntqmap.h
@@ -57,7 +57,7 @@
 
 //#define QT_CHECK_MAP_RANGE
 
-struct Q_EXPORT TQMapNodeBase
+struct TQ_EXPORT TQMapNodeBase
 {
     enum Color { Red, Black };
 
@@ -328,7 +328,7 @@ TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec()
 }
 
 // ### 4.0: rename to something without Private in it. Not really internal.
-class Q_EXPORT TQMapPrivateBase : public TQShared
+class TQ_EXPORT TQMapPrivateBase : public TQShared
 {
 public:
     TQMapPrivateBase() {
diff --git a/src/tools/ntqmutex.h b/src/tools/ntqmutex.h
index e23f66fe..c517c635 100644
--- a/src/tools/ntqmutex.h
+++ b/src/tools/ntqmutex.h
@@ -52,7 +52,7 @@ class TQMutexPrivate;
 const int Q_MUTEX_NORMAL = 0;
 const int Q_MUTEX_RECURSIVE = 1;
 
-class Q_EXPORT TQMutex
+class TQ_EXPORT TQMutex
 {
     friend class TQThread;
     friend class TQWaitCondition;
@@ -79,7 +79,7 @@ public:
     int level();
 };
 
-class Q_EXPORT TQMutexLocker
+class TQ_EXPORT TQMutexLocker
 {
 public:
     TQMutexLocker( TQMutex * );
diff --git a/src/tools/ntqptrcollection.h b/src/tools/ntqptrcollection.h
index 2b69899f..da6fc667 100644
--- a/src/tools/ntqptrcollection.h
+++ b/src/tools/ntqptrcollection.h
@@ -50,7 +50,7 @@ class TQGList;
 class TQGDict;
 
 
-class Q_EXPORT TQPtrCollection			// inherited by all collections
+class TQ_EXPORT TQPtrCollection			// inherited by all collections
 {
 public:
     bool autoDelete()	const	       { return del_item; }
diff --git a/src/tools/ntqregexp.h b/src/tools/ntqregexp.h
index c6143745..4588263a 100644
--- a/src/tools/ntqregexp.h
+++ b/src/tools/ntqregexp.h
@@ -49,7 +49,7 @@
 class TQRegExpEngine;
 struct TQRegExpPrivate;
 
-class Q_EXPORT TQRegExp
+class TQ_EXPORT TQRegExp
 {
 public:
     enum CaretMode { CaretAtZero, CaretAtOffset, CaretWontMatch };
diff --git a/src/tools/ntqsemaphore.h b/src/tools/ntqsemaphore.h
index 3d418e07..0dc8e81d 100644
--- a/src/tools/ntqsemaphore.h
+++ b/src/tools/ntqsemaphore.h
@@ -49,7 +49,7 @@
 
 class TQSemaphorePrivate;
 
-class Q_EXPORT TQSemaphore
+class TQ_EXPORT TQSemaphore
 {
 public:
     TQSemaphore( int );
diff --git a/src/tools/ntqsettings.h b/src/tools/ntqsettings.h
index a788d35f..a9d5cd29 100644
--- a/src/tools/ntqsettings.h
+++ b/src/tools/ntqsettings.h
@@ -51,7 +51,7 @@
 class TQSettingsPrivate;
 
 
-class Q_EXPORT TQSettings
+class TQ_EXPORT TQSettings
 {
 public:
     enum Format {
diff --git a/src/tools/ntqshared.h b/src/tools/ntqshared.h
index a556ac20..fbd4dd45 100644
--- a/src/tools/ntqshared.h
+++ b/src/tools/ntqshared.h
@@ -45,7 +45,7 @@
 #include "ntqglobal.h"
 #endif // QT_H
 
-struct Q_EXPORT TQShared
+struct TQ_EXPORT TQShared
 {
     TQShared() : count( 1 ) { }
     void ref()		{ count++; }
diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h
index 4c4c4173..e98aba40 100644
--- a/src/tools/ntqstring.h
+++ b/src/tools/ntqstring.h
@@ -78,7 +78,7 @@ class TQCharRef;
 class TQMutex;
 template <class T> class TQDeepCopy;
 
-class Q_EXPORT TQChar {
+class TQ_EXPORT TQChar {
 public:
     TQChar();
     TQChar( char c );
@@ -363,7 +363,7 @@ inline bool operator>( char ch, TQChar c ) { return !(c>=ch); }
 inline bool operator>( TQChar c1, TQChar c2 ) { return !(c2>=c1); }
 
 // internal
-struct Q_EXPORT TQStringData : public TQShared {
+struct TQ_EXPORT TQStringData : public TQShared {
     TQStringData();
     TQStringData(TQChar *u, uint l, uint m);
     ~TQStringData();
@@ -398,7 +398,7 @@ private:
 };
 
 
-class Q_EXPORT TQString
+class TQ_EXPORT TQString
 {
 public:
     TQString();                                  // make null string
@@ -687,7 +687,7 @@ public:
     { return s1.localeAwareCompare( s2 ); }
 
 #ifndef TQT_NO_DATASTREAM
-    friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & );
+    friend TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & );
 #endif
 
     void compose();
@@ -758,7 +758,7 @@ private:
     friend class TQLineEdit;
 };
 
-class Q_EXPORT TQCharRef {
+class TQ_EXPORT TQCharRef {
     friend class TQString;
     TQString& s;
     uint p;
@@ -818,7 +818,7 @@ inline TQCharRef TQString::at( uint i ) { return TQCharRef(this,i); }
 inline TQCharRef TQString::operator[]( int i ) { return at((uint)i); }
 
 
-class Q_EXPORT TQConstString : private TQString {
+class TQ_EXPORT TQConstString : private TQString {
 public:
     TQConstString( const TQChar* unicode, uint length );
     ~TQConstString();
@@ -830,8 +830,8 @@ public:
   TQString stream functions
  *****************************************************************************/
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & );
 #endif
 
 /*****************************************************************************
@@ -1000,28 +1000,28 @@ inline int TQString::findRev( const char* str, int index ) const
   TQString non-member operators
  *****************************************************************************/
 
-Q_EXPORT bool operator!=( const TQString &s1, const TQString &s2 );
-Q_EXPORT bool operator<( const TQString &s1, const TQString &s2 );
-Q_EXPORT bool operator<=( const TQString &s1, const TQString &s2 );
-Q_EXPORT bool operator==( const TQString &s1, const TQString &s2 );
-Q_EXPORT bool operator>( const TQString &s1, const TQString &s2 );
-Q_EXPORT bool operator>=( const TQString &s1, const TQString &s2 );
+TQ_EXPORT bool operator!=( const TQString &s1, const TQString &s2 );
+TQ_EXPORT bool operator<( const TQString &s1, const TQString &s2 );
+TQ_EXPORT bool operator<=( const TQString &s1, const TQString &s2 );
+TQ_EXPORT bool operator==( const TQString &s1, const TQString &s2 );
+TQ_EXPORT bool operator>( const TQString &s1, const TQString &s2 );
+TQ_EXPORT bool operator>=( const TQString &s1, const TQString &s2 );
 #ifndef TQT_NO_CAST_ASCII
-Q_EXPORT bool operator!=( const TQString &s1, const char *s2 );
-Q_EXPORT bool operator<( const TQString &s1, const char *s2 );
-Q_EXPORT bool operator<=( const TQString &s1, const char *s2 );
-Q_EXPORT bool operator==( const TQString &s1, const char *s2 );
-Q_EXPORT bool operator>( const TQString &s1, const char *s2 );
-Q_EXPORT bool operator>=( const TQString &s1, const char *s2 );
-Q_EXPORT bool operator!=( const char *s1, const TQString &s2 );
-Q_EXPORT bool operator<( const char *s1, const TQString &s2 );
-Q_EXPORT bool operator<=( const char *s1, const TQString &s2 );
-Q_EXPORT bool operator==( const char *s1, const TQString &s2 );
-//Q_EXPORT bool operator>( const char *s1, const TQString &s2 ); // MSVC++
-Q_EXPORT bool operator>=( const char *s1, const TQString &s2 );
-#endif
-
-Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 )
+TQ_EXPORT bool operator!=( const TQString &s1, const char *s2 );
+TQ_EXPORT bool operator<( const TQString &s1, const char *s2 );
+TQ_EXPORT bool operator<=( const TQString &s1, const char *s2 );
+TQ_EXPORT bool operator==( const TQString &s1, const char *s2 );
+TQ_EXPORT bool operator>( const TQString &s1, const char *s2 );
+TQ_EXPORT bool operator>=( const TQString &s1, const char *s2 );
+TQ_EXPORT bool operator!=( const char *s1, const TQString &s2 );
+TQ_EXPORT bool operator<( const char *s1, const TQString &s2 );
+TQ_EXPORT bool operator<=( const char *s1, const TQString &s2 );
+TQ_EXPORT bool operator==( const char *s1, const TQString &s2 );
+//TQ_EXPORT bool operator>( const char *s1, const TQString &s2 ); // MSVC++
+TQ_EXPORT bool operator>=( const char *s1, const TQString &s2 );
+#endif
+
+TQ_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2 )
 {
     TQString tmp( s1 );
     tmp += s2;
@@ -1029,14 +1029,14 @@ Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2
 }
 
 #ifndef TQT_NO_CAST_ASCII
-Q_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 )
+TQ_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 )
 {
     TQString tmp( s1 );
     tmp += TQString::fromAscii(s2);
     return tmp;
 }
 
-Q_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 )
+TQ_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 )
 {
     TQString tmp = TQString::fromAscii( s1 );
     tmp += s2;
@@ -1044,21 +1044,21 @@ Q_EXPORT inline const TQString operator+( const char *s1, const TQString &s2 )
 }
 #endif
 
-Q_EXPORT inline const TQString operator+( const TQString &s1, TQChar c2 )
+TQ_EXPORT inline const TQString operator+( const TQString &s1, TQChar c2 )
 {
     TQString tmp( s1 );
     tmp += c2;
     return tmp;
 }
 
-Q_EXPORT inline const TQString operator+( const TQString &s1, char c2 )
+TQ_EXPORT inline const TQString operator+( const TQString &s1, char c2 )
 {
     TQString tmp( s1 );
     tmp += c2;
     return tmp;
 }
 
-Q_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 )
+TQ_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 )
 {
     TQString tmp;
     tmp += c1;
@@ -1066,7 +1066,7 @@ Q_EXPORT inline const TQString operator+( TQChar c1, const TQString &s2 )
     return tmp;
 }
 
-Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 )
+TQ_EXPORT inline const TQString operator+( char c1, const TQString &s2 )
 {
     TQString tmp;
     tmp += c1;
@@ -1075,12 +1075,12 @@ Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 )
 }
 
 #ifndef TQT_NO_STL
-Q_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2)
+TQ_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2)
 {
     return s1 + TQString(s2);
 }
 
-Q_EXPORT inline const TQString operator+(const std::string& s1, const TQString& s2)
+TQ_EXPORT inline const TQString operator+(const std::string& s1, const TQString& s2)
 {
     TQString tmp(s2);
     return TQString(tmp.prepend(s1));
@@ -1089,11 +1089,11 @@ Q_EXPORT inline const TQString operator+(const std::string& s1, const TQString&
 
 
 #if defined(Q_OS_WIN32)
-extern Q_EXPORT TQString qt_winTQString(void*);
-extern Q_EXPORT const void* qt_winTchar(const TQString& str, bool addnul);
-extern Q_EXPORT void* qt_winTchar_new(const TQString& str);
-extern Q_EXPORT TQCString qt_winTQString2MB( const TQString& s, int len=-1 );
-extern Q_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 );
+extern TQ_EXPORT TQString qt_winTQString(void*);
+extern TQ_EXPORT const void* qt_winTchar(const TQString& str, bool addnul);
+extern TQ_EXPORT void* qt_winTchar_new(const TQString& str);
+extern TQ_EXPORT TQCString qt_winTQString2MB( const TQString& s, int len=-1 );
+extern TQ_EXPORT TQString qt_winMB2TQString( const char* mb, int len=-1 );
 #endif
 
 #define Q_DEFINED_QSTRING
diff --git a/src/tools/ntqstringlist.h b/src/tools/ntqstringlist.h
index 5fc82435..7bda8587 100644
--- a/src/tools/ntqstringlist.h
+++ b/src/tools/ntqstringlist.h
@@ -54,11 +54,11 @@ template <class T> class TQDeepCopy;
 
 #if defined(Q_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
-//Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQString>; 
+//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQString>; 
 // MOC_SKIP_END
 #endif
 
-class Q_EXPORT TQStringList : public TQValueList<TQString>
+class TQ_EXPORT TQStringList : public TQValueList<TQString>
 {
 public:
     TQStringList() { }
@@ -98,8 +98,8 @@ protected:
 
 #ifndef TQT_NO_DATASTREAM
 class TQDataStream;
-extern Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQStringList& );
-extern Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQStringList& );
+extern TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQStringList& );
+extern TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQStringList& );
 #endif
 
 #endif // TQT_NO_STRINGLIST
diff --git a/src/tools/ntqstrlist.h b/src/tools/ntqstrlist.h
index 2d278a1e..2495f55a 100644
--- a/src/tools/ntqstrlist.h
+++ b/src/tools/ntqstrlist.h
@@ -55,7 +55,7 @@ class TQStrListIterator : public TQPtrListIterator<char>
 typedef TQPtrListIterator<char> TQStrListIterator;
 #endif
 
-class Q_EXPORT TQStrList : public TQPtrList<char>
+class TQ_EXPORT TQStrList : public TQPtrList<char>
 {
 public:
     TQStrList( bool deepCopies=TRUE ) { dc = deepCopies; del_item = deepCopies; }
@@ -78,7 +78,7 @@ private:
 };
 
 
-class Q_EXPORT TQStrIList : public TQStrList	// case insensitive string list
+class TQ_EXPORT TQStrIList : public TQStrList	// case insensitive string list
 {
 public:
     TQStrIList( bool deepCopies=TRUE ) : TQStrList( deepCopies ) {}
diff --git a/src/tools/ntqstrvec.h b/src/tools/ntqstrvec.h
index a1c53866..9f224508 100644
--- a/src/tools/ntqstrvec.h
+++ b/src/tools/ntqstrvec.h
@@ -47,7 +47,7 @@
 #include "ntqdatastream.h"
 #endif // QT_H
 
-class Q_EXPORT TQStrVec : public TQPtrVector<char>
+class TQ_EXPORT TQStrVec : public TQPtrVector<char>
 {
 public:
     TQStrVec()  { dc = TRUE; }
@@ -69,7 +69,7 @@ private:
 };
 
 
-class Q_EXPORT TQStrIVec : public TQStrVec	// case insensitive string vec
+class TQ_EXPORT TQStrIVec : public TQStrVec	// case insensitive string vec
 {
 public:
     TQStrIVec() {}
diff --git a/src/tools/ntqtextstream.h b/src/tools/ntqtextstream.h
index 7e7345d9..5277c960 100644
--- a/src/tools/ntqtextstream.h
+++ b/src/tools/ntqtextstream.h
@@ -53,7 +53,7 @@ class TQTextDecoder;
 
 class TQTextStreamPrivate;
 
-class Q_EXPORT TQTextStream				// text stream class
+class TQ_EXPORT TQTextStream				// text stream class
 {
 public:
     enum Encoding { Locale, Latin1, Unicode, UnicodeNetworkOrder,
@@ -201,7 +201,7 @@ private:	// Disabled copy constructor and operator=
 
 typedef TQTextStream TQTS;
 
-class Q_EXPORT TQTextIStream : public TQTextStream {
+class TQ_EXPORT TQTextIStream : public TQTextStream {
 public:
     TQTextIStream( const TQString* s ) :
 	TQTextStream((TQString*)s,IO_ReadOnly) { }
@@ -217,7 +217,7 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-class Q_EXPORT TQTextOStream : public TQTextStream {
+class TQ_EXPORT TQTextOStream : public TQTextStream {
 public:
     TQTextOStream( TQString* s ) :
 	TQTextStream(s,IO_WriteOnly) { }
@@ -292,7 +292,7 @@ inline TQChar TQTextStream::ts_getc()
 typedef TQTextStream & (*TQTSFUNC)(TQTextStream &);// manipulator function
 typedef int (TQTextStream::*TQTSMFI)(int);	// manipulator w/int argument
 
-class Q_EXPORT TQTSManip {			// text stream manipulator
+class TQ_EXPORT TQTSManip {			// text stream manipulator
 public:
     TQTSManip( TQTSMFI m, int a ) { mf=m; arg=a; }
     void exec( TQTextStream &s ) { (s.*mf)(arg); }
@@ -301,37 +301,37 @@ private:
     int	   arg;					// member function argument
 };
 
-Q_EXPORT inline TQTextStream &operator>>( TQTextStream &s, TQTSFUNC f )
+TQ_EXPORT inline TQTextStream &operator>>( TQTextStream &s, TQTSFUNC f )
 { return (*f)( s ); }
 
-Q_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSFUNC f )
+TQ_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSFUNC f )
 { return (*f)( s ); }
 
-Q_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSManip m )
+TQ_EXPORT inline TQTextStream &operator<<( TQTextStream &s, TQTSManip m )
 { m.exec(s); return s; }
 
-Q_EXPORT TQTextStream &bin( TQTextStream &s );	// set bin notation
-Q_EXPORT TQTextStream &oct( TQTextStream &s );	// set oct notation
-Q_EXPORT TQTextStream &dec( TQTextStream &s );	// set dec notation
-Q_EXPORT TQTextStream &hex( TQTextStream &s );	// set hex notation
-Q_EXPORT TQTextStream &endl( TQTextStream &s );	// insert EOL ('\n')
-Q_EXPORT TQTextStream &flush( TQTextStream &s );	// flush output
-Q_EXPORT TQTextStream &ws( TQTextStream &s );	// eat whitespace on input
-Q_EXPORT TQTextStream &reset( TQTextStream &s );	// set default flags
+TQ_EXPORT TQTextStream &bin( TQTextStream &s );	// set bin notation
+TQ_EXPORT TQTextStream &oct( TQTextStream &s );	// set oct notation
+TQ_EXPORT TQTextStream &dec( TQTextStream &s );	// set dec notation
+TQ_EXPORT TQTextStream &hex( TQTextStream &s );	// set hex notation
+TQ_EXPORT TQTextStream &endl( TQTextStream &s );	// insert EOL ('\n')
+TQ_EXPORT TQTextStream &flush( TQTextStream &s );	// flush output
+TQ_EXPORT TQTextStream &ws( TQTextStream &s );	// eat whitespace on input
+TQ_EXPORT TQTextStream &reset( TQTextStream &s );	// set default flags
 
-Q_EXPORT inline TQTSManip qSetW( int w )
+TQ_EXPORT inline TQTSManip qSetW( int w )
 {
     TQTSMFI func = &TQTextStream::width;
     return TQTSManip(func,w);
 }
 
-Q_EXPORT inline TQTSManip qSetFill( int f )
+TQ_EXPORT inline TQTSManip qSetFill( int f )
 {
     TQTSMFI func = &TQTextStream::fill;
     return TQTSManip(func,f);
 }
 
-Q_EXPORT inline TQTSManip qSetPrecision( int p )
+TQ_EXPORT inline TQTSManip qSetPrecision( int p )
 {
     TQTSMFI func = &TQTextStream::precision;
     return TQTSManip(func,p);
diff --git a/src/tools/ntqthreadstorage.h b/src/tools/ntqthreadstorage.h
index 9d9f20cf..58862123 100644
--- a/src/tools/ntqthreadstorage.h
+++ b/src/tools/ntqthreadstorage.h
@@ -45,7 +45,7 @@
 #include "ntqglobal.h"
 #endif // QT_H
 
-class Q_EXPORT TQThreadStorageData
+class TQ_EXPORT TQThreadStorageData
 {
 public:
     TQThreadStorageData( void (*func)(void *) );
diff --git a/src/tools/ntquuid.h b/src/tools/ntquuid.h
index 317a0af8..1403c364 100644
--- a/src/tools/ntquuid.h
+++ b/src/tools/ntquuid.h
@@ -61,7 +61,7 @@ typedef struct _GUID
 #endif
 
 
-struct Q_EXPORT TQUuid
+struct TQ_EXPORT TQUuid
 {
     enum Variant {
 	VarUnknown	=-1,
@@ -187,8 +187,8 @@ struct Q_EXPORT TQUuid
 };
 
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQUuid & );
-Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQUuid & );
+TQ_EXPORT TQDataStream &operator<<( TQDataStream &, const TQUuid & );
+TQ_EXPORT TQDataStream &operator>>( TQDataStream &, TQUuid & );
 #endif
 
 #endif //TQUUID_H
diff --git a/src/tools/ntqwaitcondition.h b/src/tools/ntqwaitcondition.h
index b85baf92..503d5d6c 100644
--- a/src/tools/ntqwaitcondition.h
+++ b/src/tools/ntqwaitcondition.h
@@ -52,7 +52,7 @@
 class TQWaitConditionPrivate;
 class TQMutex;
 
-class Q_EXPORT TQWaitCondition
+class TQ_EXPORT TQWaitCondition
 {
 public:
     TQWaitCondition();
diff --git a/src/tools/ntqwinexport.h b/src/tools/ntqwinexport.h
index c3fc2146..a8f051d3 100644
--- a/src/tools/ntqwinexport.h
+++ b/src/tools/ntqwinexport.h
@@ -41,151 +41,151 @@
 
 #if defined(Q_DEFINED_QASCIIDICT) && defined(Q_DEFINED_QCONNECTION_LIST) && !defined(Q_EXPORTED_QASCIIDICT_TEMPLATES)
 #define Q_EXPORTED_QASCIIDICT_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQAsciiDictIterator<TQConnectionList>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQAsciiDict<TQConnectionList>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQAsciiDictIterator<TQConnectionList>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQAsciiDict<TQConnectionList>;
 #endif
 
 #if defined(Q_DEFINED_QSTYLESHEET) && defined(Q_DEFINED_QDICT) && !defined(Q_EXPORTED_QSTYLESHEET_TEMPLATES)
 #define Q_EXPORTED_QSTYLESHEET_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQDict<TQStyleSheetItem>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQStyleSheetItem>;
 #endif
 
 #if defined(Q_DEFINED_QLIBRARY) && defined(Q_DEFINED_QDICT) && !defined(Q_EXPORTED_QDICTLIBRARY_TEMPLATES)
 #define Q_EXPORTED_QDICTLIBRARY_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQDict<TQLibrary>; // for TQtopia
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQLibrary>; // for TQtopia
 #endif
 
 #if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QOBJECT) && !defined(Q_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES)
 #define Q_EXPORTED_QGUARDEDPTROBJECT_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQGuardedPtr<TQObject>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQGuardedPtr<TQObject>;
 #endif
 
 // needed for TQtopia
 #if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES)
 #define Q_EXPORTED_QGUARDEDPTRTQWIDGET_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQGuardedPtr<TQWidget>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQGuardedPtr<TQWidget>;
 #endif
 
 #if defined(Q_DEFINED_QGUARDEDPTR) && defined(Q_DEFINED_QACCESSIBLE_OBJECT) && !defined(Q_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES)
 #define Q_EXPORTED_QACCESSIBLEOBJECT_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQGuardedPtr<TQAccessibleObject>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQGuardedPtr<TQAccessibleObject>;
 #endif
 
 #if defined(Q_DEFINED_QINTDICT) && !defined(Q_EXPORTED_QINTDICT_TEMPLATES)
 #define Q_EXPORTED_QINTDICT_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQIntDict<int>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDict<int>;
 #endif
 
 #if defined(Q_DEFINED_QINTDICT) && defined(Q_DEFINED_QWIDGET) && !defined(Q_EXPORTED__TEMPLATES)
 #define Q_EXPORTED__TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQIntDictIterator<TQWidget>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQIntDict<TQWidget>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDictIterator<TQWidget>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQIntDict<TQWidget>;
 #endif
 
 #if defined(Q_DEFINED_QMAP) && !defined(Q_EXPORTED_QMAPBASIC_TEMPLATES)
 #define Q_EXPORTED_QMAPBASIC_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, int>; // for TQtopia
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, bool>; // for TQtopia
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, int>; // for TQtopia
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, bool>; // for TQtopia
 #endif
 
 #if defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QMAPTQSTRING_TEMPLATES)
 #define Q_EXPORTED_QMAPTQSTRING_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<TQString, TQString>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<TQString, int>; // for TQtopia
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap<int, TQString>; // for TQtopia
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<TQString, TQString>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<TQString, int>; // for TQtopia
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMap<int, TQString>; // for TQtopia
 #endif
 
 #if defined(Q_DEFINED_QMEMARRAY)  && !defined(Q_EXPORTED_QMEMARRAY_BASIC_TEMPLATES)
 #define Q_EXPORTED_QMEMARRAY_BASIC_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<int>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<bool>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<char>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<int>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<bool>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<char>;
 #endif
 
 #if defined(Q_DEFINED_QMEMARRAY) && defined(Q_DEFINED_QPOINT)  && !defined(Q_EXPORTED_QMEMARAYPOINT_TEMPLATES)
 #define Q_EXPORTED_QMEMARAYPOINT_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQMemArray<TQPoint>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQMemArray<TQPoint>;
 #endif
 
 #if defined(Q_DEFINED_QPTRLIST)  && !defined(Q_EXPORTED_QPTRLIST_BASIC_TEMPLATES)
 #define Q_EXPORTED_QPTRLIST_BASIC_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<char>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<char>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<char>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<char>;
 #endif
 
 #if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QWIDGET)  && !defined(Q_EXPORTED_QPTRLISTWIDGET_TEMPLATES)
 #define Q_EXPORTED_QPTRLISTWIDGET_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<TQWidget>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQWidget>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQWidget>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQWidget>;
 #endif
 
 #if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QCONNECTION)  && !defined(Q_EXPORTED_QPTRLISTCONNECTION_TEMPLATES)
 #define Q_EXPORTED_QPTRLISTCONNECTION_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<TQConnection>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQConnection>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQConnection>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQConnection>;
 #endif
 
 #if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QOBJECT)  && !defined(Q_EXPORTED_QPTRLISTOBJECT_TEMPLATES)
 #define Q_EXPORTED_QPTRLISTOBJECT_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<TQObject>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQObject>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQObject>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQObject>;
 #endif
 
 #if defined(Q_DEFINED_QPTRLIST) && defined(Q_DEFINED_QDOCKWINDOW)  && !defined(Q_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES)
 #define Q_EXPORTED_QPTRLISTDOCWINDOW_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrListIterator<TQDockWindow>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList<TQDockWindow>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrListIterator<TQDockWindow>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrList<TQDockWindow>;
 #endif
 
 #if defined(Q_DEFINED_QPTRVECTOR)  && !defined(Q_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES)
 #define Q_EXPORTED_QPTRVECTOR_BASIC_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<int>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<int>;
 #endif
 
 #if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET)  && !defined(Q_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES)
 #define Q_EXPORTED_QPTRVECTORSTYLESHEETITEM_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQStyleSheetItem>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQStyleSheetItem>;
 #endif
 
 #if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QWIDGET)  && !defined(Q_EXPORTED_QPTRVECTORWIDGET_TEMPLATES)
 #define Q_EXPORTED_QPTRVECTORWIDGET_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQWidget>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQWidget>;
 #endif
 
 #if defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QCONNECTION_LIST)  && !defined(Q_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES)
 #define Q_EXPORTED_QPTRVECTORCONNECTTIONLIST_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQConnectionList>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQConnectionList>;
 #endif
 
 #if defined(Q_DEFINED_QVALUELIST)  && !defined(Q_EXPORTED_QVALUELIST_BASIC_TEMPLATES)
 #define Q_EXPORTED_QVALUELIST_BASIC_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueListIterator<bool>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<bool>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueListIterator<int>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<int>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<bool>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<bool>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<int>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<int>;
 #endif
 
 #if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QRECT)  && !defined(Q_EXPORTED_QVALUELISTRECT_TEMPLATES)
 #define Q_EXPORTED_QVALUELISTRECT_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueListIterator<TQRect>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQRect>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<TQRect>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQRect>;
 #endif
 
 #if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTRING)  && !defined(Q_EXPORTED_QVALUELISTSTRING_TEMPLATES)
 #define Q_EXPORTED_QVALUELISTSTRING_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueListIterator<TQString>;
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQString>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueListIterator<TQString>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQString>;
 #endif
 
 // TQStylesheet template exports
 #if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QPTRVECTOR) && defined(Q_DEFINED_QSTYLESHEET)  && !defined(Q_EXPORTED_QSTYLESHEETITEM1_TEMPLATES)
 #define Q_EXPORTED_QSTYLESHEETITEM1_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList< TQPtrVector< TQStyleSheetItem> >;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList< TQPtrVector< TQStyleSheetItem> >;
 #endif
 
 #if defined(Q_DEFINED_QVALUELIST) && defined(Q_DEFINED_QSTYLESHEET)  && !defined(Q_EXPORTED_QSTYLESHEETITEM2_TEMPLATES)
 #define Q_EXPORTED_QSTYLESHEETITEM2_TEMPLATES
-Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQStyleSheetItem::ListStyle>;
+Q_TEMPLATE_EXTERN template class TQ_EXPORT TQValueList<TQStyleSheetItem::ListStyle>;
 #endif
 
 // qcanvas template exports
@@ -209,7 +209,7 @@ TQM_TEMPLATE_EXTERN_TABLE template class TQM_EXPORT_TABLE TQPtrVector<TQTableIte
 #endif
 
 #if defined(Q_DEFINED_QTABLE) && defined(Q_DEFINED_QPTRVECTOR)
-//Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrVector<TQTable>;
+//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQPtrVector<TQTable>;
 #endif
 
 // qsqlextension template exports
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index 79c5880f..ab390e7f 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -82,7 +82,7 @@ struct TQUObject;
 #define IID_QUnknown TQUuid(0x1d8518cd, 0xe8f5, 0x4366, 0x99, 0xe8, 0x87, 0x9f, 0xd7, 0xe4, 0x82, 0xde)
 #endif
 
-struct Q_EXPORT TQUnknownInterface
+struct TQ_EXPORT TQUnknownInterface
 {
     virtual TQRESULT queryInterface( const TQUuid&, TQUnknownInterface** ) = 0;
     virtual ulong   addRef() = 0;
@@ -96,7 +96,7 @@ struct Q_EXPORT TQUnknownInterface
 
 // the dispatch interface that inherits the unknown interface.. It is
 // used to explore interfaces during runtime and to do dynamic calls.
-struct Q_EXPORT TQDispatchInterface : public TQUnknownInterface
+struct TQ_EXPORT TQDispatchInterface : public TQUnknownInterface
 {
     // returns the interface description of this dispatch interface.
     virtual const TQUInterfaceDescription* interfaceDescription() const = 0;
@@ -189,7 +189,7 @@ private:
 #define IID_QObject TQUuid( 0x10a1501b, 0x4c5f, 0x4914, 0x95, 0xdd, 0xc4, 0x00, 0x48, 0x6c, 0xf9, 0x00)
 #endif
 
-struct Q_EXPORT TQObjectInterface
+struct TQ_EXPORT TQObjectInterface
 {
     virtual TQObject*   qObject() = 0;
 };
@@ -199,7 +199,7 @@ struct Q_EXPORT TQObjectInterface
 #define IID_QComponentInformation TQUuid(0x5f3968a5, 0xf451, 0x45b1, 0x96, 0xfb, 0x6, 0x1a, 0xd9, 0x8f, 0x92, 0x6e)
 #endif
 
-struct Q_EXPORT TQComponentInformationInterface : public TQUnknownInterface
+struct TQ_EXPORT TQComponentInformationInterface : public TQUnknownInterface
 {
     virtual TQString name() const = 0;
     virtual TQString description() const = 0;
@@ -212,7 +212,7 @@ struct Q_EXPORT TQComponentInformationInterface : public TQUnknownInterface
 #define IID_QComponentFactory TQUuid( 0x6caa771b, 0x17bb, 0x4988, 0x9e, 0x78, 0xba, 0x5c, 0xdd, 0xaa, 0xc3, 0x1e)
 #endif
 
-struct Q_EXPORT TQComponentFactoryInterface : public TQUnknownInterface
+struct TQ_EXPORT TQComponentFactoryInterface : public TQUnknownInterface
 {
     virtual TQRESULT createInstance( const TQUuid &cid, const TQUuid &iid, TQUnknownInterface** instance, TQUnknownInterface *outer ) = 0;
 };
@@ -222,7 +222,7 @@ struct Q_EXPORT TQComponentFactoryInterface : public TQUnknownInterface
 #define IID_QLibrary TQUuid( 0xd16111d4, 0xe1e7, 0x4c47, 0x85, 0x99, 0x24, 0x48, 0x3d, 0xae, 0x2e, 0x07)
 #endif
 
-struct Q_EXPORT TQLibraryInterface : public TQUnknownInterface
+struct TQ_EXPORT TQLibraryInterface : public TQUnknownInterface
 {
     virtual bool    init() = 0;
     virtual void    cleanup() = 0;
@@ -234,7 +234,7 @@ struct Q_EXPORT TQLibraryInterface : public TQUnknownInterface
 #define IID_QFeatureList TQUuid(0x3f8fdc44, 0x3015, 0x4f3e, 0xb6, 0xd6, 0xe4, 0xaa, 0xaa, 0xbd, 0xea, 0xad)
 #endif
 
-struct Q_EXPORT TQFeatureListInterface : public TQUnknownInterface
+struct TQ_EXPORT TQFeatureListInterface : public TQUnknownInterface
 {
     virtual TQStringList	featureList() const = 0;
 };
@@ -244,14 +244,14 @@ struct Q_EXPORT TQFeatureListInterface : public TQUnknownInterface
 #define IID_QComponentRegistration TQUuid( 0xb5feb5de, 0xe0cd, 0x4e37, 0xb0, 0xeb, 0x8a, 0x81, 0x24, 0x99, 0xa0, 0xc1)
 #endif
 
-struct Q_EXPORT TQComponentRegistrationInterface : public TQUnknownInterface
+struct TQ_EXPORT TQComponentRegistrationInterface : public TQUnknownInterface
 {
     virtual bool    registerComponents( const TQString &filepath ) const = 0;
     virtual bool    unregisterComponents() const = 0;
 };
 
 // internal class that wraps an initialized ulong
-struct Q_EXPORT TQtULong
+struct TQ_EXPORT TQtULong
 {
     TQtULong() : ref( 0 ) { }
     operator unsigned long () const { return ref; }
@@ -281,11 +281,11 @@ public:		   \
 #define Q_UCM_FLAGS_STRING "01"
 #endif
 
-#ifndef Q_EXTERN_C
+#ifndef TQ_EXTERN_C
 #ifdef __cplusplus
-#define Q_EXTERN_C    extern "C"
+#define TQ_EXTERN_C    extern "C"
 #else
-#define Q_EXTERN_C    extern
+#define TQ_EXTERN_C    extern
 #endif
 #endif
 
@@ -315,26 +315,26 @@ public:		   \
 #	ifdef Q_CC_BOR
 #	    define Q_EXPORT_COMPONENT() \
 	        Q_UCM_VERIFICATION_DATA \
-		Q_EXTERN_C __declspec(dllexport) \
+		TQ_EXTERN_C __declspec(dllexport) \
                 const char * __stdcall qt_ucm_query_verification_data() \
                 { return qt_ucm_verification_data; } \
-		Q_EXTERN_C Q_EXPORT __declspec(dllexport) TQUnknownInterface* \
+		TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* \
                 __stdcall ucm_instantiate()
 #	else
 #	    define Q_EXPORT_COMPONENT() \
 	        Q_UCM_VERIFICATION_DATA \
-		Q_EXTERN_C __declspec(dllexport) \
+		TQ_EXTERN_C __declspec(dllexport) \
                 const char *qt_ucm_query_verification_data() \
                 { return qt_ucm_verification_data; } \
-		Q_EXTERN_C Q_EXPORT __declspec(dllexport) TQUnknownInterface* ucm_instantiate()
+		TQ_EXTERN_C TQ_EXPORT __declspec(dllexport) TQUnknownInterface* ucm_instantiate()
 #	endif
 #    else
 #	define Q_EXPORT_COMPONENT() \
 	    Q_UCM_VERIFICATION_DATA \
-	    Q_EXTERN_C \
+	    TQ_EXTERN_C \
             const char *qt_ucm_query_verification_data() \
             { return qt_ucm_verification_data; } \
-	    Q_EXTERN_C Q_EXPORT TQUnknownInterface* ucm_instantiate()
+	    TQ_EXTERN_C TQ_EXPORT TQUnknownInterface* ucm_instantiate()
 #    endif
 #    define Q_EXPORT_INTERFACE() Q_EXPORT_COMPONENT()
 #endif
diff --git a/src/tools/qcomlibrary_p.h b/src/tools/qcomlibrary_p.h
index 8d53e295..f738aff5 100644
--- a/src/tools/qcomlibrary_p.h
+++ b/src/tools/qcomlibrary_p.h
@@ -58,7 +58,7 @@
 
 #ifndef TQT_NO_COMPONENT
 
-class Q_EXPORT TQComLibrary : public TQLibrary
+class TQ_EXPORT TQComLibrary : public TQLibrary
 {
 public:
     TQComLibrary( const TQString &filename );
diff --git a/src/tools/qcomponentfactory_p.h b/src/tools/qcomponentfactory_p.h
index 0c343c74..89399152 100644
--- a/src/tools/qcomponentfactory_p.h
+++ b/src/tools/qcomponentfactory_p.h
@@ -59,7 +59,7 @@
 
 #ifndef TQT_NO_COMPONENT
 
-class Q_EXPORT TQComponentFactory
+class TQ_EXPORT TQComponentFactory
 {
 public:
     static TQRESULT createInstance( const TQString &cid, const TQUuid &iid, TQUnknownInterface** instance, TQUnknownInterface *outer = 0 );
diff --git a/src/tools/qgpluginmanager_p.h b/src/tools/qgpluginmanager_p.h
index 371299e9..c531b1ab 100644
--- a/src/tools/qgpluginmanager_p.h
+++ b/src/tools/qgpluginmanager_p.h
@@ -63,11 +63,11 @@
 
 #if defined(Q_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
-//Q_TEMPLATE_EXTERN template class Q_EXPORT TQDict<TQLibrary>;
+//Q_TEMPLATE_EXTERN template class TQ_EXPORT TQDict<TQLibrary>;
 // MOC_SKIP_END
 #endif
 
-class Q_EXPORT TQGPluginManager
+class TQ_EXPORT TQGPluginManager
 {
 public:
     TQGPluginManager( const TQUuid& id, const TQStringList& paths = TQString::null, const TQString &suffix = TQString::null, bool cs = TRUE );
diff --git a/src/tools/qmutexpool.cpp b/src/tools/qmutexpool.cpp
index 18cd5560..72c66c8c 100644
--- a/src/tools/qmutexpool.cpp
+++ b/src/tools/qmutexpool.cpp
@@ -42,7 +42,7 @@
 
 #include <ntqthread.h>
 
-Q_EXPORT TQMutexPool *tqt_global_mutexpool = 0;
+TQ_EXPORT TQMutexPool *tqt_global_mutexpool = 0;
 
 
 /*!
diff --git a/src/tools/qmutexpool_p.h b/src/tools/qmutexpool_p.h
index cb2eef20..a0bb2856 100644
--- a/src/tools/qmutexpool_p.h
+++ b/src/tools/qmutexpool_p.h
@@ -58,7 +58,7 @@
 #include "ntqmemarray.h"
 #endif // QT_H
 
-class Q_EXPORT TQMutexPool
+class TQ_EXPORT TQMutexPool
 {
 public:
     TQMutexPool( bool recursive = FALSE, int size = 17 );
@@ -73,7 +73,7 @@ private:
     bool recurs;
 };
 
-extern Q_EXPORT TQMutexPool *tqt_global_mutexpool;
+extern TQ_EXPORT TQMutexPool *tqt_global_mutexpool;
 
 #endif // TQT_THREAD_SUPPORT
 
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 9c205e95..01d90c1f 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -1456,7 +1456,7 @@ char* TQString::unicodeToLatin1(const TQChar *uc, uint l, bool unpaged)
     flags.
 
 */
-Q_EXPORT TQStringData *TQString::shared_null = 0;
+TQ_EXPORT TQStringData *TQString::shared_null = 0;
 QT_STATIC_CONST_IMPL TQString TQString::null;
 QT_STATIC_CONST_IMPL TQChar TQChar::null;
 QT_STATIC_CONST_IMPL TQChar TQChar::replacement((ushort)0xfffd);
diff --git a/src/tools/qstringlist.cpp b/src/tools/qstringlist.cpp
index 71427d4e..732bd7cf 100644
--- a/src/tools/qstringlist.cpp
+++ b/src/tools/qstringlist.cpp
@@ -436,12 +436,12 @@ TQString TQStringList::join( const TQString &sep ) const
 }
 
 #ifndef TQT_NO_DATASTREAM
-Q_EXPORT TQDataStream &operator>>( TQDataStream & s, TQStringList& l )
+TQ_EXPORT TQDataStream &operator>>( TQDataStream & s, TQStringList& l )
 {
     return s >> (TQValueList<TQString>&)l;
 }
 
-Q_EXPORT TQDataStream &operator<<( TQDataStream & s, const TQStringList& l )
+TQ_EXPORT TQDataStream &operator<<( TQDataStream & s, const TQStringList& l )
 {
     return s << (const TQValueList<TQString>&)l;
 }
diff --git a/src/tools/qucom_p.h b/src/tools/qucom_p.h
index f4f7ea81..db752560 100644
--- a/src/tools/qucom_p.h
+++ b/src/tools/qucom_p.h
@@ -72,7 +72,7 @@ struct TQUnknownInterface;
 struct TQDispatchInterface;
 
 
-struct Q_EXPORT TQUBuffer
+struct TQ_EXPORT TQUBuffer
 {
     virtual long read( char *data, ulong maxlen ) = 0;
     virtual long write( const char *data, ulong len ) = 0;
@@ -80,7 +80,7 @@ struct Q_EXPORT TQUBuffer
 
 
 // A type for a TQUObject
-struct Q_EXPORT TQUType
+struct TQ_EXPORT TQUType
 {
     virtual const TQUuid *uuid() const = 0;
     virtual const char *desc() const = 0;
@@ -106,8 +106,8 @@ struct Q_EXPORT TQUType
 
 
 // {DE56510E-4E9F-4b76-A3C2-D1E2EF42F1AC}
-extern Q_EXPORT const TQUuid TID_QUType_Null;
-struct Q_EXPORT TQUType_Null : public TQUType
+extern TQ_EXPORT const TQUuid TID_QUType_Null;
+struct TQ_EXPORT TQUType_Null : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -120,11 +120,11 @@ struct Q_EXPORT TQUType_Null : public TQUType
     int serializeTo( TQUObject *, TQUBuffer * );
     int serializeFrom( TQUObject *, TQUBuffer * );
 };
-extern Q_EXPORT TQUType_Null static_QUType_Null;
+extern TQ_EXPORT TQUType_Null static_QUType_Null;
 
 
 // The magic TQUObject
-struct Q_EXPORT TQUObject
+struct TQ_EXPORT TQUObject
 {
 public: // scary MSVC bug makes this necessary
     TQUObject() : type( &static_QUType_Null ), isLastObject(false) {}
@@ -192,7 +192,7 @@ public: // scary MSVC bug makes this necessary
 // A parameter description describes one method parameters. A
 // parameter has a name, a type and a flag describing whether it's an
 // in parameter, an out parameter, or both ways
-struct Q_EXPORT TQUParameter
+struct TQ_EXPORT TQUParameter
 {
     const char* name;
     TQUType *type;
@@ -203,7 +203,7 @@ struct Q_EXPORT TQUParameter
 
 // A method description describes one method. A method has a name and
 // an array of parameters.
-struct Q_EXPORT TQUMethod
+struct TQ_EXPORT TQUMethod
 {
     const char* name;
     int count;
@@ -211,7 +211,7 @@ struct Q_EXPORT TQUMethod
 };
 
 // A Property description. Not used yet in the example.
-struct Q_EXPORT TQUProperty
+struct TQ_EXPORT TQUProperty
 {
     const char* name;
     TQUType* type;
@@ -226,7 +226,7 @@ struct Q_EXPORT TQUProperty
 
 // An interface description describes one interface, that is all its
 // methods and properties.
-struct Q_EXPORT TQUInterfaceDescription
+struct TQ_EXPORT TQUInterfaceDescription
 {
     int methodCount;
     const TQUMethod* methods;
@@ -238,7 +238,7 @@ struct Q_EXPORT TQUInterfaceDescription
 // A component description describe one component, that is its name,
 // vendor, release, info, its component uuid and all its interface
 // uuids.
-struct Q_EXPORT TQUComponentDescription
+struct TQ_EXPORT TQUComponentDescription
 {
     const char* name;
     const char* vendor;
@@ -253,7 +253,7 @@ struct Q_EXPORT TQUComponentDescription
 // A component server description describe one component server, that
 // is its name, vendor, release, info and the descriptions of all
 // components it can instantiate.
-struct Q_EXPORT TQUComponentServerDescription
+struct TQ_EXPORT TQUComponentServerDescription
 {
     const char* name;
     const char* vendor;
@@ -265,13 +265,13 @@ struct Q_EXPORT TQUComponentServerDescription
 
 
 
-struct Q_EXPORT TQUEnumItem 				// - a name/value pair
+struct TQ_EXPORT TQUEnumItem 				// - a name/value pair
 {
     const char *key;
     int value;
 };
 
-struct Q_EXPORT TQUEnum
+struct TQ_EXPORT TQUEnum
 {
     const char *name;			// - enumerator name
     unsigned int count;			// - number of values
@@ -291,8 +291,8 @@ inline bool TQUType::check( TQUObject* o, TQUType* t ) {
 
 
 // {7EE17B08-5419-47e2-9776-8EEA112DCAEC}
-extern Q_EXPORT const TQUuid TID_QUType_enum;
-struct Q_EXPORT TQUType_enum : public TQUType
+extern TQ_EXPORT const TQUuid TID_QUType_enum;
+struct TQ_EXPORT TQUType_enum : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -307,12 +307,12 @@ struct Q_EXPORT TQUType_enum : public TQUType
     int serializeTo( TQUObject *, TQUBuffer * );
     int serializeFrom( TQUObject *, TQUBuffer * );
 };
-extern Q_EXPORT TQUType_enum static_QUType_enum;
+extern TQ_EXPORT TQUType_enum static_QUType_enum;
 
 
 // {8AC26448-5AB4-49eb-968C-8F30AB13D732}
-extern Q_EXPORT const TQUuid TID_QUType_ptr;
-struct Q_EXPORT TQUType_ptr : public TQUType
+extern TQ_EXPORT const TQUuid TID_QUType_ptr;
+struct TQ_EXPORT TQUType_ptr : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -327,11 +327,11 @@ struct Q_EXPORT TQUType_ptr : public TQUType
     int serializeTo( TQUObject *, TQUBuffer * );
     int serializeFrom( TQUObject *, TQUBuffer * );
 };
-extern Q_EXPORT TQUType_ptr static_QUType_ptr;
+extern TQ_EXPORT TQUType_ptr static_QUType_ptr;
 
 // {97A2594D-6496-4402-A11E-55AEF2D4D25C}
-extern Q_EXPORT const TQUuid TID_QUType_iface;
-struct Q_EXPORT TQUType_iface : public TQUType
+extern TQ_EXPORT const TQUuid TID_QUType_iface;
+struct TQ_EXPORT TQUType_iface : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -346,11 +346,11 @@ struct Q_EXPORT TQUType_iface : public TQUType
     int serializeTo( TQUObject *, TQUBuffer * );
     int serializeFrom( TQUObject *, TQUBuffer * );
 };
-extern Q_EXPORT TQUType_iface static_QUType_iface;
+extern TQ_EXPORT TQUType_iface static_QUType_iface;
 
 // {2F358164-E28F-4bf4-9FA9-4E0CDCABA50B}
-extern Q_EXPORT const TQUuid TID_QUType_idisp;
-struct Q_EXPORT TQUType_idisp : public TQUType
+extern TQ_EXPORT const TQUuid TID_QUType_idisp;
+struct TQ_EXPORT TQUType_idisp : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -365,11 +365,11 @@ struct Q_EXPORT TQUType_idisp : public TQUType
     int serializeTo( TQUObject *, TQUBuffer * );
     int serializeFrom( TQUObject *, TQUBuffer * );
 };
-extern Q_EXPORT TQUType_idisp static_QUType_idisp;
+extern TQ_EXPORT TQUType_idisp static_QUType_idisp;
 
 // {CA42115D-13D0-456c-82B5-FC10187F313E}
-extern Q_EXPORT const TQUuid TID_QUType_bool;
-struct Q_EXPORT TQUType_bool : public TQUType
+extern TQ_EXPORT const TQUuid TID_QUType_bool;
+struct TQ_EXPORT TQUType_bool : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -384,11 +384,11 @@ struct Q_EXPORT TQUType_bool : public TQUType
     int serializeTo( TQUObject *, TQUBuffer * );
     int serializeFrom( TQUObject *, TQUBuffer * );
 };
-extern Q_EXPORT TQUType_bool static_QUType_bool;
+extern TQ_EXPORT TQUType_bool static_QUType_bool;
 
 // {53C1F3BE-73C3-4c7d-9E05-CCF09EB676B5}
-extern Q_EXPORT const TQUuid TID_QUType_int;
-struct Q_EXPORT TQUType_int : public TQUType
+extern TQ_EXPORT const TQUuid TID_QUType_int;
+struct TQ_EXPORT TQUType_int : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -403,12 +403,12 @@ struct Q_EXPORT TQUType_int : public TQUType
     int serializeTo( TQUObject *, TQUBuffer * );
     int serializeFrom( TQUObject *, TQUBuffer * );
 };
-extern Q_EXPORT TQUType_int static_QUType_int;
+extern TQ_EXPORT TQUType_int static_QUType_int;
 
 
 // {2D0974E5-0BA6-4ec2-8837-C198972CB48C}
-extern Q_EXPORT const TQUuid TID_QUType_double;
-struct Q_EXPORT TQUType_double : public TQUType
+extern TQ_EXPORT const TQUuid TID_QUType_double;
+struct TQ_EXPORT TQUType_double : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -423,12 +423,12 @@ struct Q_EXPORT TQUType_double : public TQUType
     int serializeTo( TQUObject *, TQUBuffer * );
     int serializeFrom( TQUObject *, TQUBuffer * );
 };
-extern Q_EXPORT TQUType_double static_QUType_double;
+extern TQ_EXPORT TQUType_double static_QUType_double;
 
 
 // {EFCDD1D4-77A3-4b8e-8D46-DC14B8D393E9}
-extern Q_EXPORT const TQUuid TID_QUType_charstar;
-struct Q_EXPORT TQUType_charstar : public TQUType
+extern TQ_EXPORT const TQUuid TID_QUType_charstar;
+struct TQ_EXPORT TQUType_charstar : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -444,12 +444,12 @@ struct Q_EXPORT TQUType_charstar : public TQUType
     int serializeFrom( TQUObject *, TQUBuffer * );
 
 };
-extern Q_EXPORT TQUType_charstar static_QUType_charstar;
+extern TQ_EXPORT TQUType_charstar static_QUType_charstar;
 
 // {44C2A547-01E7-4e56-8559-35AF9D2F42B7}
 extern const TQUuid TID_QUType_TQString;
 
-struct Q_EXPORT TQUType_TQString : public TQUType
+struct TQ_EXPORT TQUType_TQString : public TQUType
 {
     const TQUuid *uuid() const;
     const char *desc() const;
@@ -466,7 +466,7 @@ struct Q_EXPORT TQUType_TQString : public TQUType
     int serializeFrom( TQUObject *, TQUBuffer * );
 
 };
-extern Q_EXPORT TQUType_TQString static_QUType_TQString;
+extern TQ_EXPORT TQUType_TQString static_QUType_TQString;
 
 
 #endif // TQUCOM_P_H