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

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

bin/tqtfindtr

@@ -11,9 +11,9 @@ $translator='FULLNAME <EMAIL@ADDRESS>';
 $revision_date='YYYY-MM-DD';
 
 $real_mark = "tr";
-$noop_mark = "QT_TR_NOOP";
+$noop_mark = "TQT_TR_NOOP";
 $scoped_mark = "qApp->translate";
-$noop_scoped_mark = "QT_TRANSLATE_NOOP";
+$noop_scoped_mark = "TQT_TRANSLATE_NOOP";
 
 $header=
 '# This is a TQt message file in .po format.  Each msgid starts with

configure

@@ -398,9 +398,9 @@ while [ "$#" -gt 0 ]; do
 	;;
     endian)
         if [ "$VAL" = "little" ]; then
-            CFG_ENDIAN="Q_LITTLE_ENDIAN"
+            CFG_ENDIAN="TQ_LITTLE_ENDIAN"
         elif [ "$VAL" = "big" ]; then
-	    CFG_ENDIAN="Q_BIG_ENDIAN"
+	    CFG_ENDIAN="TQ_BIG_ENDIAN"
         else
 	    UNKNOWN_OPT=yes
 	fi
@@ -2406,9 +2406,9 @@ if [ "$CFG_ENDIAN" = "auto" ]; then
     if [ "$PLATFORM_MAC" = "yes" ]; then
         true
     elif $unixtests/endian.test $XQMAKESPEC $OPT_VERBOSE $relpath $outpath; then
-        CFG_ENDIAN="Q_LITTLE_ENDIAN"
+        CFG_ENDIAN="TQ_LITTLE_ENDIAN"
     else
-        CFG_ENDIAN="Q_BIG_ENDIAN"
+        CFG_ENDIAN="TQ_BIG_ENDIAN"
     fi
 fi
 
@@ -2989,28 +2989,28 @@ esac
 cat >> $outpath/include/ntqconfig.h.new <<EOF
 
 /* License information */
-#define QT_PRODUCT_LICENSEE "$Licensee"
+#define TQT_PRODUCT_LICENSEE "$Licensee"
 #define QT_PRODUCT_LICENSE  "$Products"
 
 /* Build key */
 #define TQT_BUILD_KEY "$TQT_BUILD_KEY"
 
 /* Machine byte-order */
-#define Q_BIG_ENDIAN 4321
-#define Q_LITTLE_ENDIAN 1234
+#define TQ_BIG_ENDIAN 4321
+#define TQ_LITTLE_ENDIAN 1234
 EOF
 if [ "$CFG_ENDIAN" = "auto" ]; then
 cat >> $outpath/include/ntqconfig.h.new << EOF
 #if defined(__BIG_ENDIAN__)
-# define Q_BYTE_ORDER Q_BIG_ENDIAN
+# define TQ_BYTE_ORDER TQ_BIG_ENDIAN
 #elif defined(__LITTLE_ENDIAN__)
-# define Q_BYTE_ORDER Q_LITTLE_ENDIAN
+# define TQ_BYTE_ORDER TQ_LITTLE_ENDIAN
 #else
 # message "Unable to determine byte order!"
 #endif
 EOF
 else
-echo "#define Q_BYTE_ORDER $CFG_ENDIAN" >> $outpath/include/ntqconfig.h.new
+echo "#define TQ_BYTE_ORDER $CFG_ENDIAN" >> $outpath/include/ntqconfig.h.new
 fi
 
 cat >> $outpath/include/ntqconfig.h.new << EOF

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) );
     }

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) );
     }

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

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
 };
 

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 )

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 )

doc/html/qaccessible-h.html

@@ -313,7 +313,7 @@ public:
     virtual ~TQAccessibleObject();
 
     TQRESULT	queryInterface( const TQUuid &, TQUnknownInterface** );
-    Q_REFCOUNT
+    TQ_REFCOUNT
 
     bool	isValid() const;
 

doc/html/qaxfactory-h.html

