Undo prior accidental commit

12 files changed, 89 insertions, 89 deletions

diff --git a/qtinterface/qt4/Qt/q3header.h b/qtinterface/qt4/Qt/q3header.h
index 1ddc7f4..702b59b 100644
--- a/qtinterface/qt4/Qt/q3header.h
+++ b/qtinterface/qt4/Qt/q3header.h
@@ -214,7 +214,7 @@ inline Qt::Orientation Q3Header::orientation() const
 inline void Q3Header::setTracking(bool enable) { trackingIsOn = enable; }
 inline bool Q3Header::tracking() const { return trackingIsOn; }
 
-extern Q_COMPAT_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition
+extern Q_COMPAT_EXPORT bool qt_qheader_label_return_null_strings; // needed for professional edition
 
 #endif // QT_NO_HEADER
 
diff --git a/qtinterface/qt4/Qt/q3strlist.h b/qtinterface/qt4/Qt/q3strlist.h
index e802d1e..91c6a78 100644
--- a/qtinterface/qt4/Qt/q3strlist.h
+++ b/qtinterface/qt4/Qt/q3strlist.h
@@ -88,7 +88,7 @@ public:
     }
 
 private:
-    Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? tqstrdup( (const char*)d ) : d; }
+    Q3PtrCollection::Item newItem( Q3PtrCollection::Item d ) { return dc ? qstrdup( (const char*)d ) : d; }
     void deleteItem( Q3PtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; }
     int compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 ) { return qstrcmp((const char*)s1,
 							 (const char*)s2); }
@@ -109,7 +109,7 @@ public:
     ~Q3StrIList()			{ clear(); }
 private:
     int	  compareItems( Q3PtrCollection::Item s1, Q3PtrCollection::Item s2 )
-				{ return tqstricmp((const char*)s1,
+				{ return qstricmp((const char*)s1,
 						    (const char*)s2); }
 };
 
diff --git a/qtinterface/qt4/Qt/q3strvec.h b/qtinterface/qt4/Qt/q3strvec.h
index 2e74bb6..e66b2d6 100644
--- a/qtinterface/qt4/Qt/q3strvec.h
+++ b/qtinterface/qt4/Qt/q3strvec.h
@@ -59,7 +59,7 @@ public:
     Q3StrVec( uint size, bool deepc = true ) : Q3PtrVector<char>(size) {dc=deepc;}
    ~Q3StrVec()  { clear(); }
 private:
-    Item	 newItem( Item d )	{ return dc ? tqstrdup( (const char*)d ) : d; }
+    Item	 newItem( Item d )	{ return dc ? qstrdup( (const char*)d ) : d; }
     void deleteItem( Item d )	{ if ( dc ) delete[] (char*)d; }
     int	 compareItems( Item s1, Item s2 )
 				{ return qstrcmp((const char*)s1,
@@ -82,7 +82,7 @@ public:
    ~Q3StrIVec() { clear(); }
 private:
     int	 compareItems( Item s1, Item s2 )
-				{ return tqstricmp((const char*)s1,
+				{ return qstricmp((const char*)s1,
 						 (const char*)s2); }
 };
 
diff --git a/qtinterface/qt4/Qt/qbytearray.h b/qtinterface/qt4/Qt/qbytearray.h
index 8250408..f7c0cd3 100644
--- a/qtinterface/qt4/Qt/qbytearray.h
+++ b/qtinterface/qt4/Qt/qbytearray.h
@@ -62,7 +62,7 @@ QT_MODULE(Core)
   Safe and portable C string functions; extensions to standard string.h
  *****************************************************************************/
 
-Q_CORE_EXPORT char *tqstrdup(const char *);
+Q_CORE_EXPORT char *qstrdup(const char *);
 
 inline uint qstrlen(const char *str)
 { return str ? uint(strlen(str)) : 0; }
@@ -78,7 +78,7 @@ inline uint qstrnlen(const char *str, uint maxlen)
 }
 
 Q_CORE_EXPORT char *qstrcpy(char *dst, const char *src);
-Q_CORE_EXPORT char *tqstrncpy(char *dst, const char *src, uint len);
+Q_CORE_EXPORT char *qstrncpy(char *dst, const char *src, uint len);
 
 Q_CORE_EXPORT int qstrcmp(const char *str1, const char *str2);
 Q_CORE_EXPORT int qstrcmp(const QByteArray &str1, const QByteArray &str2);
@@ -91,15 +91,15 @@ inline int qstrncmp(const char *str1, const char *str2, uint len)
     return (str1 && str2) ? strncmp(str1, str2, len)
         : (str1 ? 1 : (str2 ? -1 : 0));
 }
-Q_CORE_EXPORT int tqstricmp(const char *, const char *);
-Q_CORE_EXPORT int tqstrnicmp(const char *, const char *, uint len);
+Q_CORE_EXPORT int qstricmp(const char *, const char *);
+Q_CORE_EXPORT int qstrnicmp(const char *, const char *, uint len);
 
 // implemented in qvsnprintf.cpp
 Q_CORE_EXPORT int qvsnprintf(char *str, size_t n, const char *fmt, va_list ap);
 Q_CORE_EXPORT int qsnprintf(char *str, size_t n, const char *fmt, ...);
 
 #ifdef QT3_SUPPORT
-inline QT3_SUPPORT void *tqmemmove(void *dst, const void *src, uint len)
+inline QT3_SUPPORT void *qmemmove(void *dst, const void *src, uint len)
 { return memmove(dst, src, len); }
 inline QT3_SUPPORT uint cstrlen(const char *str)
 { return uint(strlen(str)); }
@@ -111,9 +111,9 @@ inline QT3_SUPPORT int cstrncmp(const char *str1, const char *str2, uint len)
 { return strncmp(str1,str2,len); }
 #endif
 
-// tqChecksum: Internet checksum
+// qChecksum: Internet checksum
 
-Q_CORE_EXPORT quint16 tqChecksum(const char *s, uint len);
+Q_CORE_EXPORT quint16 qChecksum(const char *s, uint len);
 
 class QByteRef;
 class QString;
@@ -578,10 +578,10 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QByteArray &);
 #endif
 
 #ifndef QT_NO_COMPRESS
-Q_CORE_EXPORT QByteArray tqCompress(const uchar* data, int nbytes, int compressionLevel = -1);
+Q_CORE_EXPORT QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel = -1);
 Q_CORE_EXPORT QByteArray qUncompress(const uchar* data, int nbytes);
