Replace various Q_* and QT_* defines with TQ_* and TQT_*

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

19 files changed, 119 insertions, 119 deletions

diff --git a/doc/html/canvas-chart-example.html b/doc/html/canvas-chart-example.html
index a61b0503..4ec51828 100644
--- a/doc/html/canvas-chart-example.html
+++ b/doc/html/canvas-chart-example.html
@@ -125,7 +125,7 @@ public:
 
 #ifdef TQ_FULL_TEMPLATE_INSTANTIATION
     // xlC 3.x workaround
-    Q_DUMMY_COMPARISON_OPERATOR(Element)
+    TQ_DUMMY_COMPARISON_OPERATOR(Element)
     bool operator!=( const Element& e) const {
         return ( !(e == *this) );
     }
diff --git a/doc/html/chart-element-h.html b/doc/html/chart-element-h.html
index db2295b0..cc889543 100644
--- a/doc/html/chart-element-h.html
+++ b/doc/html/chart-element-h.html
@@ -93,7 +93,7 @@ public:
 
 #ifdef TQ_FULL_TEMPLATE_INSTANTIATION
     // xlC 3.x workaround
-    Q_DUMMY_COMPARISON_OPERATOR(Element)
+    TQ_DUMMY_COMPARISON_OPERATOR(Element)
     bool operator!=( const Element& e) const {
         return ( !(e == *this) );
     }
diff --git a/doc/html/emb-install.html b/doc/html/emb-install.html
index 9d2d4334..fb17287a 100644
--- a/doc/html/emb-install.html
+++ b/doc/html/emb-install.html
@@ -71,7 +71,7 @@ a little-endian machine (e.g. x86) for a big-endian processor
 (e.g. PowerPC) will use the host's endianness instead of the
 target's. Workaround: after running configure, and before running
 make, edit <tt>$TQTDIR/include/ntqconfig.h</tt> and change the definition of
-<tt>Q_BYTE_ORDER</tt>.
+<tt>TQ_BYTE_ORDER</tt>.
 <p> <li> Enable framebuffer support.
 <p> You may need to recompile your kernel to enable the framebuffer.
 This document does not describe how to do this; the
diff --git a/doc/html/i18n-example.html b/doc/html/i18n-example.html
index 88a09baa..3ed7e40f 100644
--- a/doc/html/i18n-example.html
+++ b/doc/html/i18n-example.html
@@ -133,9 +133,9 @@ private:
 }
 
 static const char* choices[] = {
-    QT_TRANSLATE_NOOP( "MyWidget", "First" ),
-    QT_TRANSLATE_NOOP( "MyWidget", "Second" ),
-    QT_TRANSLATE_NOOP( "MyWidget", "Third" ),
+    TQT_TRANSLATE_NOOP( "MyWidget", "First" ),
+    TQT_TRANSLATE_NOOP( "MyWidget", "Second" ),
+    TQT_TRANSLATE_NOOP( "MyWidget", "Third" ),
     0
 };
 
diff --git a/doc/html/i18n.html b/doc/html/i18n.html
index 9f74d115..9cd85c5b 100644
--- a/doc/html/i18n.html
+++ b/doc/html/i18n.html
@@ -210,27 +210,27 @@ directly:
 </pre>
  
 <p> If you need to have translatable text completely
-outside a function, there are two macros to help: QT_TR_NOOP()
-and QT_TRANSLATE_NOOP(). They merely mark the text for
+outside a function, there are two macros to help: TQT_TR_NOOP()
+and TQT_TRANSLATE_NOOP(). They merely mark the text for
 extraction by the <em>lupdate</em> utility described below.
 The macros expand to just the text (without the context).
-<p> Example of QT_TR_NOOP():
+<p> Example of TQT_TR_NOOP():
 <pre>
     TQString FriendlyConversation::greeting( int greet_type )
     {
         static const char* greeting_strings[] = {
-            QT_TR_NOOP( "Hello" ),
-            QT_TR_NOOP( "Goodbye" )
+            TQT_TR_NOOP( "Hello" ),
+            TQT_TR_NOOP( "Goodbye" )
         };
         return tr( greeting_strings[greet_type] );
     }
 </pre>
  
-<p> Example of QT_TRANSLATE_NOOP():
+<p> Example of TQT_TRANSLATE_NOOP():
 <pre>
     static const char* greeting_strings[] = {
-        QT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ),
-        QT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" )
+        TQT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ),
+        TQT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" )
     };
 
     TQString FriendlyConversation::greeting( int greet_type )
diff --git a/doc/html/linguist-manual-4.html b/doc/html/linguist-manual-4.html
index a8b312e6..897b784c 100644
--- a/doc/html/linguist-manual-4.html
+++ b/doc/html/linguist-manual-4.html
@@ -140,24 +140,24 @@ body { background: #ffffff; color: black; }
                 logwid );
     }
 </pre>
-<h5><a name="1-7-2"></a>Using QT_TR_NOOP() and QT_TRANSLATE_NOOP()</h5>
-<p>If you need to have translatable text completely outside a function, there are two macros to help: QT_TR_NOOP() and QT_TRANSLATE_NOOP(). These macros merely mark the text for extraction by <a href="linguist-manual-2.html#2">lupdate</a>. The macros expand to just the text (without the context).</p>
-<p>Example of QT_TR_NOOP():</p>
+<h5><a name="1-7-2"></a>Using TQT_TR_NOOP() and TQT_TRANSLATE_NOOP()</h5>
+<p>If you need to have translatable text completely outside a function, there are two macros to help: TQT_TR_NOOP() and TQT_TRANSLATE_NOOP(). These macros merely mark the text for extraction by <a href="linguist-manual-2.html#2">lupdate</a>. The macros expand to just the text (without the context).</p>
+<p>Example of TQT_TR_NOOP():</p>
 <pre>
     TQString FriendlyConversation::greeting( int greet_type )
     {
         static const char* greeting_strings[] = {
-            QT_TR_NOOP( "Hello" ),
-            QT_TR_NOOP( "Goodbye" )
+            TQT_TR_NOOP( "Hello" ),
+            TQT_TR_NOOP( "Goodbye" )
         };
         return tr( greeting_strings[greet_type] );
     }
 </pre>