@@ -113,7 +113,7 @@ class TQAxFactory : public TQAxFactoryInterface
 public:
     TQAxFactory( const TQUuid &, const TQUuid &);
     virtual ~TQAxFactory();
-    Q_REFCOUNT;
+    TQ_REFCOUNT;
 
     TQRESULT queryInterface( const TQUuid &iid, TQUnknownInterface **iface );
 

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<MailServer> 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<Server> servers() const;
 

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 >= 1100 */
 #  define Q_CANNOT_DELETE_CONSTANT
-#  define Q_INLINE_TEMPLATES inline
+#  define TQ_INLINE_TEMPLATES inline
 /* Visual C++.Net issues for _MSC_VER >= 1300 */
 #  if _MSC_VER >= 1300
 #    define Q_CC_MSVC_NET
 #    if _MSC_VER < 1310 || (defined(Q_OS_WIN64) && 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 < 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__ < 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) && (_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) && (_COMPILER_VERSION < 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& ) const { \
         tqWarning( #C"::operator==( const "#C"& ) got called." ); \
         return FALSE; \
     }
 #else
-#  define Q_DUMMY_COMPARISON_OPERATOR(C)
+#  define TQ_DUMMY_COMPARISON_OPERATOR(C)
 #endif
 
 #endif /* TQGLOBAL_H */

doc/html/qiconset-h.html

@@ -126,7 +126,7 @@ public:
     static const TQSize& iconSize( Size which );
 
 #ifndef Q_QDOC
-    Q_DUMMY_COMPARISON_OPERATOR(TQIconSet)
+    TQ_DUMMY_COMPARISON_OPERATOR(TQIconSet)
 #endif
 
 private:

doc/html/qmap-h.html

@@ -202,7 +202,7 @@ public:
 };
 
 template <class K, class T>