-inline QByteArray tqCompress(const QByteArray& data, int compressionLevel = -1)
-{ return tqCompress(reinterpret_cast<const uchar *>(data.constData()), data.size(), compressionLevel); }
+inline QByteArray qCompress(const QByteArray& data, int compressionLevel = -1)
+{ return qCompress(reinterpret_cast<const uchar *>(data.constData()), data.size(), compressionLevel); }
 inline QByteArray qUncompress(const QByteArray& data)
 { return qUncompress(reinterpret_cast<const uchar*>(data.constData()), data.size()); }
 #endif
diff --git a/qtinterface/qt4/Qt/qcoreapplication.h b/qtinterface/qt4/Qt/qcoreapplication.h
index e624f90..e1adece 100644
--- a/qtinterface/qt4/Qt/qcoreapplication.h
+++ b/qtinterface/qt4/Qt/qcoreapplication.h
@@ -265,8 +265,8 @@ private:
 
 typedef void (*QtCleanUpFunction)();
 
-Q_CORE_EXPORT void tqAddPostRoutine(QtCleanUpFunction);
-Q_CORE_EXPORT void tqRemovePostRoutine(QtCleanUpFunction);
+Q_CORE_EXPORT void qAddPostRoutine(QtCleanUpFunction);
+Q_CORE_EXPORT void qRemovePostRoutine(QtCleanUpFunction);
 Q_CORE_EXPORT QString qAppName();                // get application name
 
 #if defined(Q_WS_WIN) && !defined(QT_NO_DEBUG_STREAM)
diff --git a/qtinterface/qt4/Qt/qdebug.h b/qtinterface/qt4/Qt/qdebug.h
index fc7887e..d788589 100644
--- a/qtinterface/qt4/Qt/qdebug.h
+++ b/qtinterface/qt4/Qt/qdebug.h
@@ -255,12 +255,12 @@ inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache)
 }
 
 #if !defined(QT_NO_DEBUG_STREAM)
