qt -> tqt conversion:

QT_NO_ASCII_CAST -> TQT_NO_ASCII_CAST
QT_NO_STL -> TQT_NO_STL
QT_NO_COMPAT -> TQT_NO_COMPAT
QT_NO_TRANSLATION -> TQT_NO_TRANSLATION

Signed-off-by: Michele Calgaro <[email protected]>

20 files changed, 63 insertions, 63 deletions

diff --git a/src/tools/ntqdatetime.h b/src/tools/ntqdatetime.h
index ea7e73203..8439bf5fe 100644
--- a/src/tools/ntqdatetime.h
+++ b/src/tools/ntqdatetime.h
@@ -71,7 +71,7 @@ public:
     int weekNumber( int *yearNum = 0 ) const;
 
 #ifndef QT_NO_TEXTDATE
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
     static TQString monthName( int month ) { return shortMonthName( month ); }
     static TQString dayName( int weekday ) { return shortDayName( weekday ); }
 #endif
diff --git a/src/tools/ntqfeatures.h b/src/tools/ntqfeatures.h
index e5a8e786f..289190a3e 100644
--- a/src/tools/ntqfeatures.h
+++ b/src/tools/ntqfeatures.h
@@ -141,7 +141,7 @@
 //#define QT_NO_SOUND
 
 // Standard template library compatiblity
-//#define QT_NO_STL
+//#define TQT_NO_STL
 
 // TQStringList
 //#define QT_NO_STRINGLIST
@@ -328,8 +328,8 @@
 #endif
 
 // Translations via TQObject::tr()
-#if !defined(QT_NO_TRANSLATION) && (defined(QT_NO_DATASTREAM))
-#define QT_NO_TRANSLATION
+#if !defined(TQT_NO_TRANSLATION) && (defined(QT_NO_DATASTREAM))
+#define TQT_NO_TRANSLATION
 #endif
 
 // Window icon and caption
@@ -428,8 +428,8 @@
 #endif
 
 // Translations via TQObject::trUtf8()
-#if !defined(QT_NO_TRANSLATION_UTF8) && (defined(QT_NO_TRANSLATION) || defined(QT_NO_TEXTCODEC))
-#define QT_NO_TRANSLATION_UTF8
+#if !defined(TQT_NO_TRANSLATION_UTF8) && (defined(TQT_NO_TRANSLATION) || defined(QT_NO_TEXTCODEC))
+#define TQT_NO_TRANSLATION_UTF8
 #endif
 
 // URL parser
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 55b7b9705..282fecea2 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -949,7 +949,7 @@ Q_EXPORT int qWinVersion();
 
 #if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG)
 #  define QT_DEBUG				// display debug messages
-#  if !defined(QT_NO_COMPAT)			// compatibility with TQt 2
+#  if !defined(TQT_NO_COMPAT)			// compatibility with TQt 2
 #    if !defined(NO_DEBUG) && !defined(DEBUG)
 #      if !defined(Q_OS_MACX)			// clash with MacOS X headers
 #        define DEBUG
@@ -992,13 +992,13 @@ Q_EXPORT void tqSystemWarning( const char *, int code = -1 );
 #  endif
 #endif
 
-#if !defined(QT_NO_COMPAT)			// compatibility with TQt 2
+#if !defined(TQT_NO_COMPAT)			// compatibility with TQt 2
 #  if !defined(ASSERT)
 #    if !defined(Q_OS_TEMP)
 #      define ASSERT(x) Q_ASSERT(x)
 #    endif
 #  endif
-#endif // QT_NO_COMPAT
+#endif // TQT_NO_COMPAT
 
 
 Q_EXPORT bool tqt_check_pointer( bool c, const char *, int );
@@ -1009,20 +1009,20 @@ Q_EXPORT bool tqt_check_pointer( bool c, const char *, int );
 #  define TQ_CHECK_PTR(p)
 #endif
 
-#if !defined(QT_NO_COMPAT)			// compatibility with TQt 2
+#if !defined(TQT_NO_COMPAT)			// compatibility with TQt 2
 #  if !defined(CHECK_PTR)
 #    define CHECK_PTR(x) TQ_CHECK_PTR(x)
 #  endif