-Q_INLINE_TEMPLATES int TQMapIterator<K,T>::inc()
+TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::inc()
 {
     TQMapNodeBase* tmp = node;
     if ( tmp->right ) {
@@ -223,7 +223,7 @@ Q_INLINE_TEMPLATES int TQMapIterator<K,T>::inc()
 }
 
 template <class K, class T>
-Q_INLINE_TEMPLATES int TQMapIterator<K,T>::dec()
+TQ_INLINE_TEMPLATES int TQMapIterator<K,T>::dec()
 {
     TQMapNodeBase* tmp = node;
     if (tmp->color == TQMapNodeBase::Red &&
@@ -318,7 +318,7 @@ public:
 };
 
 template <class K, class T>
-Q_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc()
+TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc()
 {
     TQMapNodeBase* tmp = node;
     if ( tmp->right ) {
@@ -339,7 +339,7 @@ Q_INLINE_TEMPLATES int TQMapConstIterator<K,T>::inc()
 }
 
 template <class K, class T>
-Q_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec()
+TQ_INLINE_TEMPLATES int TQMapConstIterator<K,T>::dec()
 {
     TQMapNodeBase* tmp = node;
     if (tmp->color == TQMapNodeBase::Red &&
@@ -467,14 +467,14 @@ protected:
 
 
 template <class Key, class T>
-Q_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate() {
+TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate() {
     header = new Node;
     header->color = TQMapNodeBase::Red; // Mark the header
     header->parent = 0;
     header->left = header->right = header;
 }
 template <class Key, class T>
-Q_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T >* _map ) : TQMapPrivateBase( _map ) {
+TQ_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate< Key, T >* _map ) : TQMapPrivateBase( _map ) {
     header = new Node;
     header->color = TQMapNodeBase::Red; // Mark the header
     if ( _map->header->parent == 0 ) {
@@ -489,7 +489,7 @@ Q_INLINE_TEMPLATES TQMapPrivate<Key,T>::TQMapPrivate( const TQMapPrivate&l
 }
 
 template <class Key, class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>::copy( Q_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate<Key,T>::copy( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
 {
     if ( !p )
 	return 0;
@@ -511,7 +511,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::NodePtr TQMapPrivate&lt
 }
 
 template <class Key, class T>
-Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear()
+TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear()
 {
     clear( (NodePtr)(header->parent) );
     header->color = TQMapNodeBase::Red;
@@ -521,7 +521,7 @@ Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear()
 }
 
 template <class Key, class T>
-Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( Q_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
+TQ_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( TQ_TYPENAME TQMapPrivate<Key,T>::NodePtr p )
 {
     while ( p != 0 ) {
 	clear( (NodePtr)p->right );
@@ -532,7 +532,7 @@ Q_INLINE_TEMPLATES void TQMapPrivate<Key,T>::clear( Q_TYPENAME TQMapPrivat
 }
 
 template <class Key, class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPrivate<Key,T>::find(const Key& k) const
 {
     TQMapNodeBase* y = header;        // Last node
     TQMapNodeBase* x = header->parent; // Root node.
@@ -555,7 +555,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::ConstIterator TQMapPriv
 }
 
 template <class Key, class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insertSingle( const Key& k )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insertSingle( const Key& k )
 {
     // Search correct position in the tree
     TQMapNodeBase* y = header;
@@ -586,7 +586,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate&l
 
 
 template <class Key, class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key& k )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate<Key,T>::insert( TQMapNodeBase* x, TQMapNodeBase* y, const Key& k )
 {
     NodePtr z = new Node( k );
     if (y == header || x != 0 || k < key(y) ) {
@@ -612,15 +612,15 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate&l
 
 #ifdef QT_CHECK_RANGE
 # if !defined( TQT_NO_DEBUG ) && 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 <class T> class TQDeepCopy;
@@ -670,7 +670,7 @@ public:
     TQMap( const std::map<Key,T>& m )
     {
 	sh = new TQMapPrivate<Key,T>;
-	Q_TYPENAME std::map<Key,T>::const_iterator it = m.begin();
+	TQ_TYPENAME std::map<Key,T>::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<Key,T>& operator= ( const std::map<Key,T>& m )
     {
 	clear();
-	Q_TYPENAME std::map<Key,T>::const_iterator it = m.begin();
+	TQ_TYPENAME std::map<Key,T>::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& k ) const {	return sh->find( k ); }
 
     const T& operator[] ( const Key& k ) const
-	{ QT_CHECK_INVALID_MAP_ELEMENT; return sh->find( k ).data(); }
+	{ TQT_CHECK_INVALID_MAP_ELEMENT; return sh->find( k ).data(); }
     bool contains ( const Key& k ) const
 	{ return find( k ) != end(); }
 	//{ return sh->find( k ) != ((const Priv*)sh)->end(); }
@@ -785,7 +785,7 @@ private:
 };
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m )
+TQ_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const TQMap<Key,T>& m )
 {
     m.sh->ref();
     if ( sh->deref() )
@@ -795,7 +795,7 @@ Q_INLINE_TEMPLATES TQMap<Key,T>& TQMap<Key,T>::operator= ( const
 }
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert( const Q_TYPENAME TQMap<Key,T>::value_type& x )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>::insert( const TQ_TYPENAME TQMap<Key,T>::value_type& x )
 {
     detach();
     size_type n = size();
@@ -809,7 +809,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::insert_pair TQMap<Key,T>
 }
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k )
+TQ_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k )
 {
     detach();
     iterator it( sh->find( k ).node );
@@ -818,7 +818,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::erase( const Key& k )
 }
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const Key& k ) const
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::count( const Key& k ) const
 {
     const_iterator it( sh->find( k ).node );
     if ( it != end() ) {
@@ -833,7 +833,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::size_type TQMap<Key,T>::
 }
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k )
+TQ_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k )
 {
     detach();
     TQMapNode<Key,T>* p = sh->find( k ).node;
@@ -843,7 +843,7 @@ Q_INLINE_TEMPLATES T& TQMap<Key,T>::operator[] ( const Key& k )
 }
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES void TQMap<Key,T>::clear()
+TQ_INLINE_TEMPLATES void TQMap<Key,T>::clear()
 {
     if ( sh->count == 1 )
 	sh->clear();
@@ -854,7 +854,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::clear()
 }
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const Key& key, const T& value, bool overwrite )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::insert( const Key& key, const T& value, bool overwrite )
 {
     detach();
     size_type n = size();
@@ -865,7 +865,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMap<Key,T>::iterator TQMap<Key,T>::i
 }
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k )
+TQ_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k )
 {
     detach();
     iterator it( sh->find( k ).node );
@@ -874,7 +874,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::remove( const Key& k )
 }
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal()
+TQ_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal()
 {
     sh->deref(); sh = new TQMapPrivate<Key,T>( sh );
 }
@@ -882,7 +882,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal()
 
 #ifndef TQT_NO_DATASTREAM
 template<class Key, class T>
-Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) {
+TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) {
     m.clear();
     TQ_UINT32 c;
     s >> c;
@@ -898,7 +898,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMa
 
 
 template<class Key, class T>
-Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>& m ) {
+TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQMap<Key,T>& m ) {
     s << (TQ_UINT32)m.size();
     TQMapConstIterator<Key,T> it = m.begin();
     for( ; it != m.end(); ++it )

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;

doc/html/qpair-h.html

@@ -107,20 +107,20 @@ struct TQPair
 };
 
 template <class T1, class T2>
-Q_INLINE_TEMPLATES bool operator==( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
+TQ_INLINE_TEMPLATES bool operator==( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
 {
     return x.first == y.first && x.second == y.second;
 }
 
 template <class T1, class T2>
-Q_INLINE_TEMPLATES bool operator<( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
+TQ_INLINE_TEMPLATES bool operator<( const TQPair<T1, T2>& x, const TQPair<T1, T2>& y )
 {
     return x.first < y.first ||
 	   ( !( y.first < x.first ) && x.second < y.second );
 }
 
 template <class T1, class T2>
-Q_INLINE_TEMPLATES TQPair<T1, T2> qMakePair( const T1& x, const T2& y )
+TQ_INLINE_TEMPLATES TQPair<T1, T2> qMakePair( const T1& x, const T2& y )
 {
     return TQPair<T1, T2>( x, y );
 }

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:

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;

doc/html/qvaluelist-h.html

@@ -294,13 +294,13 @@ public:
 };
 
 template <class T>
-Q_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate()
+TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate()
 {
     node = new Node; node->next = node->prev = node; nodes = 0;
 }
 
 template <class T>
-Q_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQValueListPrivate<T>& _p )
+TQ_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQValueListPrivate<T>& _p )
     : TQShared()
 {
     node = new Node; node->next = node->prev = node; nodes = 0;
@@ -312,7 +312,7 @@ Q_INLINE_TEMPLATES TQValueListPrivate<T>::TQValueListPrivate( const TQValu
 }
 
 template <class T>
-Q_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() {
+TQ_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() {
     NodePtr p = node->next;
     while( p != node ) {
 	NodePtr x = p->next;
@@ -323,7 +323,7 @@ Q_INLINE_TEMPLATES TQValueListPrivate<T>::~TQValueListPrivate() {
 }
 
 template <class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::insert( Q_TYPENAME TQValueListPrivate<T>::Iterator it, const T& x )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::insert( TQ_TYPENAME TQValueListPrivate<T>::Iterator it, const T& x )
 {
     NodePtr p = new Node( x );
     p->next = it.node;
@@ -335,7 +335,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::Iterator TQValueListP
 }
 
 template <class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::remove( Q_TYPENAME TQValueListPrivate<T>::Iterator it )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::Iterator TQValueListPrivate<T>::remove( TQ_TYPENAME TQValueListPrivate<T>::Iterator it )
 {
     Q_ASSERT ( it.node != node );
     NodePtr next = it.node->next;
@@ -348,7 +348,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::Iterator TQValueListP
 }
 
 template <class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::find( Q_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::find( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
 {
     ConstIterator first( start );
     ConstIterator last( node );
@@ -361,7 +361,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPr
 }
 
 template <class T>
-Q_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( Q_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
+TQ_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( TQ_TYPENAME TQValueListPrivate<T>::NodePtr start, const T& x ) const
 {
     ConstIterator first( start );
     ConstIterator last( node );
@@ -376,7 +376,7 @@ Q_INLINE_TEMPLATES int TQValueListPrivate<T>::findIndex( Q_TYPENAME TQValu
 }
 
 template <class T>
-Q_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x ) const
+TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x ) const
 {
     uint result = 0;
     Iterator first = Iterator( node->next );
@@ -390,7 +390,7 @@ Q_INLINE_TEMPLATES uint TQValueListPrivate<T>::contains( const T& x )
 }
 
 template <class T>
-Q_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x )
+TQ_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x )
 {
     const T x = _x;
     uint result = 0;
@@ -407,7 +407,7 @@ Q_INLINE_TEMPLATES uint TQValueListPrivate<T>::remove( const T& _x )
 }
 
 template <class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::at( size_type i ) const
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPrivate<T>::at( size_type i ) const
 {
     Q_ASSERT( i <= nodes );
     NodePtr p = node->next;
@@ -417,7 +417,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueListPrivate<T>::NodePtr TQValueListPr
 }
 
 template <class T>
-Q_INLINE_TEMPLATES void TQValueListPrivate<T>::clear()
+TQ_INLINE_TEMPLATES void TQValueListPrivate<T>::clear()
 {
     nodes = 0;
     NodePtr p = node->next;
@@ -612,7 +612,7 @@ private:
 };
 
 template <class T>
-Q_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList<T>& l ) const
+TQ_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList<T>& l ) const
 {
     if ( size() != l.size() )
 	return FALSE;
@@ -625,13 +625,13 @@ Q_INLINE_TEMPLATES bool TQValueList<T>::operator== ( const TQValueList<
 }
 
 template <class T>
-Q_INLINE_TEMPLATES void TQValueList<T>::clear()
+TQ_INLINE_TEMPLATES void TQValueList<T>::clear()
 {
     if ( sh->count == 1 ) sh->clear(); else { sh->deref(); sh = new TQValueListPrivate<T>; }
 }
 
 template <class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueList<T>::iterator TQValueList<T>::erase( Q_TYPENAME TQValueList<T>::iterator first, Q_TYPENAME TQValueList<T>::iterator last )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueList<T>::iterator TQValueList<T>::erase( TQ_TYPENAME TQValueList<T>::iterator first, TQ_TYPENAME TQValueList<T>::iterator last )
 {
     while ( first != last )
 	erase( first++ );
@@ -640,14 +640,14 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueList<T>::iterator TQValueList<T&gt
 
 
 template <class T>
-Q_INLINE_TEMPLATES void TQValueList<T>::insert( Q_TYPENAME TQValueList<T>::iterator pos, size_type n, const T& x )
+TQ_INLINE_TEMPLATES void TQValueList<T>::insert( TQ_TYPENAME TQValueList<T>::iterator pos, size_type n, const T& x )
 {
     for ( ; n > 0; --n )
 	insert( pos, x );
 }
 
 template <class T>
-Q_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const TQValueList<T>& l ) const
+TQ_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const TQValueList<T>& l ) const
 {
     TQValueList<T> l2( *this );
     for( const_iterator it = l.begin(); it != l.end(); ++it )
@@ -656,7 +656,7 @@ Q_INLINE_TEMPLATES TQValueList<T> TQValueList<T>::operator+ ( const
 }
 
 template <class T>
-Q_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= ( const TQValueList<T>& l )
+TQ_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= ( const TQValueList<T>& l )
 {
     TQValueList<T> copy = l;
     for( const_iterator it = copy.begin(); it != copy.end(); ++it )
@@ -665,14 +665,14 @@ Q_INLINE_TEMPLATES TQValueList<T>& TQValueList<T>::operator+= (
 }
 
 template <class T>
-Q_INLINE_TEMPLATES void TQValueList<T>::detachInternal()
+TQ_INLINE_TEMPLATES void TQValueList<T>::detachInternal()
 {
     sh->deref(); sh = new TQValueListPrivate<T>( *sh );
 }
 
 #ifndef TQT_NO_DATASTREAM
 template <class T>
-Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l )
+TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l )
 {
     l.clear();
     TQ_UINT32 c;
@@ -689,7 +689,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQVa
 }
 
 template <class T>
-Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList<T>& l )
+TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList<T>& l )
 {
     s << (TQ_UINT32)l.size();
     TQValueListConstIterator<T> it = l.begin();

doc/html/qvaluevector-h.html

@@ -155,7 +155,7 @@ private:
 };
 
 template <class T>
-Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValueVectorPrivate<T>& x )
+TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQValueVectorPrivate<T>& x )
     : TQShared()
 {
     size_t i = x.size();
@@ -176,7 +176,7 @@ Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( const TQ
 }
 
 template <class T>
-Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t size )
+TQ_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t size )
 {
     if ( size > 0 ) {
 	start = new T[size];
@@ -190,7 +190,7 @@ Q_INLINE_TEMPLATES TQValueVectorPrivate<T>::TQValueVectorPrivate( size_t s
 }
 
 template <class T>
-Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, const T& x )
+TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, const T& x )
 {
     const size_t lastSize = size();
     const size_t n = lastSize !=0 ? 2*lastSize : 1;
@@ -207,7 +207,7 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, cons
 }
 
 template <class T>
-Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size_t n, const T& x )
+TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size_t n, const T& x )
 {
     if ( size_t( end - finish ) >= n ) {
 	// enough room
@@ -247,7 +247,7 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::insert( pointer pos, size
 }
 
 template <class T>
-Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n )
+TQ_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n )
 {
     const size_t lastSize = size();
     pointer tmp = growAndCopy( n, start, finish );
@@ -257,7 +257,7 @@ Q_INLINE_TEMPLATES void TQValueVectorPrivate<T>::reserve( size_t n )
 }
 
 template <class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVectorPrivate<T>::pointer TQValueVectorPrivate<T>::growAndCopy( size_t n, pointer s, pointer f )
 {
     pointer newStart = new T[n];
     tqCopy( s, f, newStart );
@@ -525,21 +525,21 @@ private:
 };
 
 template <class T>