-Q_CORE_EXPORT_INLINE QDebug tqDebug() { return QDebug(QtDebugMsg); }
+Q_CORE_EXPORT_INLINE QDebug qDebug() { return QDebug(QtDebugMsg); }
 
 #else // QT_NO_DEBUG_STREAM
-#undef tqDebug
-inline QNoDebug tqDebug() { return QNoDebug(); }
-#define tqDebug QT_NO_QDEBUG_MACRO
+#undef qDebug
+inline QNoDebug qDebug() { return QNoDebug(); }
+#define qDebug QT_NO_QDEBUG_MACRO
 
 #ifdef QT_NO_MEMBER_TEMPLATES
 template<typename T>
@@ -270,11 +270,11 @@ inline QNoDebug operator<<(QNoDebug debug, const T &) { return debug; }
 #endif
 
 #if !defined(QT_NO_WARNING_OUTPUT)
-Q_CORE_EXPORT_INLINE QDebug tqWarning() { return QDebug(QtWarningMsg); }
+Q_CORE_EXPORT_INLINE QDebug qWarning() { return QDebug(QtWarningMsg); }
 #else
-#undef tqWarning
-inline QNoDebug tqWarning() { return QNoDebug(); }
-#define tqWarning QT_NO_QWARNING_MACRO
+#undef qWarning
+inline QNoDebug qWarning() { return QNoDebug(); }
+#define qWarning QT_NO_QWARNING_MACRO
 #endif
 
 QT_END_NAMESPACE
diff --git a/qtinterface/qt4/Qt/qglobal.h b/qtinterface/qt4/Qt/qglobal.h
index ce0db11..9b647a9 100644
--- a/qtinterface/qt4/Qt/qglobal.h
+++ b/qtinterface/qt4/Qt/qglobal.h
@@ -488,7 +488,7 @@ namespace QT_NAMESPACE {}
 #  if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ <= 3)
 #    define Q_NO_TEMPLATE_FRIENDS
 #  endif
-/* Apple's GCC 3.1 chokes on our streaming tqDebug() */
+/* Apple's GCC 3.1 chokes on our streaming qDebug() */
 #  if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
 #    define Q_BROKEN_DEBUG_STREAM
 #  endif
@@ -1522,15 +1522,15 @@ public:
 #endif
 };
 
-Q_CORE_EXPORT const char *tqVersion();
-Q_CORE_EXPORT bool tqSharedBuild();
+Q_CORE_EXPORT const char *qVersion();
+Q_CORE_EXPORT bool qSharedBuild();
 
 #if defined(Q_OS_MAC)
 inline int qMacVersion() { return QSysInfo::MacintoshVersion; }
 #endif
 
 #ifdef QT3_SUPPORT
-inline QT3_SUPPORT bool tqSysInfo(int *wordSize, bool *bigEndian)
+inline QT3_SUPPORT bool qSysInfo(int *wordSize, bool *bigEndian)
 {
     *wordSize = QSysInfo::WordSize;
     *bigEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian);
@@ -1593,13 +1593,13 @@ inline void qUnused(T &x) { (void)x; }
 #  define qPrintable(string) (string).toLocal8Bit().constData()
 #endif
 
-Q_CORE_EXPORT void tqDebug(const char *, ...) /* print debug message */
+Q_CORE_EXPORT void qDebug(const char *, ...) /* print debug message */
 #if defined(Q_CC_GNU) && !defined(__INSURE__)
     __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
 
-Q_CORE_EXPORT void tqWarning(const char *, ...) /* print warning message */
+Q_CORE_EXPORT void qWarning(const char *, ...) /* print warning message */
 #if defined(Q_CC_GNU) && !defined(__INSURE__)
     __attribute__ ((format (printf, 1, 2)))
 #endif
@@ -1612,14 +1612,14 @@ Q_CORE_EXPORT void qCritical(const char *, ...) /* print critical message */
     __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
-Q_CORE_EXPORT void tqFatal(const char *, ...) /* print fatal message and exit */
+Q_CORE_EXPORT void qFatal(const char *, ...) /* print fatal message and exit */
 #if defined(Q_CC_GNU) && !defined(__INSURE__)
     __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
 
 #ifdef QT3_SUPPORT