-#endif // QT_NO_COMPAT
+#endif // TQT_NO_COMPAT
 
 enum TQtMsgType { TQtDebugMsg, TQtWarningMsg, TQtFatalMsg };
 
 typedef void (*TQtMsgHandler)(TQtMsgType, const char *);
 Q_EXPORT TQtMsgHandler qInstallMsgHandler( TQtMsgHandler );
 
-#if !defined(QT_NO_COMPAT)			// compatibility with TQt 2
+#if !defined(TQT_NO_COMPAT)			// compatibility with TQt 2
 typedef TQtMsgHandler msg_handler;
-#endif // QT_NO_COMPAT
+#endif // TQT_NO_COMPAT
 
 Q_EXPORT void tqSuppressObsoleteWarnings( bool = TRUE );
 
diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h
index 3139e7fe9..d098f79be 100644
--- a/src/tools/ntqmap.h
+++ b/src/tools/ntqmap.h
@@ -49,7 +49,7 @@
 #include "ntqvaluelist.h"
 #endif // QT_H
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 #include <iterator>
 #include <map>
 #include <cstddef>
@@ -103,11 +103,11 @@ class TQMapIterator
      * Typedefs
      */
     typedef TQMapNode< K, T >* NodePtr;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef std::bidirectional_iterator_tag  iterator_category;
 #endif
     typedef T          value_type;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef ptrdiff_t  difference_type;
 #else
     typedef int difference_type;
@@ -219,11 +219,11 @@ class TQMapConstIterator
      * Typedefs
      */
     typedef TQMapNode< K, T >* NodePtr;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef std::bidirectional_iterator_tag  iterator_category;
 #endif
     typedef T          value_type;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef ptrdiff_t  difference_type;
 #else
     typedef int difference_type;
@@ -604,7 +604,7 @@ public:
     typedef const value_type* const_pointer;
     typedef value_type& reference;
     typedef const value_type& const_reference;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef ptrdiff_t  difference_type;
 #else
     typedef int difference_type;
@@ -631,7 +631,7 @@ public:
 	sh = m.sh; sh->ref();
     }
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     TQMap( const std::map<Key,T>& m )
     {
 	sh = new TQMapPrivate<Key,T>;
@@ -652,7 +652,7 @@ public:
 	}
     }
     TQMap<Key,T>& operator= ( const TQMap<Key,T>& m );
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     TQMap<Key,T>& operator= ( const std::map<Key,T>& m )
     {
 	clear();
@@ -735,7 +735,7 @@ public:
 
 #if defined(Q_FULL_TEMPLATE_INSTANTIATION)
     bool operator==( const TQMap<Key,T>& ) const { return FALSE; }
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     bool operator==( const std::map<Key,T>& ) const { return FALSE; }
 #endif
 #endif
diff --git a/src/tools/ntqmemarray.h b/src/tools/ntqmemarray.h
index 483671167..2febfb23b 100644
--- a/src/tools/ntqmemarray.h
+++ b/src/tools/ntqmemarray.h
@@ -112,7 +112,7 @@ public:
     ConstIterator end() const { return data() + size(); }
 };
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
 #define TQArray TQMemArray
 #endif
 
diff --git a/src/tools/ntqptrcollection.h b/src/tools/ntqptrcollection.h
index 5f0690afa..37ff0df30 100644
--- a/src/tools/ntqptrcollection.h
+++ b/src/tools/ntqptrcollection.h
@@ -73,7 +73,7 @@ protected:
 };
 
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
 #define TQCollection TQPtrCollection
 #endif
 
diff --git a/src/tools/ntqptrlist.h b/src/tools/ntqptrlist.h
index 7418e5418..305be554e 100644
--- a/src/tools/ntqptrlist.h
+++ b/src/tools/ntqptrlist.h
@@ -185,7 +185,7 @@ public:
 			      { TQGListIterator::operator=(it); return *this; }
 };
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
 #define TQList TQPtrList
 #define TQListIterator TQPtrListIterator
 #endif