-<p>Example of QT_TRANSLATE_NOOP():</p>
+<p>Example of TQT_TRANSLATE_NOOP():</p>
 <pre>
     static const char* greeting_strings[] = {
-        QT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ),
-        QT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" )
+        TQT_TRANSLATE_NOOP( "FriendlyConversation", "Hello" ),
+        TQT_TRANSLATE_NOOP( "FriendlyConversation", "Goodbye" )
     };
 
     TQString FriendlyConversation::greeting( int greet_type )
diff --git a/doc/html/qaccessible-h.html b/doc/html/qaccessible-h.html
index eb72d2fe..0a382c04 100644
--- a/doc/html/qaccessible-h.html
+++ b/doc/html/qaccessible-h.html
@@ -313,7 +313,7 @@ public:
     virtual ~TQAccessibleObject();
 
     TQRESULT	queryInterface( const TQUuid &amp;, TQUnknownInterface** );
-    Q_REFCOUNT
+    TQ_REFCOUNT
 
     bool	isValid() const;
 
diff --git a/doc/html/qaxfactory-h.html b/doc/html/qaxfactory-h.html
index 47682381..3dda2b49 100644
--- a/doc/html/qaxfactory-h.html
+++ b/doc/html/qaxfactory-h.html
@@ -113,7 +113,7 @@ class TQAxFactory : public TQAxFactoryInterface
 public:
     TQAxFactory( const TQUuid &amp;, const TQUuid &amp;);
     virtual ~TQAxFactory();
-    Q_REFCOUNT;
+    TQ_REFCOUNT;
 
     TQRESULT queryInterface( const TQUuid &amp;iid, TQUnknownInterface **iface );
 
diff --git a/doc/html/qdns-h.html b/doc/html/qdns-h.html
index bbde601d..93eef9cb 100644
--- a/doc/html/qdns-h.html
+++ b/doc/html/qdns-h.html
@@ -133,7 +133,7 @@ public:
 	    :name(n), priority(p) {}
 	TQString name;
 	TQ_UINT16 priority;
-	Q_DUMMY_COMPARISON_OPERATOR(MailServer)
+	TQ_DUMMY_COMPARISON_OPERATOR(MailServer)
     };
     TQValueList&lt;MailServer&gt; mailServers() const;
 
@@ -145,7 +145,7 @@ public:
 	TQ_UINT16 priority;
 	TQ_UINT16 weight;
 	TQ_UINT16 port;