-Q_CORE_EXPORT QT3_SUPPORT void tqSystemWarning(const char *msg, int code = -1);
+Q_CORE_EXPORT QT3_SUPPORT void qSystemWarning(const char *msg, int code = -1);
 #endif /* QT3_SUPPORT */
 Q_CORE_EXPORT void qErrnoWarning(int code, const char *msg, ...);
 Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
@@ -1631,25 +1631,25 @@ Q_CORE_EXPORT void qErrnoWarning(const char *msg, ...);
 /*
   Forward declarations only.
 
-  In order to use the tqDebug() stream, you must #include<QDebug>
+  In order to use the qDebug() stream, you must #include<QDebug>
 */
 class QDebug;
 class QNoDebug;
 #ifndef QT_NO_DEBUG_STREAM
-Q_CORE_EXPORT_INLINE QDebug tqDebug();
-Q_CORE_EXPORT_INLINE QDebug tqWarning();
+Q_CORE_EXPORT_INLINE QDebug qDebug();
+Q_CORE_EXPORT_INLINE QDebug qWarning();
 Q_CORE_EXPORT_INLINE QDebug qCritical();
 #else
-inline QNoDebug tqDebug();
+inline QNoDebug qDebug();
 #endif
 
-#define QT_NO_QDEBUG_MACRO while (false) tqDebug
+#define QT_NO_QDEBUG_MACRO while (false) qDebug
 #ifdef QT_NO_DEBUG_OUTPUT
-#  define tqDebug QT_NO_QDEBUG_MACRO
+#  define qDebug QT_NO_QDEBUG_MACRO
 #endif
-#define QT_NO_QWARNING_MACRO while (false) tqWarning
+#define QT_NO_QWARNING_MACRO while (false) qWarning
 #ifdef QT_NO_WARNING_OUTPUT
-#  define tqWarning QT_NO_QWARNING_MACRO
+#  define qWarning QT_NO_QWARNING_MACRO
 #endif
 
 
@@ -1677,7 +1677,7 @@ Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char *
 #  endif
 #endif
 
-Q_CORE_EXPORT void tqt_check_pointer(const char *, int);
+Q_CORE_EXPORT void qt_check_pointer(const char *, int);
 
 #ifndef QT_NO_EXCEPTIONS
 Q_CORE_EXPORT void qBadAlloc();
@@ -1687,7 +1687,7 @@ Q_CORE_EXPORT void qBadAlloc();
 #  if defined(QT_NO_DEBUG)
 #    define Q_CHECK_PTR(p) qt_noop();
 #  else
-#    define Q_CHECK_PTR(p) do {if(!(p))tqt_check_pointer(__FILE__,__LINE__);} while (0)
+#    define Q_CHECK_PTR(p) do {if(!(p))qt_check_pointer(__FILE__,__LINE__);} while (0)
 #  endif
 #else
 #  define Q_CHECK_PTR(p) do { if (!(p)) qBadAlloc(); } while (0)
@@ -1731,8 +1731,8 @@ typedef void (*QtMsgHandler)(QtMsgType, const char *);
 Q_CORE_EXPORT QtMsgHandler qInstallMsgHandler(QtMsgHandler);
 
 #ifdef QT3_SUPPORT
-inline QT3_SUPPORT void tqSuppressObsoleteWarnings(bool = true) {}
-inline QT3_SUPPORT void tqObsolete(const char *, const char * = 0, const char * = 0) {}
+inline QT3_SUPPORT void qSuppressObsoleteWarnings(bool = true) {}
+inline QT3_SUPPORT void qObsolete(const char *, const char * = 0, const char * = 0) {}
 #endif
 
 #if defined(QT_NO_THREAD)