-Q_INLINE_TEMPLATES TQValueVector<T>::TQValueVector( size_type n, const T& val )
+TQ_INLINE_TEMPLATES TQValueVector<T>::TQValueVector( size_type n, const T& val )
 {
     sh = new TQValueVectorPrivate<T>( n );
     tqFill( begin(), end(), val );
 }
 
 template <class T>
-Q_INLINE_TEMPLATES void TQValueVector<T>::detachInternal()
+TQ_INLINE_TEMPLATES void TQValueVector<T>::detachInternal()
 {
     sh->deref();
     sh = new TQValueVectorPrivate<T>( *sh );
 }
 
 template <class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, const T& x )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, const T& x )
 {
     size_type offset = pos - sh->start;
     detach();
@@ -564,7 +564,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector<
 }
 
 template <class T>
-Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, size_type n, const T& x )
+TQ_INLINE_TEMPLATES TQ_TYPENAME TQValueVector<T>::iterator TQValueVector<T>::insert( iterator pos, size_type n, const T& x )
 {
     if ( n != 0 ) {
 	size_type offset = pos - sh->start;
@@ -578,7 +578,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector<
 
 #ifndef TQT_NO_DATASTREAM
 template<class T>
-Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v )
+TQ_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v )
 {
     v.clear();
     TQ_UINT32 c;
@@ -594,7 +594,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQVa
 }
 
 template<class T>
-Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v )
+TQ_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVector<T>& v )
 {
     s << (TQ_UINT32)v.size();
     // ### use typename TQValueVector<T>::const_iterator once all supported

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<TQString, TQString> *dbControls;
-	Q_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection )
+	TQ_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection )
     };
 
     TQValueList<Image> images;

doc/i18n.doc

@@ -214,28 +214,28 @@ directly:
 \endcode
 
 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 \e lupdate utility described below.
 The macros expand to just the text (without the context).
 
-Example of QT_TR_NOOP():
+Example of TQT_TR_NOOP():
 \code
     QString 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] );
     }
 \endcode
 
-Example of QT_TRANSLATE_NOOP():
+Example of TQT_TRANSLATE_NOOP():
 \code
     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" )
     };
 
     QString FriendlyConversation::greeting( int greet_type )

doc/qws.doc

@@ -83,7 +83,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 \c $TQTDIR/include/ntqconfig.h and change the definition of
-\c Q_BYTE_ORDER.
+\c TQ_BYTE_ORDER.
 
 \i Enable framebuffer support.
 

examples/chart/element.h

@@ -59,7 +59,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) );
     }

examples/demo/dnd/dnd.h

@@ -13,7 +13,7 @@ public:
     TQString name() { return _name; }
     TQPixmap *pixmap() { return &_pixmap; }
 
