Rename utility class nt* related files to equivalent tq*

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

32 files changed, 57 insertions, 59 deletions

diff --git a/src/tools/ntqiodevice.h b/src/tools/ntqiodevice.h
index c9001bc15..712288d8e 100644
--- a/src/tools/ntqiodevice.h
+++ b/src/tools/ntqiodevice.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqglobal.h"
-#include "ntqcstring.h"
+#include "tqcstring.h"
 #endif // QT_H
 
 
diff --git a/src/tools/qdir.cpp b/src/tools/qdir.cpp
index 1a2f654f5..4ca6be4aa 100644
--- a/src/tools/qdir.cpp
+++ b/src/tools/qdir.cpp
@@ -44,9 +44,9 @@
 #ifndef TQT_NO_DIR
 #include <private/qdir_p.h>
 #include "ntqfileinfo.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "tqstringlist.h"
-#include "ntqdeepcopy.h"
+#include "tqdeepcopy.h"
 #include <limits.h>
 
 #if defined(Q_FS_FAT) && !defined(Q_OS_UNIX)
@@ -561,7 +561,7 @@ bool TQDir::cdUp()
     nameFilter.
 
     The \a nameFilter is a wildcard (globbing) filter that understands
-    "*" and "?" wildcards. (See \link ntqregexp.html#wildcard-matching
+    "*" and "?" wildcards. (See \link tqregexp.html#wildcard-matching
     TQRegExp wildcard matching\endlink.) You may specify several filter
     entries all separated by a single space " " or by a semi-colon
     ";".
@@ -1198,7 +1198,7 @@ bool qt_matchFilterList( const TQValueList<TQRegExp>& filters,
     Returns TRUE if the \a fileName matches any of the wildcard (glob)
     patterns in the list of \a filters; otherwise returns FALSE.
 
-    (See \link ntqregexp.html#wildcard-matching TQRegExp wildcard
+    (See \link tqregexp.html#wildcard-matching TQRegExp wildcard
     matching.\endlink)
     \sa TQRegExp::match()
 */
@@ -1220,7 +1220,7 @@ bool TQDir::match( const TQStringList &filters, const TQString &fileName )
     pattern \a filter; otherwise returns FALSE. The \a filter may
     contain multiple patterns separated by spaces or semicolons.
 
-    (See \link ntqregexp.html#wildcard-matching TQRegExp wildcard
+    (See \link tqregexp.html#wildcard-matching TQRegExp wildcard
     matching.\endlink)
     \sa TQRegExp::match()
 */
diff --git a/src/tools/qdir_p.h b/src/tools/qdir_p.h
index 91138abb5..a0309648b 100644
--- a/src/tools/qdir_p.h
+++ b/src/tools/qdir_p.h
@@ -55,7 +55,7 @@
 //
 
 #ifndef QT_H
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "tqvaluelist.h"
 #endif // QT_H
 
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp
index 8019d7b16..e4418f8e6 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -45,7 +45,7 @@
 
 #include "qdir_p.h"
 #include "ntqfileinfo.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "tqstringlist.h"
 
 #ifdef TQT_THREAD_SUPPORT
diff --git a/src/tools/qfileinfo.cpp b/src/tools/qfileinfo.cpp
index f5e85119b..60a39346a 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/qfileinfo.cpp
@@ -44,7 +44,7 @@
 #include "tqdatetime.h"
 #include "ntqdir.h"
 #include "qfiledefs_p.h"
-#include "ntqdeepcopy.h"
+#include "tqdeepcopy.h"
 #if defined(QT_LARGEFILE_SUPPORT)
 #include <limits.h>
 #endif
diff --git a/src/tools/qgcache.cpp b/src/tools/qgcache.cpp
index 452128890..95f75534e 100644
--- a/src/tools/qgcache.cpp
+++ b/src/tools/qgcache.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqgcache.h"
 #include "tqptrlist.h"
-#include "ntqdict.h"
+#include "tqdict.h"
 #include "tqstring.h"
 
 /*!
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index 910580f7a..ff5fd5c74 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -40,7 +40,7 @@
 
 #include "qplatformdefs.h"
 
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
 #include <tqdatetime.h>
 #include <limits.h>
 #include <stdio.h>
diff --git a/src/tools/qgpluginmanager_p.h b/src/tools/qgpluginmanager_p.h
index 982970131..069b7e27a 100644
--- a/src/tools/qgpluginmanager_p.h
+++ b/src/tools/qgpluginmanager_p.h
@@ -40,7 +40,7 @@
 #define TQGPLUGINMANAGER_P_H
 
 #ifndef QT_H
-#include "ntqdict.h"
+#include "tqdict.h"
 #include "ntqlibrary.h"
 #include "ntquuid.h"
 #include "tqstringlist.h"
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index 250e5623d..e76fc6ca7 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -62,7 +62,7 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 #include "ntqfileinfo.h"
 #include "tqmap.h"
 #include "tqtextstream.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include <private/qsettings_p.h>
 #ifndef NO_ERRNO_H
 #include <errno.h>
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index d52bbd339..dc9fa2753 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -2,20 +2,20 @@
 
 tools {
 	TOOLS_P		= tools
-	HEADERS +=  $$TOOLS_H/ntqmemarray.h \
-		  $$TOOLS_H/ntqasciicache.h \
-		  $$TOOLS_H/ntqasciidict.h \
-		  $$TOOLS_H/ntqbitarray.h \
+	HEADERS +=  $$TOOLS_H/tqmemarray.h \
+		  $$TOOLS_H/tqasciicache.h \
+		  $$TOOLS_H/tqasciidict.h \
+		  $$TOOLS_H/tqbitarray.h \
 		  $$TOOLS_H/ntqbuffer.h \
-		  $$TOOLS_H/ntqcache.h \
+		  $$TOOLS_H/tqcache.h \
 		  $$TOOLS_H/ntqcleanuphandler.h \
 		  $$TOOLS_P/qcomponentfactory_p.h \
 		  $$TOOLS_P/qcomlibrary_p.h \
-		  $$TOOLS_H/ntqcstring.h \
+		  $$TOOLS_H/tqcstring.h \
 		  $$TOOLS_H/ntqdatastream.h \
 		  $$TOOLS_H/tqdatetime.h \
-		  $$TOOLS_H/ntqdeepcopy.h \
-		  $$TOOLS_H/ntqdict.h \
+		  $$TOOLS_H/tqdeepcopy.h \
+		  $$TOOLS_H/tqdict.h \
 		  $$TOOLS_H/ntqdir.h \
 		  $$TOOLS_P/qdir_p.h \
 		  $$TOOLS_H/ntqfile.h \
@@ -29,8 +29,8 @@ tools {
 		  $$TOOLS_H/ntqglobal.h \
 		  $$TOOLS_P/qgpluginmanager_p.h \
 		  $$TOOLS_H/ntqgvector.h \
-		  $$TOOLS_H/ntqintcache.h \
-		  $$TOOLS_H/ntqintdict.h \
+		  $$TOOLS_H/tqintcache.h \
+		  $$TOOLS_H/tqintdict.h \
 		  $$TOOLS_H/ntqiodevice.h \
 		  $$TOOLS_H/ntqlibrary.h \
 		  $$TOOLS_P/qlibrary_p.h \
@@ -45,7 +45,7 @@ tools {
 		  $$TOOLS_H/tqptrcollection.h \
 		  $$TOOLS_H/tqptrdict.h \
 		  $$TOOLS_H/tqptrqueue.h \
-		  $$TOOLS_H/ntqregexp.h \
+		  $$TOOLS_H/tqregexp.h \
 		  $$TOOLS_H/tqsemaphore.h \
 		  $$TOOLS_H/ntqsettings.h \
 		  $$TOOLS_P/qsettings_p.h \
@@ -106,14 +106,14 @@ tools {
 	    }
 	unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
 
-	SOURCES += $$TOOLS_CPP/qbitarray.cpp \
+	SOURCES += $$TOOLS_CPP/tqbitarray.cpp \
 		  $$TOOLS_CPP/qbuffer.cpp \
 		  $$TOOLS_CPP/qcomponentfactory.cpp \
 		  $$TOOLS_CPP/qcomlibrary.cpp \
-		  $$TOOLS_CPP/qcstring.cpp \
+		  $$TOOLS_CPP/tqcstring.cpp \
 		  $$TOOLS_CPP/qdatastream.cpp \
 		  $$TOOLS_CPP/tqdatetime.cpp \
-		  $$TOOLS_CPP/qdeepcopy.cpp \
+		  $$TOOLS_CPP/tqdeepcopy.cpp \
 		  $$TOOLS_CPP/qdir.cpp \
 		  $$TOOLS_CPP/qfile.cpp \
 		  $$TOOLS_CPP/qfileinfo.cpp \
@@ -130,7 +130,7 @@ tools {
 		  $$TOOLS_CPP/tqmap.cpp \
 		  $$TOOLS_CPP/tqmutexpool.cpp \
 		  $$TOOLS_CPP/tqptrcollection.cpp \
-		  $$TOOLS_CPP/qregexp.cpp \
+		  $$TOOLS_CPP/tqregexp.cpp \
 		  $$TOOLS_CPP/tqstring.cpp \
 		  $$TOOLS_CPP/tqsemaphore.cpp \
 		  $$TOOLS_CPP/qsettings.cpp \
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 8bd5fd0f4..cb5ce9c17 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -13,15 +13,13 @@
 #include <private/tqsqlextension_p.h>
 #include <tqsqlindex.h>
 #include <ntqtable.h>
-#include <ntqtable.h>
-#include <ntqtable.h>
-#include <ntqasciidict.h>
-#include <ntqcstring.h>
-#include <ntqdict.h>
-#include <ntqintdict.h>
+#include <tqasciidict.h>
+#include <tqcstring.h>
+#include <tqdict.h>
+#include <tqintdict.h>
 #include <ntqlibrary.h>
 #include <tqmap.h>
-#include <ntqmemarray.h>
+#include <tqmemarray.h>
 #include <tqptrlist.h>
 #include <tqptrvector.h>
 #include <tqstring.h>
diff --git a/src/tools/ntqasciicache.h b/src/tools/tqasciicache.h
index 7323635c6..7323635c6 100644
--- a/src/tools/ntqasciicache.h
+++ b/src/tools/tqasciicache.h
diff --git a/src/tools/ntqasciidict.h b/src/tools/tqasciidict.h
index ef09bc025..ef09bc025 100644
--- a/src/tools/ntqasciidict.h
+++ b/src/tools/tqasciidict.h
diff --git a/src/tools/qbitarray.cpp b/src/tools/tqbitarray.cpp
index c850546e9..283a99406 100644
--- a/src/tools/qbitarray.cpp
+++ b/src/tools/tqbitarray.cpp
@@ -38,14 +38,14 @@
 **
 **********************************************************************/
 
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
 #include "ntqdatastream.h"
 
 #define SHBLOCK	 ((bitarr_data*)(sharedBlock()))
 
 
 /*!
-    \class TQBitVal ntqbitarray.h
+    \class TQBitVal tqbitarray.h
     \reentrant
     \brief The TQBitVal class is an internal class, used with TQBitArray.
 
@@ -84,7 +84,7 @@
 
 
 /*!
-    \class TQBitArray ntqbitarray.h
+    \class TQBitArray tqbitarray.h
     \reentrant
     \brief The TQBitArray class provides an array of bits.
 
diff --git a/src/tools/ntqbitarray.h b/src/tools/tqbitarray.h
index 65b2cdbe7..65b2cdbe7 100644
--- a/src/tools/ntqbitarray.h
+++ b/src/tools/tqbitarray.h
diff --git a/src/tools/ntqcache.h b/src/tools/tqcache.h
index 9d747e346..9d747e346 100644
--- a/src/tools/ntqcache.h
+++ b/src/tools/tqcache.h
diff --git a/src/tools/qcstring.cpp b/src/tools/tqcstring.cpp
index d35b06e3e..d4af46412 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/tqcstring.cpp
@@ -40,7 +40,7 @@
 **********************************************************************/
 
 #include "tqstring.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "ntqdatastream.h"
 
 #ifdef TQT_THREAD_SUPPORT
@@ -568,7 +568,7 @@ TQDataStream &operator>>( TQDataStream &s, TQByteArray &a )
  *****************************************************************************/
 
 /*!
-    \class TQCString ntqcstring.h
+    \class TQCString tqcstring.h
     \reentrant
     \brief The TQCString class provides an abstraction of the classic C
     zero-terminated char array (char *).
diff --git a/src/tools/ntqcstring.h b/src/tools/tqcstring.h
index e0054bf3a..3d989ff52 100644
--- a/src/tools/ntqcstring.h
+++ b/src/tools/tqcstring.h
@@ -43,7 +43,7 @@
 #define TQCSTRING_H
 
 #ifndef QT_H
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
 #endif // QT_H
 
 #include <string.h>
diff --git a/src/tools/tqdatetime.cpp b/src/tools/tqdatetime.cpp
index d6f212a12..5253fa50e 100644
--- a/src/tools/tqdatetime.cpp
+++ b/src/tools/tqdatetime.cpp
@@ -42,7 +42,7 @@
 
 #include "tqdatetime.h"
 #include "ntqdatastream.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 
 #include <stdio.h>
 #ifndef Q_OS_TEMP
diff --git a/src/tools/qdeepcopy.cpp b/src/tools/tqdeepcopy.cpp
index ea23fa639..28b3741d0 100644
--- a/src/tools/qdeepcopy.cpp
+++ b/src/tools/tqdeepcopy.cpp
@@ -38,10 +38,10 @@
 **
 **********************************************************************/
 
-#include "ntqdeepcopy.h"
+#include "tqdeepcopy.h"
 
 /*!
-    \class TQDeepCopy ntqdeepcopy.h
+    \class TQDeepCopy tqdeepcopy.h
     \brief The TQDeepCopy class is a template class which ensures that
     implicitly shared and explicitly shared classes reference unique
     data.
diff --git a/src/tools/ntqdeepcopy.h b/src/tools/tqdeepcopy.h
index abe1fc8f1..abe1fc8f1 100644
--- a/src/tools/ntqdeepcopy.h
+++ b/src/tools/tqdeepcopy.h
diff --git a/src/tools/ntqdict.h b/src/tools/tqdict.h
index d363538d0..d363538d0 100644
--- a/src/tools/ntqdict.h
+++ b/src/tools/tqdict.h
diff --git a/src/tools/ntqintcache.h b/src/tools/tqintcache.h
index 116618058..116618058 100644
--- a/src/tools/ntqintcache.h
+++ b/src/tools/tqintcache.h
diff --git a/src/tools/ntqintdict.h b/src/tools/tqintdict.h
index 162625855..162625855 100644
--- a/src/tools/ntqintdict.h
+++ b/src/tools/tqintdict.h
diff --git a/src/tools/ntqmemarray.h b/src/tools/tqmemarray.h
index 8a07bf9a9..8a07bf9a9 100644
--- a/src/tools/ntqmemarray.h
+++ b/src/tools/tqmemarray.h
diff --git a/src/tools/tqmutexpool_p.h b/src/tools/tqmutexpool_p.h
index 28a7ac63a..9e388473e 100644
--- a/src/tools/tqmutexpool_p.h
+++ b/src/tools/tqmutexpool_p.h
@@ -55,7 +55,7 @@
 
 #ifndef QT_H
 #include "tqmutex.h"
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
 #endif // QT_H
 
 class TQ_EXPORT TQMutexPool
diff --git a/src/tools/qregexp.cpp b/src/tools/tqregexp.cpp
index e6447cdf1..19758f95c 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/tqregexp.cpp
@@ -38,15 +38,15 @@
 **
 **********************************************************************/
 
-#include "ntqregexp.h"
+#include "tqregexp.h"
 
 #ifndef TQT_NO_REGEXP
 
-#include "ntqmemarray.h"
-#include "ntqbitarray.h"
-#include "ntqcache.h"
+#include "tqmemarray.h"
+#include "tqbitarray.h"
+#include "tqcache.h"
 #include "ntqcleanuphandler.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
 #include "tqmap.h"
 #include "tqptrvector.h"
 #include "tqstring.h"
@@ -74,11 +74,11 @@
 #define RXERR_LIMIT      TQT_TRANSLATE_NOOP( "TQRegExp", "met internal limit" )
 
 /*
-  WARNING! Be sure to read qregexp.tex before modifying this file.
+  WARNING! Be sure to read tqregexp.tex before modifying this file.
 */
 
 /*!
-    \class TQRegExp ntqregexp.h
+    \class TQRegExp tqregexp.h
     \reentrant
     \brief The TQRegExp class provides pattern matching using regular expressions.
 
diff --git a/src/tools/ntqregexp.h b/src/tools/tqregexp.h
index d8aca02c0..d8aca02c0 100644
--- a/src/tools/ntqregexp.h
+++ b/src/tools/tqregexp.h
diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp
index 71eced17d..86b1add58 100644
--- a/src/tools/tqstring.cpp
+++ b/src/tools/tqstring.cpp
@@ -51,7 +51,7 @@
 // #define MAKE_QSTRING_THREAD_SAFE 1
 
 #include "tqstring.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "ntqdatastream.h"
 #ifndef TQT_NO_TEXTCODEC
 #include "tqtextcodec.h"
@@ -1380,7 +1380,7 @@ char* TQString::unicodeToLatin1(const TQChar *uc, uint l, bool unpaged)
     and join a list of strings into a single string with an optional
     separator using TQStringList::join(). You can obtain a list of
     strings from a string list that contain a particular substring or
-    that match a particular \link ntqregexp.html regex\endlink using
+    that match a particular \link tqregexp.html regex\endlink using
     TQStringList::grep().
 
     <b>Note for C programmers</b>
@@ -4673,7 +4673,7 @@ TQString &TQString::replace( const TQString & before, const TQString & after )
     // s == "ba"
   \endcode
 
-  For regexps containing \link ntqregexp.html#capturing-text capturing
+  For regexps containing \link tqregexp.html#capturing-text capturing
   parentheses \endlink, occurrences of <b>\\1</b>, <b>\\2</b>, ...,
   in \a after are replaced with \a{rx}.cap(1), cap(2), ...
 
diff --git a/src/tools/tqstring.h b/src/tools/tqstring.h
index ce9ccf108..253ba3a03 100644
--- a/src/tools/tqstring.h
+++ b/src/tools/tqstring.h
@@ -43,7 +43,7 @@
 #define TQSTRING_H
 
 #ifndef QT_H
-#include "ntqcstring.h"
+#include "tqcstring.h"
 #endif // QT_H
 
 #ifndef TQT_NO_CAST_ASCII
diff --git a/src/tools/tqstringlist.cpp b/src/tools/tqstringlist.cpp
index 48bbbd541..8e08a4f08 100644
--- a/src/tools/tqstringlist.cpp
+++ b/src/tools/tqstringlist.cpp
@@ -41,7 +41,7 @@
 #include "tqstringlist.h"
 
 #ifndef TQT_NO_STRINGLIST
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "tqstrlist.h"
 #include "ntqdatastream.h"
 #include "ntqtl.h"
@@ -388,7 +388,7 @@ TQStringList& TQStringList::gres( const TQString &before, const TQString &after,
     // list == ["olpha", "beta", "gamma", "epsilon"]
     \endcode
 
-    For regexps containing \link ntqregexp.html#capturing-text
+    For regexps containing \link tqregexp.html#capturing-text
     capturing parentheses \endlink, occurrences of <b>\\1</b>,
     <b>\\2</b>, ..., in \a after are replaced with \a{rx}.cap(1),
     cap(2), ...
diff --git a/src/tools/tqtextstream.cpp b/src/tools/tqtextstream.cpp
index 218c9b106..0a911b0ed 100644
--- a/src/tools/tqtextstream.cpp
+++ b/src/tools/tqtextstream.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_TEXTSTREAM
 #include "tqtextcodec.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
 #include "ntqbuffer.h"
 #include "ntqfile.h"
 #include <stdio.h>