@@ -1941,7 +1941,7 @@ static inline bool qIsNull(float f)
 #ifdef Q_FULL_TEMPLATE_INSTANTIATION
 #  define Q_DUMMY_COMPARISON_OPERATOR(C) \
     bool operator==(const C&) const { \
-        tqWarning(#C"::operator==(const "#C"&) was called"); \
+        qWarning(#C"::operator==(const "#C"&) was called"); \
         return false; \
     }
 #else
@@ -2403,15 +2403,15 @@ Q_CORE_EXPORT int qrand();
 #ifndef QT_PRODUCT_LICENSE
 #  define QT_PRODUCT_LICENSE QLibraryInfo::licensedProducts()
 #endif
-QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPath();
-QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathDocs();
-QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathHeaders();
-QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathLibs();
-QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathBins();
-QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathPlugins();
-QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathData();
-QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathTranslations();
-QT3_SUPPORT Q_CORE_EXPORT const char *tqInstallPathSysconf();
+QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPath();
+QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathDocs();
+QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathHeaders();
+QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathLibs();
+QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathBins();
+QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathPlugins();
+QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathData();
+QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathTranslations();
+QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
 #endif
 
 #if defined(Q_OS_SYMBIAN)
diff --git a/qtinterface/qt4/Qt/qmacdefines_mac.h b/qtinterface/qt4/Qt/qmacdefines_mac.h
index d5927fe..ecd6872 100644
--- a/qtinterface/qt4/Qt/qmacdefines_mac.h
+++ b/qtinterface/qt4/Qt/qmacdefines_mac.h
@@ -100,9 +100,9 @@ Yes, it is an informative comment ;-)
 # undef DEBUG
 #endif
 #define DEBUG 0
-#ifdef tqDebug
-#  define old_qDebug tqDebug
-#  undef tqDebug
+#ifdef qDebug
+#  define old_qDebug qDebug
+#  undef qDebug
 #endif
 
 #ifdef __LP64__
@@ -186,7 +186,7 @@ typedef AERecord AppleEvent;
 #endif
 
 #ifdef old_qDebug
-#  undef tqDebug
-#  define tqDebug QT_NO_QDEBUG_MACRO
+#  undef qDebug
+#  define qDebug QT_NO_QDEBUG_MACRO
 #  undef old_qDebug
 #endif
diff --git a/qtinterface/qt4/Qt/qmessagebox.h b/qtinterface/qt4/Qt/qmessagebox.h
index 77e1e46..d3617b7 100644
--- a/qtinterface/qt4/Qt/qmessagebox.h
+++ b/qtinterface/qt4/Qt/qmessagebox.h
@@ -342,7 +342,7 @@ private:
 Q_DECLARE_OPERATORS_FOR_FLAGS(QMessageBox::StandardButtons)
 
 #define QT_REQUIRE_VERSION(argc, argv, str) { QString s = QString::fromLatin1(str);\
-QString sq = QString::fromLatin1(tqVersion()); \
+QString sq = QString::fromLatin1(qVersion()); \
 if ((sq.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\
 (sq.section(QChar::fromLatin1('.'),1,1).toInt()<<8)+\
 sq.section(QChar::fromLatin1('.'),2,2).toInt()<(s.section(QChar::fromLatin1('.'),0,0).toInt()<<16)+\
@@ -353,8 +353,8 @@ if (!qApp){ \
 } \
 QString s = QApplication::tr("Executable '%1' requires Qt "\
  "%2, found Qt %3.").arg(qAppName()).arg(QString::fromLatin1(\
-str)).arg(QString::fromLatin1(tqVersion())); QMessageBox::critical(0, QApplication::tr(\
-"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); tqFatal(s.toLatin1().data()); }}
+str)).arg(QString::fromLatin1(qVersion())); QMessageBox::critical(0, QApplication::tr(\
+"Incompatible Qt Library Error"), s, QMessageBox::Abort, 0); qFatal(s.toLatin1().data()); }}
 
 #endif // QT_NO_MESSAGEBOX
 
diff --git a/qtinterface/qt4/Qt/qsignalspy.h b/qtinterface/qt4/Qt/qsignalspy.h
index fb6af7a..fe36a40 100644
--- a/qtinterface/qt4/Qt/qsignalspy.h
+++ b/qtinterface/qt4/Qt/qsignalspy.h
@@ -72,7 +72,7 @@ public:
         Q_ASSERT(aSignal);
 
         if (((aSignal[0] - '0') & 0x03) != QSIGNAL_CODE) {
-            tqWarning("QSignalSpy: Not a valid signal, use the SIGNAL macro");
+            qWarning("QSignalSpy: Not a valid signal, use the SIGNAL macro");
             return;
         }
 
@@ -80,13 +80,13 @@ public:
         const QMetaObject *mo = obj->metaObject();
         int sigIndex = mo->indexOfMethod(ba.constData());
         if (sigIndex < 0) {
-            tqWarning("QSignalSpy: No such signal: '%s'", ba.constData());
+            qWarning("QSignalSpy: No such signal: '%s'", ba.constData());
             return;
         }
 
         if (!QMetaObject::connect(obj, sigIndex, this, memberOffset,
                     Qt::DirectConnection, 0)) {
-            tqWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect.");
+            qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect.");
             return;
         }
         sig = ba;
@@ -119,7 +119,7 @@ private:
         for (int i = 0; i < params.count(); ++i) {
             int tp = QMetaType::type(params.at(i).constData());
             if (tp == QMetaType::Void)
-                tqWarning("Don't know how to handle '%s', use qRegisterMetaType to register it.",
+                qWarning("Don't know how to handle '%s', use qRegisterMetaType to register it.",
                          params.at(i).constData());
             args << tp;
         }
diff --git a/qtinterface/qt4/Qt/qtest.h b/qtinterface/qt4/Qt/qtest.h
index 8754a4f..e1ce276 100644
--- a/qtinterface/qt4/Qt/qtest.h
+++ b/qtinterface/qt4/Qt/qtest.h
@@ -72,12 +72,12 @@ namespace QTest
 
 template<> inline char *toString(const QLatin1String &str)
 {
-    return tqstrdup(str.latin1());
+    return qstrdup(str.latin1());
 }
 
 template<> inline char *toString(const QString &str)
 {
-    return tqstrdup(str.toLatin1().constData());
+    return qstrdup(str.toLatin1().constData());
 }
 
 template<> inline char *toString(const QByteArray &ba)
@@ -88,63 +88,63 @@ template<> inline char *toString(const QByteArray &ba)
 template<> inline char *toString(const QTime &time)
 {
     return time.isValid()
-        ? tqstrdup(time.toString(QLatin1String("hh:mm:ss.zzz")).toLatin1().constData())
-        : tqstrdup("Invalid QTime");
+        ? qstrdup(time.toString(QLatin1String("hh:mm:ss.zzz")).toLatin1().constData())
+        : qstrdup("Invalid QTime");
 }
 
 template<> inline char *toString(const QDate &date)
 {
     return date.isValid()
-        ? tqstrdup(date.toString(QLatin1String("yyyy/MM/dd")).toLatin1().constData())
-        : tqstrdup("Invalid QDate");
+        ? qstrdup(date.toString(QLatin1String("yyyy/MM/dd")).toLatin1().constData())
+        : qstrdup("Invalid QDate");
 }
 
 template<> inline char *toString(const QDateTime &dateTime)
 {
     return dateTime.isValid()
-        ? tqstrdup((dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz")) +
+        ? qstrdup((dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz")) +
                   (dateTime.timeSpec() == Qt::LocalTime ? QLatin1String("[local time]") : QLatin1String("[UTC]"))).toLatin1().constData())
-        : tqstrdup("Invalid QDateTime");
+        : qstrdup("Invalid QDateTime");
 }
 
 template<> inline char *toString(const QChar &c)
 {
-    return tqstrdup(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast<int>(c.unicode()), 16)).toLatin1().constData());
+    return qstrdup(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast<int>(c.unicode()), 16)).toLatin1().constData());
 }
 
 template<> inline char *toString(const QPoint &p)
 {
-    return tqstrdup(QString::fromLatin1("QPoint(%1,%2)").arg(p.x()).arg(p.y()).toLatin1().constData());
+    return qstrdup(QString::fromLatin1("QPoint(%1,%2)").arg(p.x()).arg(p.y()).toLatin1().constData());
 }
 
 template<> inline char *toString(const QSize &s)
 {
-    return tqstrdup(QString::fromLatin1("QSize(%1x%2)").arg(s.width()).arg(s.height()).toLatin1().constData());
+    return qstrdup(QString::fromLatin1("QSize(%1x%2)").arg(s.width()).arg(s.height()).toLatin1().constData());
 }
 
 template<> inline char *toString(const QRect &s)
 {
-    return tqstrdup(QString::fromLatin1("QRect(%1,%2 %5x%6) (bottomright %3,%4)").arg(s.left()).arg(s.top()).arg(s.right()).arg(s.bottom()).arg(s.width()).arg(s.height()).toLatin1().constData());
+    return qstrdup(QString::fromLatin1("QRect(%1,%2 %5x%6) (bottomright %3,%4)").arg(s.left()).arg(s.top()).arg(s.right()).arg(s.bottom()).arg(s.width()).arg(s.height()).toLatin1().constData());
 }
 
 template<> inline char *toString(const QPointF &p)
 {
-    return tqstrdup(QString::fromLatin1("QPointF(%1,%2)").arg(p.x()).arg(p.y()).toLatin1().constData());
+    return qstrdup(QString::fromLatin1("QPointF(%1,%2)").arg(p.x()).arg(p.y()).toLatin1().constData());
 }
 
 template<> inline char *toString(const QSizeF &s)
 {
-    return tqstrdup(QString::fromLatin1("QSizeF(%1x%2)").arg(s.width()).arg(s.height()).toLatin1().constData());
+    return qstrdup(QString::fromLatin1("QSizeF(%1x%2)").arg(s.width()).arg(s.height()).toLatin1().constData());
 }
 
 template<> inline char *toString(const QRectF &s)
 {
-    return tqstrdup(QString::fromLatin1("QRectF(%1,%2 %5x%6) (bottomright %3,%4)").arg(s.left()).arg(s.top()).arg(s.right()).arg(s.bottom()).arg(s.width()).arg(s.height()).toLatin1().constData());
+    return qstrdup(QString::fromLatin1("QRectF(%1,%2 %5x%6) (bottomright %3,%4)").arg(s.left()).arg(s.top()).arg(s.right()).arg(s.bottom()).arg(s.width()).arg(s.height()).toLatin1().constData());
 }
 
 template<> inline char *toString(const QUrl &uri)
 {
-    return tqstrdup(uri.toEncoded().constData());
+    return qstrdup(uri.toEncoded().constData());
 }
 
 template<> inline char *toString(const QVariant &v)