-    Q_DUMMY_COMPARISON_OPERATOR( IconItem )
+    TQ_DUMMY_COMPARISON_OPERATOR( IconItem )
 
 protected:
     TQPixmap loadPixmap( const TQString& name );

examples/i18n/mywidget.cpp

@@ -53,9 +53,9 @@ MyWidget::MyWidget( TQWidget* parent, const char* name )
 }
 
 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
 }; 
 

examples/qtl/qvaluelistiterator.cpp

@@ -26,7 +26,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:
     TQString n;

plugins/src/accessible/widgets/main.cpp

@@ -11,7 +11,7 @@ public:
     AccessibleFactory();
 
     TQRESULT queryInterface( const TQUuid &, TQUnknownInterface **iface );
-    Q_REFCOUNT
+    TQ_REFCOUNT
 
     TQStringList featureList() const;
     TQRESULT createAccessibleInterface( const TQString &classname, TQObject *object, TQAccessibleInterface **iface );

src/codecs/qtextcodecplugin.cpp

@@ -112,7 +112,7 @@ public:
     virtual ~TQTextCodecPluginPrivate();
 
     TQRESULT queryInterface( const TQUuid &iid, TQUnknownInterface **iface );
-    Q_REFCOUNT;
+    TQ_REFCOUNT;
 
     TQStringList featureList() const;
     TQTextCodec *createForMib( int mib );

