6 files changed, 21 insertions, 21 deletions
diff --git a/qtinterface/tqt4/Qt/qglobal.h b/qtinterface/tqt4/Qt/qglobal.h
index d5bf293..2406997 100644
--- a/qtinterface/tqt4/Qt/qglobal.h
+++ b/qtinterface/tqt4/Qt/qglobal.h
@@ -473,7 +473,7 @@ namespace QT_NAMESPACE {}
 /* GCC 2.95 knows "using" but does not support it correctly */
 #  if __GNUC__ == 2 && __GNUC_MINOR__ <= 95
 #    define Q_NO_USING_KEYWORD
-#    define QT_NO_STL_WCHAR
+#    define TQT_NO_STL_WCHAR
 #  endif
 #  if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
 #    define Q_ALIGNOF(type)   __alignof__(type)
@@ -2346,7 +2346,7 @@ template <typename Wrapper> static inline typename Wrapper::pointer qGetPtrHelpe
 #define QT_TRANSLATE_NOOP3(scope, x, comment) {x, comment}
 #define QT_TRANSLATE_NOOP3_UTF8(scope, x, comment) {x, comment}
 
-#ifndef QT_NO_TRANSLATION // ### This should enclose the NOOPs above
+#ifndef TQT_NO_TRANSLATION // ### This should enclose the NOOPs above
 
 // Defined in qcoreapplication.cpp
 // The better name qTrId() is reserved for an upcoming function which would
@@ -2355,7 +2355,7 @@ Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1);
 
 #define QT_TRID_NOOP(id) id
 
-#endif // QT_NO_TRANSLATION
+#endif // TQT_NO_TRANSLATION
 
 #define QDOC_PROPERTY(text)
 
diff --git a/qtinterface/tqt4/Qt/qlist.h b/qtinterface/tqt4/Qt/qlist.h
index 9a16b9e..ba072a4 100644
--- a/qtinterface/tqt4/Qt/qlist.h
+++ b/qtinterface/tqt4/Qt/qlist.h
@@ -46,7 +46,7 @@
 #include <QtCore/qatomic.h>
 #include <QtCore/qalgorithms.h>
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 #include <iterator>
 #include <list>
 #endif
@@ -332,7 +332,7 @@ public:
     static QList<T> fromVector(const QVector<T> &vector);
     static QList<T> fromSet(const QSet<T> &set);
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     static inline QList<T> fromStdList(const std::list<T> &list)
     { QList<T> tmp; qCopy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; }
     inline std::list<T> toStdList() const
diff --git a/qtinterface/tqt4/Qt/qobject.h b/qtinterface/tqt4/Qt/qobject.h
index c67fd29..f240170 100644
--- a/qtinterface/tqt4/Qt/qobject.h
+++ b/qtinterface/tqt4/Qt/qobject.h
@@ -137,7 +137,7 @@ public:
     virtual const QMetaObject *metaObject() const;
     static const QMetaObject staticMetaObject;
 #endif
-#ifdef QT_NO_TRANSLATION
+#ifdef TQT_NO_TRANSLATION
     static QString tr(const char *sourceText, const char *, int)
         { return QString::fromLatin1(sourceText); }
     static QString tr(const char *sourceText, const char * = 0)
@@ -148,7 +148,7 @@ public:
     static QString trUtf8(const char *sourceText, const char * = 0)
         { return QString::fromUtf8(sourceText); }
 #endif
-#endif //QT_NO_TRANSLATION
+#endif //TQT_NO_TRANSLATION
 
     QString objectName() const;
     void setObjectName(const QString &name);
diff --git a/qtinterface/tqt4/Qt/qobjectdefs.h b/qtinterface/tqt4/Qt/qobjectdefs.h
index 3a50a14..d2428aa 100644
--- a/qtinterface/tqt4/Qt/qobjectdefs.h
+++ b/qtinterface/tqt4/Qt/qobjectdefs.h
@@ -90,7 +90,7 @@ class QStringList;
 #define Q_SIGNAL
 #define Q_SLOT
 