@@ -168,7 +168,7 @@ template<> inline char *toString(const QVariant &v)
     }
     vstring.append(')');
 
-    return tqstrdup(vstring.constData());
+    return qstrdup(vstring.constData());
 }
 
 #ifndef QTEST_NO_SPECIALIZATIONS
diff --git a/qtinterface/qt4/Qt/qtestaccessible.h b/qtinterface/qt4/Qt/qtestaccessible.h
index ff9f79f..e9ad6fb 100644
--- a/qtinterface/qt4/Qt/qtestaccessible.h
+++ b/qtinterface/qt4/Qt/qtestaccessible.h
@@ -90,7 +90,7 @@ public:
     {
         if (!instance()) {
             instance() = new QTestAccessibility;
-            tqAddPostRoutine(cleanup);
+            qAddPostRoutine(cleanup);
         }
     }
     static void cleanup()
@@ -127,19 +127,19 @@ private:
 
     static void rootObjectHandler(QObject *object)
     {
-        //    tqDebug("rootObjectHandler called %p", object);
+        //    qDebug("rootObjectHandler called %p", object);
         if (object) {
             QApplication* app = qobject_cast<QApplication*>(object);
             if ( !app )
-                tqWarning("QTEST_ACCESSIBILITY: root Object is not a QApplication!");
+                qWarning("QTEST_ACCESSIBILITY: root Object is not a QApplication!");
         } else {
-            tqWarning("QTEST_ACCESSIBILITY: root Object called with 0 pointer");
+            qWarning("QTEST_ACCESSIBILITY: root Object called with 0 pointer");
         }
     }
 
     static void updateHandler(QObject *o, int c, QAccessible::Event e)
     {
-        //    tqDebug("updateHandler called: %p %d %d", o, c, (int)e);
+        //    qDebug("updateHandler called: %p %d %d", o, c, (int)e);
         eventList().append(QTestAccessibilityEvent(o, c, (int)e));
     }