diff --git a/src/tools/ntqptrqueue.h b/src/tools/ntqptrqueue.h
index 0f3cbbd34..90f743d02 100644
--- a/src/tools/ntqptrqueue.h
+++ b/src/tools/ntqptrqueue.h
@@ -87,7 +87,7 @@ template<class type> inline void TQPtrQueue<type>::deleteItem( TQPtrCollection::
     if ( del_item ) delete (type *)d;
 }
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
 #define TQQueue TQPtrQueue
 #endif
 
diff --git a/src/tools/ntqptrstack.h b/src/tools/ntqptrstack.h
index 913dae356..d47416530 100644
--- a/src/tools/ntqptrstack.h
+++ b/src/tools/ntqptrstack.h
@@ -87,7 +87,7 @@ template<class type> inline void TQPtrStack<type>::deleteItem( TQPtrCollection::
     if ( del_item ) delete (type *)d;
 }
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
 #define TQStack TQPtrStack
 #endif
 
diff --git a/src/tools/ntqptrvector.h b/src/tools/ntqptrvector.h
index 046dc9486..e3034a6a3 100644
--- a/src/tools/ntqptrvector.h
+++ b/src/tools/ntqptrvector.h
@@ -109,7 +109,7 @@ template<class type> inline void TQPtrVector<type>::deleteItem( TQPtrCollection:
     if ( del_item ) delete (type *)d;
 }
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
 #define TQVector TQPtrVector
 #endif
 
diff --git a/src/tools/ntqregexp.h b/src/tools/ntqregexp.h
index 075572224..d600e452f 100644
--- a/src/tools/ntqregexp.h
+++ b/src/tools/ntqregexp.h
@@ -78,7 +78,7 @@ public:
     void setMinimal( bool minimal );
 
     bool exactMatch( const TQString& str ) const;
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
     int match( const TQString& str, int index = 0, int *len = 0,
 	       bool indexIsStart = TRUE ) const;
 #endif
diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h
index e8381a0b5..b3c0a32cc 100644
--- a/src/tools/ntqstring.h
+++ b/src/tools/ntqstring.h
@@ -50,7 +50,7 @@
 #include <limits.h>
 #endif
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 #if defined ( Q_CC_MSVC_NET ) && _MSC_VER < 1310 // Avoids nasty warning for xlocale, line 450
 #  pragma warning ( push )
 #  pragma warning ( disable : 4189 )
@@ -408,14 +408,14 @@ public:
 #ifndef QT_NO_CAST_ASCII
     TQString( const char *str );                 // deep copy
 #endif
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     TQString( const std::string& );                   // deep copy
 #endif
     ~TQString();
 
     TQString    &operator=( const TQString & );   // impl-shared copy
     TQString    &operator=( const char * );      // deep copy
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     TQString    &operator=( const std::string& );     // deep copy
 #endif
     TQString    &operator=( const TQCString& );   // deep copy
@@ -539,7 +539,7 @@ public:
     TQString    &append( const TQByteArray & );
     TQString    &append( const char * );
 #endif
-#if !defined(QT_NO_STL) && !defined(QT_NO_CAST_ASCII)
+#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII)
     TQString    &append( const std::string& );
 #endif
     TQString    &prepend( char );
@@ -549,7 +549,7 @@ public:
     TQString    &prepend( const TQByteArray & );
     TQString    &prepend( const char * );
 #endif
-#if !defined(QT_NO_STL) && !defined(QT_NO_CAST_ASCII)
+#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII)
     TQString    &prepend( const std::string& );
 #endif
     TQString    &remove( uint index, uint len );
@@ -636,7 +636,7 @@ public:
     TQString    &operator+=( const TQByteArray &str );
     TQString    &operator+=( const char *str );
 #endif
-#if !defined(QT_NO_STL) && !defined(QT_NO_CAST_ASCII)
+#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII)
     TQString    &operator+=( const std::string& );
 #endif
     TQString    &operator+=( TQChar c );
@@ -662,10 +662,10 @@ public:
     TQCString local8Bit() const;
     static TQString fromLocal8Bit(const char*, int len=-1);
     bool operator!() const;
-#ifndef QT_NO_ASCII_CAST
+#ifndef TQT_NO_ASCII_CAST
     operator const char *() const { return ascii(); }
 #endif
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     operator std::string() const { return ascii() ? ascii() : ""; }
 #endif
 