-#ifndef QT_NO_TRANSLATION
+#ifndef TQT_NO_TRANSLATION
 # ifndef QT_NO_TEXTCODEC
 // full set of tr functions
 // ### Qt 5: merge overloads
@@ -290,13 +290,13 @@ struct Q_CORE_EXPORT QMetaObject
 
     QObject *cast(QObject *obj) const;
 
-#ifndef QT_NO_TRANSLATION
+#ifndef TQT_NO_TRANSLATION
     // ### Qt 4: Merge overloads
     QString tr(const char *s, const char *c) const;
     QString trUtf8(const char *s, const char *c) const;
     QString tr(const char *s, const char *c, int n) const;
     QString trUtf8(const char *s, const char *c, int n) const;
-#endif // QT_NO_TRANSLATION
+#endif // TQT_NO_TRANSLATION
 
     int methodOffset() const;
     int enumeratorOffset() const;
diff --git a/qtinterface/tqt4/Qt/qstring.h b/qtinterface/tqt4/Qt/qstring.h
index bdb01db..9b6d650 100644
--- a/qtinterface/tqt4/Qt/qstring.h
+++ b/qtinterface/tqt4/Qt/qstring.h
@@ -50,7 +50,7 @@
 #include <Qt3Support/q3cstring.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)
@@ -60,12 +60,12 @@
 #    include <string>
 #  endif
 
-#  ifndef QT_NO_STL_WCHAR
+#  ifndef TQT_NO_STL_WCHAR
 // workaround for some headers not typedef'ing std::wstring
 typedef std::basic_string<wchar_t> QStdWString;
-#  endif // QT_NO_STL_WCHAR
+#  endif // TQT_NO_STL_WCHAR
 
-#endif // QT_NO_STL
+#endif // TQT_NO_STL
 
 #include <stdarg.h>
 
@@ -476,17 +476,17 @@ public:
     inline void push_front(QChar c) { prepend(c); }
     inline void push_front(const QString &s) { prepend(s); }
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     static inline QString fromStdString(const std::string &s);
     inline std::string toStdString() const;
 # ifdef qdoc
     static inline QString fromStdWString(const std::wstring &s);
     inline std::wstring toStdWString() const;
 # else
-#  ifndef QT_NO_STL_WCHAR
+#  ifndef TQT_NO_STL_WCHAR
     static inline QString fromStdWString(const QStdWString &s);
     inline QStdWString toStdWString() const;
-#  endif // QT_NO_STL_WCHAR
+#  endif // TQT_NO_STL_WCHAR
 # endif // qdoc
 #endif
 
@@ -1031,14 +1031,14 @@ inline QT_ASCII_CAST_WARN const QString operator+(const QString &s, const QByteA
 # endif // QT_USE_FAST_CONCATENATION
 #endif // QT_USE_FAST_OPERATOR_PLUS
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 inline std::string QString::toStdString() const
 { const QByteArray asc = toAscii(); return std::string(asc.constData(), asc.length()); }
 
 inline QString QString::fromStdString(const std::string &s)
 { return fromAscii(s.data(), int(s.size())); }
 
-# ifndef QT_NO_STL_WCHAR
+# ifndef TQT_NO_STL_WCHAR
 inline QStdWString QString::toStdWString() const
 {
     QStdWString str;
diff --git a/qtinterface/tqt4/Qt/qvector.h b/qtinterface/tqt4/Qt/qvector.h
index 301f163..fb76d75 100644
--- a/qtinterface/tqt4/Qt/qvector.h
+++ b/qtinterface/tqt4/Qt/qvector.h
@@ -47,7 +47,7 @@
 #include <QtCore/qalgorithms.h>
 #include <QtCore/qlist.h>
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
 #include <iterator>
 #include <vector>
 #endif
@@ -292,7 +292,7 @@ public:
 
     static QVector<T> fromList(const QList<T> &list);
 
-#ifndef QT_NO_STL
+#ifndef TQT_NO_STL
     static inline QVector<T> fromStdVector(const std::vector<T> &vector)
     { QVector<T> tmp; qCopy(vector.begin(), vector.end(), std::back_inserter(tmp)); return tmp; }
     inline std::vector<T> toStdVector() const