src/dialogs/qmessagebox.cpp

@@ -458,15 +458,15 @@ static const char * const mb_texts[] = {
 const char * mb_texts[] = {
 #endif
     0,
-    QT_TRANSLATE_NOOP("TQMessageBox","OK"),
-    QT_TRANSLATE_NOOP("TQMessageBox","Cancel"),
-    QT_TRANSLATE_NOOP("TQMessageBox","&Yes"),
-    QT_TRANSLATE_NOOP("TQMessageBox","&No"),
-    QT_TRANSLATE_NOOP("TQMessageBox","&Abort"),
-    QT_TRANSLATE_NOOP("TQMessageBox","&Retry"),
-    QT_TRANSLATE_NOOP("TQMessageBox","&Ignore"),
-    QT_TRANSLATE_NOOP("TQMessageBox","Yes to &All"),
-    QT_TRANSLATE_NOOP("TQMessageBox","N&o to All"),
+    TQT_TRANSLATE_NOOP("TQMessageBox","OK"),
+    TQT_TRANSLATE_NOOP("TQMessageBox","Cancel"),
+    TQT_TRANSLATE_NOOP("TQMessageBox","&Yes"),
+    TQT_TRANSLATE_NOOP("TQMessageBox","&No"),
+    TQT_TRANSLATE_NOOP("TQMessageBox","&Abort"),
+    TQT_TRANSLATE_NOOP("TQMessageBox","&Retry"),
+    TQT_TRANSLATE_NOOP("TQMessageBox","&Ignore"),
+    TQT_TRANSLATE_NOOP("TQMessageBox","Yes to &All"),
+    TQT_TRANSLATE_NOOP("TQMessageBox","N&o to All"),
     0
 };
 

src/inputmethod/qinputcontextplugin.cpp

@@ -147,7 +147,7 @@ public:
     virtual ~TQInputContextPluginPrivate();
 
     TQRESULT queryInterface( const TQUuid &iid, TQUnknownInterface **iface );
-    Q_REFCOUNT;
+    TQ_REFCOUNT;
 
     TQStringList featureList() const;
     TQInputContext *create( const TQString &key );

src/kernel/ntqaccessible.h

@@ -277,7 +277,7 @@ public:
     virtual ~TQAccessibleObject();
 
     TQRESULT	queryInterface( const TQUuid &, TQUnknownInterface** );
-    Q_REFCOUNT
+    TQ_REFCOUNT
 
     bool	isValid() const;
 

src/kernel/ntqiconset.h

@@ -90,7 +90,7 @@ public:
     static const TQSize& iconSize( Size which );
 
 #ifndef Q_QDOC
-    Q_DUMMY_COMPARISON_OPERATOR(TQIconSet)
+    TQ_DUMMY_COMPARISON_OPERATOR(TQIconSet)
 #endif
 
 private:

src/kernel/ntqobject.h

@@ -50,8 +50,8 @@
 #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;

src/kernel/ntqobjectdefs.h

@@ -169,6 +169,6 @@ Q_EXPORT void *tqt_find_obj_child( TQObject *, const char *, const char * );
 Q_EXPORT void *tqt_inheritedBy( TQMetaObject *super, const TQObject *cls );
 
 template <typename T>
-Q_INLINE_TEMPLATES T tqt_cast(const TQObject *object)
+TQ_INLINE_TEMPLATES T tqt_cast(const TQObject *object)
 { return (T)tqt_inheritedBy( ((T)0)->staticMetaObject(), object ); }
 #endif // TQOBJECTDEFS_H

src/kernel/ntqpixmap.h

@@ -176,7 +176,7 @@ public:
 #endif
 
 #ifndef Q_QDOC
-    Q_DUMMY_COMPARISON_OPERATOR(TQPixmap)
+    TQ_DUMMY_COMPARISON_OPERATOR(TQPixmap)
 #endif
 
 protected:

src/kernel/qfontdatabase.cpp

@@ -1975,198 +1975,198 @@ TQString TQFontDatabase::scriptName(TQFont::Script script)
 
     switch (script) {
     case TQFont::Latin:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Latin");
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Latin");
 	break;
     case TQFont::Greek:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Greek" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Greek" );
 	break;
     case TQFont::Cyrillic:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Cyrillic" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Cyrillic" );
 	break;
     case TQFont::Armenian:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Armenian" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Armenian" );
 	break;
     case TQFont::Georgian:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Georgian" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Georgian" );
 	break;
     case TQFont::Runic:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Runic" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Runic" );
 	break;
     case TQFont::Ogham:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Ogham" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Ogham" );
 	break;
     case TQFont::SpacingModifiers:
-	name = QT_TRANSLATE_NOOP("TQFont",  "SpacingModifiers" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "SpacingModifiers" );
 	break;
     case TQFont::CombiningMarks:
-	name = QT_TRANSLATE_NOOP("TQFont",  "CombiningMarks" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "CombiningMarks" );
 	break;
     case TQFont::Hebrew:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Hebrew" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Hebrew" );
 	break;
     case TQFont::Arabic:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Arabic" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Arabic" );
 	break;
     case TQFont::Syriac:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Syriac" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Syriac" );
 	break;
     case TQFont::Thaana:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Thaana" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Thaana" );
 	break;
     case TQFont::Devanagari:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Devanagari" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Devanagari" );
 	break;
     case TQFont::Bengali:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Bengali" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Bengali" );
 	break;
     case TQFont::Gurmukhi:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Gurmukhi" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Gurmukhi" );
 	break;
     case TQFont::Gujarati:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Gujarati" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Gujarati" );
 	break;
     case TQFont::Oriya:
-	name = QT_TRANSLATE_NOOP("TQFont",  "Oriya" );
+	name = TQT_TRANSLATE_NOOP("TQFont",  "Oriya" );
 	break;