@@ -691,7 +691,7 @@ public:
 
     void compose();
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
     const char* data() const { return ascii(); }
 #endif
 
@@ -926,7 +926,7 @@ inline TQString &TQString::append( TQChar c )
 inline TQString &TQString::append( char c )
 { return operator+=(c); }
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 inline TQString &TQString::operator=( const std::string& str )
 { return operator=(str.c_str()); }
 #ifndef QT_NO_CAST_ASCII
@@ -1073,7 +1073,7 @@ Q_EXPORT inline const TQString operator+( char c1, const TQString &s2 )
     return tmp;
 }
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 Q_EXPORT inline const TQString operator+(const TQString& s1, const std::string& s2)
 {
     return s1 + TQString(s2);
diff --git a/src/tools/ntqvaluelist.h b/src/tools/ntqvaluelist.h
index 24a9cfc57..677c0cf51 100644
--- a/src/tools/ntqvaluelist.h
+++ b/src/tools/ntqvaluelist.h
@@ -47,7 +47,7 @@
 #include "ntqdatastream.h"
 #endif // QT_H
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 #include <iterator>
 #include <list>
 #include <cstddef>
@@ -79,12 +79,12 @@ class TQValueListIterator
      * Typedefs
      */
     typedef TQValueListNode<T>* NodePtr;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef std::bidirectional_iterator_tag  iterator_category;
 #endif
     typedef T        value_type;
     typedef size_t size_type;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef ptrdiff_t  difference_type;
 #else
     typedef int difference_type;
@@ -155,12 +155,12 @@ class TQValueListConstIterator
      * Typedefs
      */
     typedef TQValueListNode<T>* NodePtr;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef std::bidirectional_iterator_tag  iterator_category;
 #endif
     typedef T        value_type;
     typedef size_t size_type;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef ptrdiff_t  difference_type;
 #else
     typedef int difference_type;
@@ -428,7 +428,7 @@ public:
     typedef value_type& reference;
     typedef const value_type& const_reference;
     typedef size_t size_type;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef ptrdiff_t  difference_type;
 #else
     typedef int difference_type;
@@ -439,7 +439,7 @@ public:
      */
     TQValueList() { sh = new TQValueListPrivate<T>; }
     TQValueList( const TQValueList<T>& l ) { sh = l.sh; sh->ref(); }
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     TQValueList( const std::list<T>& l )
     {
 	sh = new TQValueListPrivate<T>;
@@ -463,7 +463,7 @@ public:
 	return *this;
     }
     
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     TQValueList<T>& operator= ( const std::list<T>& l )
     {
 	detach();
diff --git a/src/tools/ntqvaluevector.h b/src/tools/ntqvaluevector.h
index 6a50230e9..7bc80c640 100644
--- a/src/tools/ntqvaluevector.h
+++ b/src/tools/ntqvaluevector.h
@@ -47,7 +47,7 @@
 #include "ntqdatastream.h"
 #endif // QT_H
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 #include <vector>
 #endif
 
@@ -245,7 +245,7 @@ public:
     typedef value_type& reference;
     typedef const value_type& const_reference;
     typedef size_t size_type;
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     typedef ptrdiff_t difference_type;
 #else
     typedef int difference_type;
@@ -264,7 +264,7 @@ public:
 
     TQValueVector( size_type n, const T& val = T() );
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     TQValueVector( std::vector<T>& v ) // ### remove in 4.0
     {
 	sh = new TQValueVectorPrivate<T>( v.size() );
@@ -291,7 +291,7 @@ public:
 	return *this;
     }
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     TQValueVector<T>& operator= ( const std::vector<T>& v )
     {
 	clear();
diff --git a/src/tools/qconfig-large.h b/src/tools/qconfig-large.h
index 63104ebec..1ce4e78cc 100644
--- a/src/tools/qconfig-large.h
+++ b/src/tools/qconfig-large.h
@@ -11,7 +11,7 @@
 /* #define QT_NO_FREETYPE */
 #define QT_NO_BDF
 //#define QT_NO_FONTDATABASE
-#define QT_NO_TRANSLATION
+#define TQT_NO_TRANSLATION
 #define QT_NO_DRAGANDDROP
 #define QT_NO_CLIPBOARD
 #define QT_NO_SOUND
diff --git a/src/tools/qconfig-medium.h b/src/tools/qconfig-medium.h
index f7df2dcd3..e10291188 100644
--- a/src/tools/qconfig-medium.h
+++ b/src/tools/qconfig-medium.h
@@ -12,7 +12,7 @@
 /* #define QT_NO_FREETYPE */
 #define QT_NO_BDF
 //#define QT_NO_FONTDATABASE
-#define QT_NO_TRANSLATION
+#define TQT_NO_TRANSLATION
 #define QT_NO_DRAGANDDROP
 #define QT_NO_CLIPBOARD
 #define QT_NO_SOUND
diff --git a/src/tools/qconfig-minimal.h b/src/tools/qconfig-minimal.h
index d3a795418..e08cd5e29 100644
--- a/src/tools/qconfig-minimal.h
+++ b/src/tools/qconfig-minimal.h
@@ -21,7 +21,7 @@
 /* //#define QT_NO_FREETYPE //done by configure -no-freetype */
 #define QT_NO_BDF
 //#define QT_NO_FONTDATABASE
-#define QT_NO_TRANSLATION
+#define TQT_NO_TRANSLATION
 #define QT_NO_MIME
 #define QT_NO_SOUND
 /* #define QT_NO_PROPERTIES */
@@ -87,8 +87,8 @@
 #define QT_NO_IMAGE_HEURISTIC_MASK
 #define QT_NO_IMAGE_MIRROR
 
-#ifndef QT_NO_STL
-# define QT_NO_STL
+#ifndef TQT_NO_STL
+# define TQT_NO_STL
 #endif
 
 #define QT_NO_DATESTRING
diff --git a/src/tools/qconfig-small.h b/src/tools/qconfig-small.h
index 046c07e63..225098272 100644
--- a/src/tools/qconfig-small.h
+++ b/src/tools/qconfig-small.h
@@ -17,7 +17,7 @@
 /* #define QT_NO_FREETYPE //done by configure -no-freetype */
 #define QT_NO_BDF
 //#define QT_NO_FONTDATABASE
-#define QT_NO_TRANSLATION
+#define TQT_NO_TRANSLATION
 #define QT_NO_MIME
 #define QT_NO_SOUND
 #define QT_NO_PROPERTIES
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp
index d5598c4db..7adf03768 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/qregexp.cpp
@@ -3600,7 +3600,7 @@ bool TQRegExp::exactMatch( const TQString& str ) const
     }
 }
 
-#ifndef QT_NO_COMPAT
+#ifndef TQT_NO_COMPAT
 /*! \obsolete
 
   Attempts to match in \a str, starting from position \a index.
@@ -3625,7 +3625,7 @@ int TQRegExp::match( const TQString& str, int index, int *len,
 	*len = matchedLength();
     return pos;
 }
-#endif // QT_NO_COMPAT
+#endif // TQT_NO_COMPAT
 
 int TQRegExp::search( const TQString& str, int offset ) const
 {
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 755d26776..6afe0687a 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -1630,7 +1630,7 @@ TQString::TQString( const char *str )
     d = new TQStringData(uc,l,l);
 }
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 /*!
     Constructs a string that is a deep copy of \a str.
 
@@ -5703,7 +5703,7 @@ void TQString::setExpand( uint index, TQChar c )
     \endcode
 
     It will call "operator const char*()", which is inefficent; you
-    may wish to define the macro \c QT_NO_ASCII_CAST when writing code
+    may wish to define the macro \c TQT_NO_ASCII_CAST when writing code
     which you wish to remain Unicode-clean.
 
     When you want the above semantics, use:
@@ -6314,7 +6314,7 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
     Returns ascii(). Be sure to see the warnings documented in the
     ascii() function. Note that for new code which you wish to be
     strictly Unicode-clean, you can define the macro \c
-    QT_NO_ASCII_CAST when compiling your code to hide this function so
+    TQT_NO_ASCII_CAST when compiling your code to hide this function so
     that automatic casts are not done. This has the added advantage
     that you catch the programming error described in operator!().
 */