Undo prior accidental commit

3 files changed, 41 insertions, 41 deletions

diff --git a/qtinterface/tqt4/Qt/qbytearray.h b/qtinterface/tqt4/Qt/qbytearray.h
index 754c891..9ee2be3 100644
--- a/qtinterface/tqt4/Qt/qbytearray.h
+++ b/qtinterface/tqt4/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;
@@ -583,10 +583,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/tqt4/Qt/qglobal.h b/qtinterface/tqt4/Qt/qglobal.h
index af3d17f..d5bf293 100644
--- a/qtinterface/tqt4/Qt/qglobal.h
+++ b/qtinterface/tqt4/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)
@@ -1942,7 +1942,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
@@ -2404,15 +2404,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/tqt4/Qt/qpaintdevice.h b/qtinterface/tqt4/Qt/qpaintdevice.h
index 208e3d1..98157db 100644
--- a/qtinterface/tqt4/Qt/qpaintdevice.h
+++ b/qtinterface/tqt4/Qt/qpaintdevice.h
@@ -95,7 +95,7 @@ public:
 #elif defined(Q_WS_X11)
     virtual Qt::HANDLE	handle() const;
     virtual Qt::HANDLE  x11RenderHandle() const;
-    static GC tqt_xget_temp_gc( int scrn, bool monochrome );
+    static GC qt_xget_temp_gc( int scrn, bool monochrome );
 #elif defined(Q_WS_MAC)
     virtual Qt::HANDLE      handle() const;
 #elif defined(Q_WS_QWS)