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]>

1 files changed, 11 insertions, 11 deletions

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