-	Q_DUMMY_COMPARISON_OPERATOR(Server)
+	TQ_DUMMY_COMPARISON_OPERATOR(Server)
     };
     TQValueList&lt;Server&gt; servers() const;
 
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index d3caac65..7716167c 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -282,12 +282,12 @@ body { background: #ffffff; color: black; }
 #  define Q_CC_MSVC
 /* proper support of bool for _MSC_VER &gt;= 1100 */
 #  define Q_CANNOT_DELETE_CONSTANT
-#  define Q_INLINE_TEMPLATES inline
+#  define TQ_INLINE_TEMPLATES inline
 /* Visual C++.Net issues for _MSC_VER &gt;= 1300 */
 #  if _MSC_VER &gt;= 1300
 #    define Q_CC_MSVC_NET
 #    if _MSC_VER &lt; 1310 || (defined(Q_OS_WIN64) &amp;&amp; defined(_M_IA64))
-#      define Q_TYPENAME
+#      define TQ_TYPENAME
 #    endif
 #  endif
 /* Intel C++ disguising as Visual C++: the `using' keyword avoids warnings */
@@ -312,7 +312,7 @@ body { background: #ffffff; color: black; }
 #  define Q_CC_WAT
 #  if defined(Q_OS_QNX4)
 /* compiler flags */
-#    define Q_TYPENAME
+#    define TQ_TYPENAME
 #    define Q_NO_BOOL_TYPE
 #    define Q_CANNOT_DELETE_CONSTANT
 #    define mutable
@@ -391,8 +391,8 @@ body { background: #ffffff; color: black; }
 #    define Q_NO_BOOL_TYPE
 #    define Q_NO_EXPLICIT_KEYWORD
 #    define Q_NO_USING_KEYWORD
-#    define Q_TYPENAME
-#    define Q_INLINE_TEMPLATES inline
+#    define TQ_TYPENAME
+#    define TQ_INLINE_TEMPLATES inline
 #    define Q_BROKEN_TEMPLATE_SPECIALIZATION
 #    define Q_CANNOT_DELETE_CONSTANT
 #  endif
@@ -420,12 +420,12 @@ body { background: #ffffff; color: black; }
 /* Apply to all versions prior to Compaq C++ V6.0-000 - observed on
    DEC C++ V5.5-004. */
 #  if __DECCXX_VER &lt; 60060000
-#    define Q_TYPENAME
+#    define TQ_TYPENAME
 #    define Q_BROKEN_TEMPLATE_SPECIALIZATION
 #    define Q_CANNOT_DELETE_CONSTANT
 #  endif
 /* avoid undefined symbol problems with out-of-line template members */
-#  define Q_INLINE_TEMPLATES inline
+#  define TQ_INLINE_TEMPLATES inline
 
 /* Compilers with EDG front end are similar. To detect them we test:
    __EDG documented by SGI, observed on MIPSpro 7.3.1.1 and KAI C++ 4.0b
@@ -482,7 +482,7 @@ body { background: #ffffff; color: black; }
 #    define Q_CC_USLC
 /* The latest UDK 7.1.1b does not need this, but previous versions do */
 #    if !defined(__SCO_VERSION__) || (__SCO_VERSION__ &lt; 302200010)
-#      define Q_INLINE_TEMPLATES inline
+#      define TQ_INLINE_TEMPLATES inline
 #    endif
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
 
@@ -505,12 +505,12 @@ body { background: #ffffff; color: black; }
 #  elif defined(__sgi)
 #    define Q_CC_MIPS
 #    if defined(_MIPS_SIM) &amp;&amp; (_MIPS_SIM == _ABIO32) /* o32 ABI */
-#      define Q_TYPENAME
+#      define TQ_TYPENAME
 #      define Q_BROKEN_TEMPLATE_SPECIALIZATION
 #      define Q_NO_EXPLICIT_KEYWORD
-#      define Q_INLINE_TEMPLATES inline
+#      define TQ_INLINE_TEMPLATES inline
 #    elif defined(_COMPILER_VERSION) &amp;&amp; (_COMPILER_VERSION &lt; 730) /* 7.2 */
-#      define Q_TYPENAME
+#      define TQ_TYPENAME
 #      define Q_BROKEN_TEMPLATE_SPECIALIZATION
 #    endif
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
@@ -522,11 +522,11 @@ body { background: #ffffff; color: black; }
 /* The older UnixWare 2.X compiler? */
 #elif defined(__USLC__)
 #  define Q_CC_USLC
-#  define Q_TYPENAME
+#  define TQ_TYPENAME
 #  define Q_NO_BOOL_TYPE
 #  define Q_NO_EXPLICIT_KEYWORD
 #  define Q_NO_USING_KEYWORD
-#  define Q_INLINE_TEMPLATES inline
+#  define TQ_INLINE_TEMPLATES inline
 
 /* Never tested! */
 #elif defined(__HIGHC__)
@@ -954,12 +954,12 @@ Q_EXPORT int qWinVersion();
 #define QT_WA_INLINE( uni, ansi ) ( uni )
 #endif
 
-#ifndef Q_INLINE_TEMPLATES
-#  define Q_INLINE_TEMPLATES
+#ifndef TQ_INLINE_TEMPLATES
+#  define TQ_INLINE_TEMPLATES
 #endif
 
-#ifndef Q_TYPENAME
-#  define Q_TYPENAME typename
+#ifndef TQ_TYPENAME
+#  define TQ_TYPENAME typename
 #endif
 
 //
@@ -1082,13 +1082,13 @@ Q_EXPORT const char *tqInstallPathSysconf();
  mandating a real implementation.
 */
 #ifdef TQ_FULL_TEMPLATE_INSTANTIATION
-#  define Q_DUMMY_COMPARISON_OPERATOR(C) \
+#  define TQ_DUMMY_COMPARISON_OPERATOR(C) \
     bool operator==( const C&amp; ) const { \
         tqWarning( #C"::operator==( const "#C"&amp; ) got called." ); \
         return FALSE; \
     }
 #else
-#  define Q_DUMMY_COMPARISON_OPERATOR(C)
+#  define TQ_DUMMY_COMPARISON_OPERATOR(C)
 #endif
 
 #endif /* TQGLOBAL_H */
diff --git a/doc/html/qiconset-h.html b/doc/html/qiconset-h.html
index 86d97955..1b736da5 100644
--- a/doc/html/qiconset-h.html
+++ b/doc/html/qiconset-h.html
@@ -126,7 +126,7 @@ public:
     static const TQSize&amp; iconSize( Size which );
 
 #ifndef Q_QDOC
-    Q_DUMMY_COMPARISON_OPERATOR(TQIconSet)
+    TQ_DUMMY_COMPARISON_OPERATOR(TQIconSet)
 #endif
 
 private:
diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html
index 42ccd626..805efb03 100644
--- a/doc/html/qmap-h.html
+++ b/doc/html/qmap-h.html
@@ -202,7 +202,7 @@ public:
 };
 
 template &lt;class K, class T&gt;
-Q_INLINE_TEMPLATES int TQMapIterator&lt;K,T&gt;::inc()
+TQ_INLINE_TEMPLATES int TQMapIterator&lt;K,T&gt;::inc()
 {
     TQMapNodeBase* tmp = node;
     if ( tmp-&gt;right ) {
@@ -223,7 +223,7 @@ Q_INLINE_TEMPLATES int TQMapIterator&lt;K,T&gt;::inc()
 }
 
 template &lt;class K, class T&gt;
-Q_INLINE_TEMPLATES int TQMapIterator&lt;K,T&gt;::dec()
+TQ_INLINE_TEMPLATES int TQMapIterator&lt;K,T&gt;::dec()
 {
     TQMapNodeBase* tmp = node;
     if (tmp-&gt;color == TQMapNodeBase::Red &amp;&amp;
@@ -318,7 +318,7 @@ public:
 };
 
 template &lt;class K, class T&gt;
-Q_INLINE_TEMPLATES int TQMapConstIterator&lt;K,T&gt;::inc()
+TQ_INLINE_TEMPLATES int TQMapConstIterator&lt;K,T&gt;::inc()
 {
     TQMapNodeBase* tmp = node;
     if ( tmp-&gt;right ) {
@@ -339,7 +339,7 @@ Q_INLINE_TEMPLATES int TQMapConstIterator&lt;K,T&gt;::inc()
 }
 
 template &lt;class K, class T&gt;
-Q_INLINE_TEMPLATES int TQMapConstIterator&lt;K,T&gt;::dec()
+TQ_INLINE_TEMPLATES int TQMapConstIterator&lt;K,T&gt;::dec()
 {
     TQMapNodeBase* tmp = node;
     if (tmp-&gt;color == TQMapNodeBase::Red &amp;&amp;
@@ -467,14 +467,14 @@ protected:
 
 
 template &lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES TQMapPrivate&lt;Key,T&gt;::TQMapPrivate() {
+TQ_INLINE_TEMPLATES TQMapPrivate&lt;Key,T&gt;::TQMapPrivate() {
     header = new Node;
     header-&gt;color = TQMapNodeBase::Red; // Mark the header
     header-&gt;parent = 0;
     header-&gt;left = header-&gt;right = header;
 }
 template &lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES TQMapPrivate&lt;Key,T&gt;::TQMapPrivate( const TQMapPrivate&lt; Key, T &gt;* _map ) : TQMapPrivateBase( _map ) {
+TQ_INLINE_TEMPLATES TQMapPrivate&lt;Key,T&gt;::TQMapPrivate( const TQMapPrivate&lt; Key, T &gt;* _map ) : TQMapPrivateBase( _map ) {
     header = new Node;
     header-&gt;color = TQMapNodeBase::Red; // Mark the header
     if ( _map-&gt;header-&gt;parent == 0 ) {
@@ -489,7 +489,7 @@ Q_INLINE_TEMPLATES TQMapPrivate&lt;Key,T&gt;::TQMapPrivate( const TQMapPrivate&l
 }
 
 template &lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::NodePtr TQMapPrivate&lt;Key,T&gt;::copy( Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::NodePtr p )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate&lt;Key,T&gt;::NodePtr TQMapPrivate&lt;Key,T&gt;::copy( TQ_TYPENAME TQMapPrivate&lt;Key,T&gt;::NodePtr p )
 {
     if ( !p )
 	return 0;
@@ -511,7 +511,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::NodePtr TQMapPrivate&lt
 }
 
 template &lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES void TQMapPrivate&lt;Key,T&gt;::clear()
+TQ_INLINE_TEMPLATES void TQMapPrivate&lt;Key,T&gt;::clear()
 {
     clear( (NodePtr)(header-&gt;parent) );
     header-&gt;color = TQMapNodeBase::Red;
@@ -521,7 +521,7 @@ Q_INLINE_TEMPLATES void TQMapPrivate&lt;Key,T&gt;::clear()
 }
 
 template &lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES void TQMapPrivate&lt;Key,T&gt;::clear( Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::NodePtr p )
+TQ_INLINE_TEMPLATES void TQMapPrivate&lt;Key,T&gt;::clear( TQ_TYPENAME TQMapPrivate&lt;Key,T&gt;::NodePtr p )
 {
     while ( p != 0 ) {
 	clear( (NodePtr)p-&gt;right );
@@ -532,7 +532,7 @@ Q_INLINE_TEMPLATES void TQMapPrivate&lt;Key,T&gt;::clear( Q_TYPENAME TQMapPrivat
 }
 
 template &lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::ConstIterator TQMapPrivate&lt;Key,T&gt;::find(const Key&amp; k) const
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate&lt;Key,T&gt;::ConstIterator TQMapPrivate&lt;Key,T&gt;::find(const Key&amp; k) const
 {
     TQMapNodeBase* y = header;        // Last node
     TQMapNodeBase* x = header-&gt;parent; // Root node.
@@ -555,7 +555,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::ConstIterator TQMapPriv
 }
 
 template &lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::Iterator TQMapPrivate&lt;Key,T&gt;::insertSingle( const Key&amp; k )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate&lt;Key,T&gt;::Iterator TQMapPrivate&lt;Key,T&gt;::insertSingle( const Key&amp; k )
 {
     // Search correct position in the tree
     TQMapNodeBase* y = header;
@@ -586,7 +586,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::Iterator TQMapPrivate&l
 
 
 template &lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::Iterator TQMapPrivate&lt;Key,T&gt;::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key&amp; k )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate&lt;Key,T&gt;::Iterator TQMapPrivate&lt;Key,T&gt;::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key&amp; k )
 {
     NodePtr z = new Node( k );
     if (y == header || x != 0 || k &lt; key(y) ) {
@@ -612,15 +612,15 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate&lt;Key,T&gt;::Iterator TQMapPrivate&l
 
 #ifdef QT_CHECK_RANGE
 # if !defined( TQT_NO_DEBUG ) &amp;&amp; defined( QT_CHECK_MAP_RANGE )
-#  define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" )
-#  define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() );
+#  define TQT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" )
+#  define TQT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() );
 # else
-#  define QT_CHECK_INVALID_MAP_ELEMENT
-#  define QT_CHECK_INVALID_MAP_ELEMENT_FATAL
+#  define TQT_CHECK_INVALID_MAP_ELEMENT
+#  define TQT_CHECK_INVALID_MAP_ELEMENT_FATAL
 # endif
 #else
-# define QT_CHECK_INVALID_MAP_ELEMENT
-# define QT_CHECK_INVALID_MAP_ELEMENT_FATAL
+# define TQT_CHECK_INVALID_MAP_ELEMENT
+# define TQT_CHECK_INVALID_MAP_ELEMENT_FATAL
 #endif
 
 template &lt;class T&gt; class TQDeepCopy;
@@ -670,7 +670,7 @@ public:
     TQMap( const std::map&lt;Key,T&gt;&amp; m )
     {
 	sh = new TQMapPrivate&lt;Key,T&gt;;
-	Q_TYPENAME std::map&lt;Key,T&gt;::const_iterator it = m.begin();
+	TQ_TYPENAME std::map&lt;Key,T&gt;::const_iterator it = m.begin();
 	for ( ; it != m.end(); ++it ) {
 	    value_type p( (*it).first, (*it).second );
 	    insert( p );
@@ -687,7 +687,7 @@ public:
     TQMap&lt;Key,T&gt;&amp; operator= ( const std::map&lt;Key,T&gt;&amp; m )
     {
 	clear();
-	Q_TYPENAME std::map&lt;Key,T&gt;::const_iterator it = m.begin();
+	TQ_TYPENAME std::map&lt;Key,T&gt;::const_iterator it = m.begin();
 	for ( ; it != m.end(); ++it ) {
 	    value_type p( (*it).first, (*it).second );
 	    insert( p );
@@ -737,7 +737,7 @@ public:
     const_iterator find ( const Key&amp; k ) const {	return sh-&gt;find( k ); }
 
     const T&amp; operator[] ( const Key&amp; k ) const
-	{ QT_CHECK_INVALID_MAP_ELEMENT; return sh-&gt;find( k ).data(); }
+	{ TQT_CHECK_INVALID_MAP_ELEMENT; return sh-&gt;find( k ).data(); }
     bool contains ( const Key&amp; k ) const
 	{ return find( k ) != end(); }
 	//{ return sh-&gt;find( k ) != ((const Priv*)sh)-&gt;end(); }
@@ -785,7 +785,7 @@ private:
 };
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES TQMap&lt;Key,T&gt;&amp; TQMap&lt;Key,T&gt;::operator= ( const TQMap&lt;Key,T&gt;&amp; m )
+TQ_INLINE_TEMPLATES TQMap&lt;Key,T&gt;&amp; TQMap&lt;Key,T&gt;::operator= ( const TQMap&lt;Key,T&gt;&amp; m )
 {
     m.sh-&gt;ref();
     if ( sh-&gt;deref() )
@@ -795,7 +795,7 @@ Q_INLINE_TEMPLATES TQMap&lt;Key,T&gt;&amp; TQMap&lt;Key,T&gt;::operator= ( const
 }
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQMap&lt;Key,T&gt;::insert_pair TQMap&lt;Key,T&gt;::insert( const Q_TYPENAME TQMap&lt;Key,T&gt;::value_type&amp; x )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap&lt;Key,T&gt;::insert_pair TQMap&lt;Key,T&gt;::insert( const TQ_TYPENAME TQMap&lt;Key,T&gt;::value_type&amp; x )
 {
     detach();
     size_type n = size();
@@ -809,7 +809,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap&lt;Key,T&gt;::insert_pair TQMap&lt;Key,T&gt;
 }
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::erase( const Key&amp; k )
+TQ_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::erase( const Key&amp; k )
 {
     detach();
     iterator it( sh-&gt;find( k ).node );
@@ -818,7 +818,7 @@ Q_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::erase( const Key&amp; k )
 }
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQMap&lt;Key,T&gt;::size_type TQMap&lt;Key,T&gt;::count( const Key&amp; k ) const
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap&lt;Key,T&gt;::size_type TQMap&lt;Key,T&gt;::count( const Key&amp; k ) const
 {
     const_iterator it( sh-&gt;find( k ).node );
     if ( it != end() ) {
@@ -833,7 +833,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap&lt;Key,T&gt;::size_type TQMap&lt;Key,T&gt;::
 }
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES T&amp; TQMap&lt;Key,T&gt;::operator[] ( const Key&amp; k )
+TQ_INLINE_TEMPLATES T&amp; TQMap&lt;Key,T&gt;::operator[] ( const Key&amp; k )
 {
     detach();
     TQMapNode&lt;Key,T&gt;* p = sh-&gt;find( k ).node;
@@ -843,7 +843,7 @@ Q_INLINE_TEMPLATES T&amp; TQMap&lt;Key,T&gt;::operator[] ( const Key&amp; k )
 }
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::clear()
+TQ_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::clear()
 {
     if ( sh-&gt;count == 1 )
 	sh-&gt;clear();
@@ -854,7 +854,7 @@ Q_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::clear()
 }
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQMap&lt;Key,T&gt;::iterator TQMap&lt;Key,T&gt;::insert( const Key&amp; key, const T&amp; value, bool overwrite )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap&lt;Key,T&gt;::iterator TQMap&lt;Key,T&gt;::insert( const Key&amp; key, const T&amp; value, bool overwrite )
 {
     detach();
     size_type n = size();
@@ -865,7 +865,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap&lt;Key,T&gt;::iterator TQMap&lt;Key,T&gt;::i
 }
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::remove( const Key&amp; k )
+TQ_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::remove( const Key&amp; k )
 {
     detach();
     iterator it( sh-&gt;find( k ).node );
@@ -874,7 +874,7 @@ Q_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::remove( const Key&amp; k )
 }
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::detachInternal()
+TQ_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::detachInternal()
 {
     sh-&gt;deref(); sh = new TQMapPrivate&lt;Key,T&gt;( sh );
 }
@@ -882,7 +882,7 @@ Q_INLINE_TEMPLATES void TQMap&lt;Key,T&gt;::detachInternal()
 
 #ifndef TQT_NO_DATASTREAM
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES TQDataStream&amp; operator&gt;&gt;( TQDataStream&amp; s, TQMap&lt;Key,T&gt;&amp; m ) {
+TQ_INLINE_TEMPLATES TQDataStream&amp; operator&gt;&gt;( TQDataStream&amp; s, TQMap&lt;Key,T&gt;&amp; m ) {
     m.clear();
     TQ_UINT32 c;
     s &gt;&gt; c;
@@ -898,7 +898,7 @@ Q_INLINE_TEMPLATES TQDataStream&amp; operator&gt;&gt;( TQDataStream&amp; s, TQMa
 
 
 template&lt;class Key, class T&gt;
-Q_INLINE_TEMPLATES TQDataStream&amp; operator&lt;&lt;( TQDataStream&amp; s, const TQMap&lt;Key,T&gt;&amp; m ) {
+TQ_INLINE_TEMPLATES TQDataStream&amp; operator&lt;&lt;( TQDataStream&amp; s, const TQMap&lt;Key,T&gt;&amp; m ) {
     s &lt;&lt; (TQ_UINT32)m.size();
     TQMapConstIterator&lt;Key,T&gt; it = m.begin();
     for( ; it != m.end(); ++it )
diff --git a/doc/html/qobject-h.html b/doc/html/qobject-h.html
index e1e15e88..e53fb992 100644
--- a/doc/html/qobject-h.html
+++ b/doc/html/qobject-h.html
@@ -85,8 +85,8 @@ body { background: #ffffff; color: black; }
 #include "ntqnamespace.h"
 #endif // QT_H
 
-#define QT_TR_NOOP(x) (x)
-#define QT_TRANSLATE_NOOP(scope,x) (x)
+#define TQT_TR_NOOP(x) (x)
+#define TQT_TRANSLATE_NOOP(scope,x) (x)
 
 class TQMetaObject;
 class TQVariant;
diff --git a/doc/html/qpair-h.html b/doc/html/qpair-h.html
index 7ae8495d..fdaf6fff 100644
--- a/doc/html/qpair-h.html
+++ b/doc/html/qpair-h.html
@@ -107,20 +107,20 @@ struct TQPair
 };
 
 template &lt;class T1, class T2&gt;
-Q_INLINE_TEMPLATES bool operator==( const TQPair&lt;T1, T2&gt;&amp; x, const TQPair&lt;T1, T2&gt;&amp; y )
+TQ_INLINE_TEMPLATES bool operator==( const TQPair&lt;T1, T2&gt;&amp; x, const TQPair&lt;T1, T2&gt;&amp; y )
 {
     return x.first == y.first &amp;&amp; x.second == y.second;
 }
 
 template &lt;class T1, class T2&gt;
-Q_INLINE_TEMPLATES bool operator&lt;( const TQPair&lt;T1, T2&gt;&amp; x, const TQPair&lt;T1, T2&gt;&amp; y )
+TQ_INLINE_TEMPLATES bool operator&lt;( const TQPair&lt;T1, T2&gt;&amp; x, const TQPair&lt;T1, T2&gt;&amp; y )
 {
     return x.first &lt; y.first ||
 	   ( !( y.first &lt; x.first ) &amp;&amp; x.second &lt; y.second );
 }
 
 template &lt;class T1, class T2&gt;
-Q_INLINE_TEMPLATES TQPair&lt;T1, T2&gt; qMakePair( const T1&amp; x, const T2&amp; y )
+TQ_INLINE_TEMPLATES TQPair&lt;T1, T2&gt; qMakePair( const T1&amp; x, const T2&amp; y )
 {
     return TQPair&lt;T1, T2&gt;( x, y );
 }
diff --git a/doc/html/qpixmap-h.html b/doc/html/qpixmap-h.html
index 385bd696..8a6a6618 100644
--- a/doc/html/qpixmap-h.html
+++ b/doc/html/qpixmap-h.html
@@ -212,7 +212,7 @@ public:
 #endif
 
 #ifndef Q_QDOC
-    Q_DUMMY_COMPARISON_OPERATOR(TQPixmap)
+    TQ_DUMMY_COMPARISON_OPERATOR(TQPixmap)
 #endif
 
 protected:
diff --git a/doc/html/qtl-qvaluelist-example.html b/doc/html/qtl-qvaluelist-example.html
index bb0f2dd3..d69ab3d1 100644
--- a/doc/html/qtl-qvaluelist-example.html
+++ b/doc/html/qtl-qvaluelist-example.html
@@ -65,7 +65,7 @@ public:
     void setSalary( int salary ) { s = salary; }
 
     // this is here to support very old compilers
-    Q_DUMMY_COMPARISON_OPERATOR( Employee )
+    TQ_DUMMY_COMPARISON_OPERATOR( Employee )
 
 private:
     <a href="ntqstring.html">TQString</a> n;
diff --git a/doc/html/qvaluelist-h.html b/doc/html/qvaluelist-h.html
index 91debfeb..9fb12791 100644
--- a/doc/html/qvaluelist-h.html
+++ b/doc/html/qvaluelist-h.html
@@ -294,13 +294,13 @@ public:
 };
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQValueListPrivate&lt;T&gt;::TQValueListPrivate()
+TQ_INLINE_TEMPLATES TQValueListPrivate&lt;T&gt;::TQValueListPrivate()
 {
     node = new Node; node-&gt;next = node-&gt;prev = node; nodes = 0;
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQValueListPrivate&lt;T&gt;::TQValueListPrivate( const TQValueListPrivate&lt;T&gt;&amp; _p )
+TQ_INLINE_TEMPLATES TQValueListPrivate&lt;T&gt;::TQValueListPrivate( const TQValueListPrivate&lt;T&gt;&amp; _p )
     : TQShared()
 {
     node = new Node; node-&gt;next = node-&gt;prev = node; nodes = 0;
@@ -312,7 +312,7 @@ Q_INLINE_TEMPLATES TQValueListPrivate&lt;T&gt;::TQValueListPrivate( const TQValu
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQValueListPrivate&lt;T&gt;::~TQValueListPrivate() {
+TQ_INLINE_TEMPLATES TQValueListPrivate&lt;T&gt;::~TQValueListPrivate() {
     NodePtr p = node-&gt;next;
     while( p != node ) {
 	NodePtr x = p-&gt;next;
@@ -323,7 +323,7 @@ Q_INLINE_TEMPLATES TQValueListPrivate&lt;T&gt;::~TQValueListPrivate() {
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator TQValueListPrivate&lt;T&gt;::insert( Q_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator it, const T&amp; x )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator TQValueListPrivate&lt;T&gt;::insert( TQ_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator it, const T&amp; x )
 {
     NodePtr p = new Node( x );
     p-&gt;next = it.node;
@@ -335,7 +335,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator TQValueListP
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator TQValueListPrivate&lt;T&gt;::remove( Q_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator it )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator TQValueListPrivate&lt;T&gt;::remove( TQ_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator it )
 {
     Q_ASSERT ( it.node != node );
     NodePtr next = it.node-&gt;next;
@@ -348,7 +348,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate&lt;T&gt;::Iterator TQValueListP
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr TQValueListPrivate&lt;T&gt;::find( Q_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr start, const T&amp; x ) const
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr TQValueListPrivate&lt;T&gt;::find( TQ_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr start, const T&amp; x ) const
 {
     ConstIterator first( start );
     ConstIterator last( node );
@@ -361,7 +361,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr TQValueListPr
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES int TQValueListPrivate&lt;T&gt;::findIndex( Q_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr start, const T&amp; x ) const
+TQ_INLINE_TEMPLATES int TQValueListPrivate&lt;T&gt;::findIndex( TQ_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr start, const T&amp; x ) const
 {
     ConstIterator first( start );
     ConstIterator last( node );
@@ -376,7 +376,7 @@ Q_INLINE_TEMPLATES int TQValueListPrivate&lt;T&gt;::findIndex( Q_TYPENAME TQValu
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES uint TQValueListPrivate&lt;T&gt;::contains( const T&amp; x ) const
+TQ_INLINE_TEMPLATES uint TQValueListPrivate&lt;T&gt;::contains( const T&amp; x ) const
 {
     uint result = 0;
     Iterator first = Iterator( node-&gt;next );
@@ -390,7 +390,7 @@ Q_INLINE_TEMPLATES uint TQValueListPrivate&lt;T&gt;::contains( const T&amp; x )
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES uint TQValueListPrivate&lt;T&gt;::remove( const T&amp; _x )
+TQ_INLINE_TEMPLATES uint TQValueListPrivate&lt;T&gt;::remove( const T&amp; _x )
 {
     const T x = _x;
     uint result = 0;
@@ -407,7 +407,7 @@ Q_INLINE_TEMPLATES uint TQValueListPrivate&lt;T&gt;::remove( const T&amp; _x )
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr TQValueListPrivate&lt;T&gt;::at( size_type i ) const
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr TQValueListPrivate&lt;T&gt;::at( size_type i ) const
 {
     Q_ASSERT( i &lt;= nodes );
     NodePtr p = node-&gt;next;
@@ -417,7 +417,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate&lt;T&gt;::NodePtr TQValueListPr
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES void TQValueListPrivate&lt;T&gt;::clear()
+TQ_INLINE_TEMPLATES void TQValueListPrivate&lt;T&gt;::clear()
 {
     nodes = 0;
     NodePtr p = node-&gt;next;
@@ -612,7 +612,7 @@ private:
 };
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES bool TQValueList&lt;T&gt;::operator== ( const TQValueList&lt;T&gt;&amp; l ) const
+TQ_INLINE_TEMPLATES bool TQValueList&lt;T&gt;::operator== ( const TQValueList&lt;T&gt;&amp; l ) const
 {
     if ( size() != l.size() )
 	return FALSE;
@@ -625,13 +625,13 @@ Q_INLINE_TEMPLATES bool TQValueList&lt;T&gt;::operator== ( const TQValueList&lt;
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES void TQValueList&lt;T&gt;::clear()
+TQ_INLINE_TEMPLATES void TQValueList&lt;T&gt;::clear()
 {
     if ( sh-&gt;count == 1 ) sh-&gt;clear(); else { sh-&gt;deref(); sh = new TQValueListPrivate&lt;T&gt;; }
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueList&lt;T&gt;::iterator TQValueList&lt;T&gt;::erase( Q_TYPENAME TQValueList&lt;T&gt;::iterator first, Q_TYPENAME TQValueList&lt;T&gt;::iterator last )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueList&lt;T&gt;::iterator TQValueList&lt;T&gt;::erase( TQ_TYPENAME TQValueList&lt;T&gt;::iterator first, TQ_TYPENAME TQValueList&lt;T&gt;::iterator last )
 {
     while ( first != last )
 	erase( first++ );
@@ -640,14 +640,14 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueList&lt;T&gt;::iterator TQValueList&lt;T&gt
 
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES void TQValueList&lt;T&gt;::insert( Q_TYPENAME TQValueList&lt;T&gt;::iterator pos, size_type n, const T&amp; x )
+TQ_INLINE_TEMPLATES void TQValueList&lt;T&gt;::insert( TQ_TYPENAME TQValueList&lt;T&gt;::iterator pos, size_type n, const T&amp; x )
 {
     for ( ; n &gt; 0; --n )
 	insert( pos, x );
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQValueList&lt;T&gt; TQValueList&lt;T&gt;::operator+ ( const TQValueList&lt;T&gt;&amp; l ) const
+TQ_INLINE_TEMPLATES TQValueList&lt;T&gt; TQValueList&lt;T&gt;::operator+ ( const TQValueList&lt;T&gt;&amp; l ) const
 {
     TQValueList&lt;T&gt; l2( *this );
     for( const_iterator it = l.begin(); it != l.end(); ++it )
@@ -656,7 +656,7 @@ Q_INLINE_TEMPLATES TQValueList&lt;T&gt; TQValueList&lt;T&gt;::operator+ ( const
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQValueList&lt;T&gt;&amp; TQValueList&lt;T&gt;::operator+= ( const TQValueList&lt;T&gt;&amp; l )
+TQ_INLINE_TEMPLATES TQValueList&lt;T&gt;&amp; TQValueList&lt;T&gt;::operator+= ( const TQValueList&lt;T&gt;&amp; l )
 {
     TQValueList&lt;T&gt; copy = l;
     for( const_iterator it = copy.begin(); it != copy.end(); ++it )
@@ -665,14 +665,14 @@ Q_INLINE_TEMPLATES TQValueList&lt;T&gt;&amp; TQValueList&lt;T&gt;::operator+= (
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES void TQValueList&lt;T&gt;::detachInternal()
+TQ_INLINE_TEMPLATES void TQValueList&lt;T&gt;::detachInternal()
 {
     sh-&gt;deref(); sh = new TQValueListPrivate&lt;T&gt;( *sh );
 }
 
 #ifndef TQT_NO_DATASTREAM
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQDataStream&amp; operator&gt;&gt;( TQDataStream&amp; s, TQValueList&lt;T&gt;&amp; l )
+TQ_INLINE_TEMPLATES TQDataStream&amp; operator&gt;&gt;( TQDataStream&amp; s, TQValueList&lt;T&gt;&amp; l )
 {
     l.clear();
     TQ_UINT32 c;
@@ -689,7 +689,7 @@ Q_INLINE_TEMPLATES TQDataStream&amp; operator&gt;&gt;( TQDataStream&amp; s, TQVa
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQDataStream&amp; operator&lt;&lt;( TQDataStream&amp; s, const TQValueList&lt;T&gt;&amp; l )
+TQ_INLINE_TEMPLATES TQDataStream&amp; operator&lt;&lt;( TQDataStream&amp; s, const TQValueList&lt;T&gt;&amp; l )
 {
     s &lt;&lt; (TQ_UINT32)l.size();
     TQValueListConstIterator&lt;T&gt; it = l.begin();
diff --git a/doc/html/qvaluevector-h.html b/doc/html/qvaluevector-h.html
index fdec18cf..413fe3aa 100644
--- a/doc/html/qvaluevector-h.html
+++ b/doc/html/qvaluevector-h.html
@@ -155,7 +155,7 @@ private:
 };
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQValueVectorPrivate&lt;T&gt;::TQValueVectorPrivate( const TQValueVectorPrivate&lt;T&gt;&amp; x )
+TQ_INLINE_TEMPLATES TQValueVectorPrivate&lt;T&gt;::TQValueVectorPrivate( const TQValueVectorPrivate&lt;T&gt;&amp; x )
     : TQShared()
 {
     size_t i = x.size();
@@ -176,7 +176,7 @@ Q_INLINE_TEMPLATES TQValueVectorPrivate&lt;T&gt;::TQValueVectorPrivate( const TQ
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQValueVectorPrivate&lt;T&gt;::TQValueVectorPrivate( size_t size )
+TQ_INLINE_TEMPLATES TQValueVectorPrivate&lt;T&gt;::TQValueVectorPrivate( size_t size )
 {
     if ( size &gt; 0 ) {
 	start = new T[size];
@@ -190,7 +190,7 @@ Q_INLINE_TEMPLATES TQValueVectorPrivate&lt;T&gt;::TQValueVectorPrivate( size_t s
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES void TQValueVectorPrivate&lt;T&gt;::insert( pointer pos, const T&amp; x )
+TQ_INLINE_TEMPLATES void TQValueVectorPrivate&lt;T&gt;::insert( pointer pos, const T&amp; x )
 {
     const size_t lastSize = size();
     const size_t n = lastSize !=0 ? 2*lastSize : 1;
@@ -207,7 +207,7 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate&lt;T&gt;::insert( pointer pos, cons
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES void TQValueVectorPrivate&lt;T&gt;::insert( pointer pos, size_t n, const T&amp; x )
+TQ_INLINE_TEMPLATES void TQValueVectorPrivate&lt;T&gt;::insert( pointer pos, size_t n, const T&amp; x )
 {
     if ( size_t( end - finish ) &gt;= n ) {
 	// enough room
@@ -247,7 +247,7 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate&lt;T&gt;::insert( pointer pos, size
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES void TQValueVectorPrivate&lt;T&gt;::reserve( size_t n )
+TQ_INLINE_TEMPLATES void TQValueVectorPrivate&lt;T&gt;::reserve( size_t n )
 {
     const size_t lastSize = size();
     pointer tmp = growAndCopy( n, start, finish );
@@ -257,7 +257,7 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate&lt;T&gt;::reserve( size_t n )
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueVectorPrivate&lt;T&gt;::pointer TQValueVectorPrivate&lt;T&gt;::growAndCopy( size_t n, pointer s, pointer f )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVectorPrivate&lt;T&gt;::pointer TQValueVectorPrivate&lt;T&gt;::growAndCopy( size_t n, pointer s, pointer f )
 {
     pointer newStart = new T[n];
     tqCopy( s, f, newStart );
@@ -525,21 +525,21 @@ private:
 };
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES TQValueVector&lt;T&gt;::TQValueVector( size_type n, const T&amp; val )
+TQ_INLINE_TEMPLATES TQValueVector&lt;T&gt;::TQValueVector( size_type n, const T&amp; val )
 {
     sh = new TQValueVectorPrivate&lt;T&gt;( n );
     tqFill( begin(), end(), val );
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES void TQValueVector&lt;T&gt;::detachInternal()
+TQ_INLINE_TEMPLATES void TQValueVector&lt;T&gt;::detachInternal()
 {
     sh-&gt;deref();
     sh = new TQValueVectorPrivate&lt;T&gt;( *sh );
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector&lt;T&gt;::iterator TQValueVector&lt;T&gt;::insert( iterator pos, const T&amp; x )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector&lt;T&gt;::iterator TQValueVector&lt;T&gt;::insert( iterator pos, const T&amp; x )
 {
     size_type offset = pos - sh-&gt;start;
     detach();
@@ -564,7 +564,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector&lt;T&gt;::iterator TQValueVector&lt;
 }
 
 template &lt;class T&gt;
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector&lt;T&gt;::iterator TQValueVector&lt;T&gt;::insert( iterator pos, size_type n, const T&amp; x )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector&lt;T&gt;::iterator TQValueVector&lt;T&gt;::insert( iterator pos, size_type n, const T&amp; x )
 {
     if ( n != 0 ) {
 	size_type offset = pos - sh-&gt;start;
@@ -578,7 +578,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector&lt;T&gt;::iterator TQValueVector&lt;
 
 #ifndef TQT_NO_DATASTREAM
 template&lt;class T&gt;
-Q_INLINE_TEMPLATES TQDataStream&amp; operator&gt;&gt;( TQDataStream&amp; s, TQValueVector&lt;T&gt;&amp; v )
+TQ_INLINE_TEMPLATES TQDataStream&amp; operator&gt;&gt;( TQDataStream&amp; s, TQValueVector&lt;T&gt;&amp; v )
 {
     v.clear();
     TQ_UINT32 c;
@@ -594,7 +594,7 @@ Q_INLINE_TEMPLATES TQDataStream&amp; operator&gt;&gt;( TQDataStream&amp; s, TQVa
 }
 
 template&lt;class T&gt;
-Q_INLINE_TEMPLATES TQDataStream&amp; operator&lt;&lt;( TQDataStream&amp; s, const TQValueVector&lt;T&gt;&amp; v )
+TQ_INLINE_TEMPLATES TQDataStream&amp; operator&lt;&lt;( TQDataStream&amp; s, const TQValueVector&lt;T&gt;&amp; v )
 {
     s &lt;&lt; (TQ_UINT32)v.size();
     // ### use typename TQValueVector&lt;T&gt;::const_iterator once all supported
diff --git a/doc/html/qwidgetfactory-h.html b/doc/html/qwidgetfactory-h.html
index 8c65ecc7..6d07ee06 100644
--- a/doc/html/qwidgetfactory-h.html
+++ b/doc/html/qwidgetfactory-h.html
@@ -187,7 +187,7 @@ private:
 	TQString name;
 	TQPixmap pix;
 	TQString field;
-	Q_DUMMY_COMPARISON_OPERATOR( Field )
+	TQ_DUMMY_COMPARISON_OPERATOR( Field )
     };
 
     struct SqlWidgetConnection
@@ -198,7 +198,7 @@ private:
 	TQString conn;
 	TQString table;
 	TQMap&lt;TQString, TQString&gt; *dbControls;
-	Q_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection )
+	TQ_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection )
     };
 
     TQValueList&lt;Image&gt; images;