43 files changed, 87 insertions, 87 deletions
diff --git a/src/codecs/tqtextcodec.cpp b/src/codecs/tqtextcodec.cpp
index 0609ae294..8d2c0bb17 100644
--- a/src/codecs/tqtextcodec.cpp
+++ b/src/codecs/tqtextcodec.cpp
@@ -76,7 +76,7 @@
 #endif
 
 #ifdef TQT_THREAD_SUPPORT
-#  include <private/qmutexpool_p.h>
+#  include <private/tqmutexpool_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
diff --git a/src/codecs/tqtextcodecfactory.cpp b/src/codecs/tqtextcodecfactory.cpp
index 24ac82a09..b98155587 100644
--- a/src/codecs/tqtextcodecfactory.cpp
+++ b/src/codecs/tqtextcodecfactory.cpp
@@ -49,7 +49,7 @@
 #include "tqtextcodecinterface_p.h"
 
 #ifdef TQT_THREAD_SUPPORT
-#  include <private/qmutexpool_p.h>
+#  include <private/tqmutexpool_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index 7dfc1fb2a..983c817d3 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -100,7 +100,7 @@
 
 #ifdef TQ_WS_WIN
 #ifdef TQT_THREAD_SUPPORT
-#  include <private/qmutexpool_p.h>
+#  include <private/tqmutexpool_p.h>
 #endif // TQT_THREAD_SUPPORT
 #endif // TQ_WS_WIN
 
diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp
index a54d2d24c..9199f8088 100644
--- a/src/inputmethod/qinputcontextfactory.cpp
+++ b/src/inputmethod/qinputcontextfactory.cpp
@@ -44,7 +44,7 @@
 #include "ntqapplication.h"
 
 #ifdef TQT_THREAD_SUPPORT
-#include <private/qmutexpool_p.h>
+#include <private/tqmutexpool_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 4dee12662..41b65486d 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -136,7 +136,7 @@
 #include <ntqcdestyle.h>
 #include <ntqmovie.h>
 #include "tqptrvector.h"
-#include "ntqmutex.h"
+#include "tqmutex.h"
 #include <ntqnetwork.h>
 #include <ntqftp.h>
 #include "ntqguardedptr.h"
@@ -178,7 +178,7 @@
 #include <ntqrtlcodec.h>
 #include <ntqlistbox.h>
 #include <ntqgridview.h>
-#include "ntqsemaphore.h"
+#include "tqsemaphore.h"
 #include <ntqprogressdialog.h>
 #include "ntqsocketdevice.h"
 #include <ntqsessionmanager.h>
@@ -236,7 +236,7 @@
 #include <ntqmultilineedit.h>
 #include "ntqtoolbar.h"
 #include <tqtextview.h>
-#include "ntqwaitcondition.h"
+#include "tqwaitcondition.h"
 #include <ntqasyncio.h>
 #include <ntqfontdatabase.h>
 #include <ntqmainwindow.h>
@@ -257,7 +257,7 @@
 #include <ntqvbox.h>
 #include <ntqvbuttongroup.h>
 #include <ntqvgroupbox.h>
-#include <ntqthread.h>
+#include <tqthread.h>
 #include <ntqwhatsthis.h>
 #include <ntqapplication.h>
 #include <tqwidgetintdict.h>
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index c6bde72a7..5297837cc 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -66,9 +66,9 @@
 #include "qfontdata_p.h"
 
 #if defined(TQT_THREAD_SUPPORT)
-#  include "ntqmutex.h"
-#  include "ntqthread.h"
-#  include <private/qthreadinstance_p.h>
+#  include "tqmutex.h"
+#  include "tqthread.h"
+#  include <private/tqthreadinstance_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 33fa0ceca..cd65da67a 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -95,7 +95,7 @@
 #include "qinternal_p.h" // shared double buffer cleanup
 
 #if defined(TQT_THREAD_SUPPORT)
-# include "ntqthread.h"
+# include "tqthread.h"
 #endif
 
 #if defined(QT_DEBUG) && defined(Q_OS_LINUX)
diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp
index e08a1ee1c..ce0f2bc82 100644
--- a/src/kernel/qeventloop.cpp
+++ b/src/kernel/qeventloop.cpp
@@ -42,8 +42,8 @@
 #include "tqdatetime.h"
 
 #ifdef TQT_THREAD_SUPPORT
-#  include "ntqthread.h"
-#  include "private/qthreadinstance_p.h"
+#  include "tqthread.h"
+#  include "private/tqthreadinstance_p.h"
 #endif
 
 /*!
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp
index 132279314..89e31da82 100644
--- a/src/kernel/qeventloop_unix.cpp
+++ b/src/kernel/qeventloop_unix.cpp
@@ -40,7 +40,7 @@
 #include "ntqeventloop.h"
 #include "ntqapplication.h"
 #include "ntqbitarray.h"
-#include "ntqmutex.h"
+#include "tqmutex.h"
 #include <stdlib.h>
 #include <sys/types.h>
 
diff --git a/src/kernel/qeventloop_unix_glib.cpp b/src/kernel/qeventloop_unix_glib.cpp
index e65d49bb2..5d43a6efb 100644
--- a/src/kernel/qeventloop_unix_glib.cpp
+++ b/src/kernel/qeventloop_unix_glib.cpp
@@ -40,10 +40,10 @@
 #include "ntqeventloop.h"
 #include "ntqapplication.h"
 #include "ntqbitarray.h"
-#include "ntqmutex.h"
+#include "tqmutex.h"
 
 #if defined(TQT_THREAD_SUPPORT)
-  #include "ntqthread.h"
+  #include "tqthread.h"
 #endif
 
 #include <stdlib.h>
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index 1ba3b21df..6905bac22 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -44,7 +44,7 @@
 #include "qt_x11_p.h"
 
 #if defined(TQT_THREAD_SUPPORT)
-#  include "ntqmutex.h"
+#  include "tqmutex.h"
 #endif // TQT_THREAD_SUPPORT
 
 #include <errno.h>
diff --git a/src/kernel/qeventloop_x11_glib.cpp b/src/kernel/qeventloop_x11_glib.cpp
index a13dbeebf..b152d6a38 100644
--- a/src/kernel/qeventloop_x11_glib.cpp
+++ b/src/kernel/qeventloop_x11_glib.cpp
@@ -47,8 +47,8 @@
 #include "qt_x11_p.h"
 
 #if defined(TQT_THREAD_SUPPORT)
-#  include "ntqmutex.h"
-#  include "ntqthread.h"
+#  include "tqmutex.h"
+#  include "tqthread.h"
 #endif // TQT_THREAD_SUPPORT
 
 #include <errno.h>
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index 70ed6b5d5..624c025d8 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -42,7 +42,7 @@
 #include "ntqasciidict.h"
 
 #ifdef TQT_THREAD_SUPPORT
-#include <private/qmutexpool_p.h>
+#include <private/tqmutexpool_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 /*!
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 446019b6e..c4690a3f6 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -77,7 +77,7 @@ kernel {
 		  $$KERNEL_H/ntqsound.h \
 		  $$KERNEL_H/tqstyle.h \
 		  $$KERNEL_H/tqstylesheet.h \
-		  $$KERNEL_H/ntqthread.h \
+		  $$KERNEL_H/tqthread.h \
 		  $$KERNEL_H/tqtimer.h \
 		  $$KERNEL_H/ntqurl.h \
 		  $$KERNEL_H/ntqlocalfs.h \
@@ -127,7 +127,7 @@ kernel {
 		  $$KERNEL_CPP/qpainter_win.cpp \
 		  $$KERNEL_CPP/qregion_win.cpp \
 		  $$KERNEL_CPP/qsound_win.cpp \
-		  $$KERNEL_CPP/qthread_win.cpp \
+		  $$KERNEL_CPP/tqthread_win.cpp \
 		  $$KERNEL_CPP/tqwidget_win.cpp \
 		  $$KERNEL_CPP/qole_win.c \
 		  $$KERNEL_CPP/qfontengine_win.cpp
@@ -191,7 +191,7 @@ kernel {
 
         }
 	unix:SOURCES += $$KERNEL_CPP/qprocess_unix.cpp \
-		        $$KERNEL_CPP/qthread_unix.cpp
+		        $$KERNEL_CPP/tqthread_unix.cpp
 
 	SOURCES += $$KERNEL_CPP/qabstractlayout.cpp \
 		  $$KERNEL_CPP/qucomextra.cpp \
@@ -248,7 +248,7 @@ kernel {
 		  $$KERNEL_CPP/qsocketnotifier.cpp \
 		  $$KERNEL_CPP/qsound.cpp \
 		  $$KERNEL_CPP/tqstylesheet.cpp \
-		  $$KERNEL_CPP/qthread.cpp \
+		  $$KERNEL_CPP/tqthread.cpp \
 		  $$KERNEL_CPP/tqtimer.cpp \
 		  $$KERNEL_CPP/qurl.cpp \
 		  $$KERNEL_CPP/qlocalfs.cpp \
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index d50b48e85..3923b46d0 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -53,9 +53,9 @@
 #include "tqstyle.h"
 
 #ifdef TQT_THREAD_SUPPORT
-#include "ntqmutex.h"
-#include <private/qmutexpool_p.h>
-#include "ntqthread.h"
+#include "tqmutex.h"
+#include <private/tqmutexpool_p.h>
+#include "tqthread.h"
 #endif
 
 #include <ctype.h>
diff --git a/src/kernel/tqobject.h b/src/kernel/tqobject.h
index 2d72bfa25..cc67ba551 100644
--- a/src/kernel/tqobject.h
+++ b/src/kernel/tqobject.h
@@ -46,7 +46,7 @@
 #include "ntqwindowdefs.h"
 #include "tqstring.h"
 #include "ntqevent.h"
-#include "ntqmutex.h"
+#include "tqmutex.h"
 #include "ntqnamespace.h"
 #endif // QT_H
 
diff --git a/src/kernel/qthread.cpp b/src/kernel/tqthread.cpp
index bb51e41fc..27b2071ea 100644
--- a/src/kernel/qthread.cpp
+++ b/src/kernel/tqthread.cpp
@@ -40,9 +40,9 @@
 
 #include "qplatformdefs.h"
 
-#include "ntqthread.h"
+#include "tqthread.h"
 #include "ntqeventloop.h"
-#include <private/qthreadinstance_p.h>
+#include <private/tqthreadinstance_p.h>
 
 #ifndef QT_H
 #  include "ntqapplication.h"
@@ -50,7 +50,7 @@
 
 
 /*!
-    \class TQThread ntqthread.h
+    \class TQThread tqthread.h
     \threadsafe
     \brief The TQThread class provides platform-independent threads.
 
diff --git a/src/kernel/ntqthread.h b/src/kernel/tqthread.h
index 0b38e5a33..0b38e5a33 100644
--- a/src/kernel/ntqthread.h
+++ b/src/kernel/tqthread.h
diff --git a/src/kernel/qthread_unix.cpp b/src/kernel/tqthread_unix.cpp
index be67e002d..c6662dbeb 100644
--- a/src/kernel/qthread_unix.cpp
+++ b/src/kernel/tqthread_unix.cpp
@@ -42,11 +42,11 @@
 
 typedef pthread_mutex_t Q_MUTEX_T;
 
-#include "ntqthread.h"
-#include <private/qthreadinstance_p.h>
-#include <private/qmutex_p.h>
-#include <private/qmutexpool_p.h>
-#include <ntqthreadstorage.h>
+#include "tqthread.h"
+#include <private/tqthreadinstance_p.h>
+#include <private/tqmutex_p.h>
+#include <private/tqmutexpool_p.h>
+#include <tqthreadstorage.h>
 #include <ntqapplication.h>
 
 #include <errno.h>
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index 8dfda823c..d5419c8d0 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -57,7 +57,7 @@
 #include "ntqmetaobject.h"
 #include "ntqguardedptr.h"
 #if defined(TQT_THREAD_SUPPORT)
-#include "ntqthread.h"
+#include "tqthread.h"
 #endif
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "ntqaccessible.h"
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 3ce552ebd..9f1610620 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_STYLE
 
-#include "ntqmutex.h"
+#include "tqmutex.h"
 #include "ntqmenubar.h"
 #include "ntqapplication.h"
 #include "ntqpainter.h"
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index 27ffbb8ce..cc7647da9 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -49,7 +49,7 @@
 #endif // NO_ERROR_H
 
 #ifdef TQT_THREAD_SUPPORT
-#  include "qmutexpool_p.h"
+#  include "tqmutexpool_p.h"
 #endif // TQT_THREAD_SUPPORT
 
 #ifndef QT_DEBUG_COMPONENT
diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp
index 80381e8b9..d35b06e3e 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/qcstring.cpp
@@ -44,7 +44,7 @@
 #include "ntqdatastream.h"
 
 #ifdef TQT_THREAD_SUPPORT
-#  include <private/qmutexpool_p.h>
+#  include <private/tqmutexpool_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 #include <stdio.h>
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp
index 19e03e642..8019d7b16 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -49,7 +49,7 @@
 #include "tqstringlist.h"
 
 #ifdef TQT_THREAD_SUPPORT
-#  include <private/qmutexpool_p.h>
+#  include <private/tqmutexpool_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 #include <stdlib.h>
diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp
index ff1f7b08b..1470d100e 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/qgarray.cpp
@@ -53,7 +53,7 @@
 #include <string.h>
 
 #ifdef TQT_THREAD_SUPPORT
-#  include <private/qmutexpool_p.h>
+#  include <private/tqmutexpool_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 /*
diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
index 1afa67b41..95e66b38f 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -44,7 +44,7 @@
 #include "tqvaluelist.h"
 
 #if defined(TQT_THREAD_SUPPORT)
-  #include "ntqmutex.h"
+  #include "tqmutex.h"
 #endif // defined(TQT_THREAD_SUPPORT)
 
 /*!
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index 81b7a2006..1c6c8669e 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -52,7 +52,7 @@
 #include <stdlib.h>
 
 #ifdef TQT_THREAD_SUPPORT
-#  include <private/qmutexpool_p.h>
+#  include <private/tqmutexpool_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 #define USE_MALLOC				// comment to use new/delete
diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp
index d7716a1a7..fc02f8ef2 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/qlocale.cpp
@@ -48,8 +48,8 @@
 #include "ntqnamespace.h"
 
 #ifdef QT_QLOCALE_USES_FCVT
-# include <ntqmutex.h>
-# include <private/qmutexpool_p.h>
+# include <tqmutex.h>
+# include <private/tqmutexpool_p.h>
 #endif
 
 #if defined (Q_OS_WIN)
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp
index 612e31194..e6447cdf1 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/qregexp.cpp
@@ -53,8 +53,8 @@
 #include "ntqtl.h"
 
 #ifdef TQT_THREAD_SUPPORT
-#include "ntqthreadstorage.h"
-#include <private/qthreadinstance_p.h>
+#include "tqthreadstorage.h"
+#include <private/tqthreadinstance_p.h>
 #endif // TQT_THREAD_SUPPORT
 
 #undef TQT_TRANSLATE_NOOP
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index b57e00435..d52bbd339 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -38,15 +38,15 @@ tools {
 		  $$TOOLS_P/qlocale_p.h \
 		  $$TOOLS_H/tqptrlist.h \
 		  $$TOOLS_H/tqmap.h \
-		  $$TOOLS_H/ntqmutex.h \
-		  $$TOOLS_P/qmutex_p.h \
-		  $$TOOLS_P/qmutexpool_p.h \
+		  $$TOOLS_H/tqmutex.h \
+		  $$TOOLS_P/tqmutex_p.h \
+		  $$TOOLS_P/tqmutexpool_p.h \
 		  $$TOOLS_P/qpluginmanager_p.h \
 		  $$TOOLS_H/tqptrcollection.h \
 		  $$TOOLS_H/tqptrdict.h \
 		  $$TOOLS_H/tqptrqueue.h \
 		  $$TOOLS_H/ntqregexp.h \
-		  $$TOOLS_H/ntqsemaphore.h \
+		  $$TOOLS_H/tqsemaphore.h \
 		  $$TOOLS_H/ntqsettings.h \
 		  $$TOOLS_P/qsettings_p.h \
 		  $$TOOLS_H/ntqshared.h \
@@ -56,14 +56,14 @@ tools {
 		  $$TOOLS_H/tqstrlist.h \
 		  $$TOOLS_H/tqstrvec.h \
 		  $$TOOLS_H/tqtextstream.h \
-		  $$TOOLS_P/qthreadinstance_p.h \
-		  $$TOOLS_H/ntqthreadstorage.h\
+		  $$TOOLS_P/tqthreadinstance_p.h \
+		  $$TOOLS_H/tqthreadstorage.h\
 		  $$TOOLS_P/qunicodetables_p.h \
 		  $$TOOLS_H/tqptrvector.h \
 	          $$TOOLS_H/tqvaluelist.h \
 		  $$TOOLS_H/tqvaluestack.h \
 		  $$TOOLS_H/tqvaluevector.h \
-		  $$TOOLS_H/ntqwaitcondition.h \
+		  $$TOOLS_H/tqwaitcondition.h \
 		  $$TOOLS_P/qcom_p.h \
 		  $$TOOLS_P/qucom_p.h \
 		  $$TOOLS_H/ntquuid.h
@@ -73,9 +73,9 @@ tools {
 		  $$TOOLS_CPP/qfileinfo_win.cpp \
 		  $$TOOLS_CPP/qlibrary_win.cpp \
 		  $$TOOLS_CPP/qsettings_win.cpp \
-		  $$TOOLS_CPP/qmutex_win.cpp \
-		  $$TOOLS_CPP/qwaitcondition_win.cpp \
-		  $$TOOLS_CPP/qthreadstorage_win.cpp \
+		  $$TOOLS_CPP/tqmutex_win.cpp \
+		  $$TOOLS_CPP/tqwaitcondition_win.cpp \
+		  $$TOOLS_CPP/tqthreadstorage_win.cpp \
 		  $$TOOLS_CPP/qcriticalsection_p.cpp
 
 	win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp
@@ -95,9 +95,9 @@ tools {
 	else:unix:SOURCES += $$TOOLS_CPP/qdir_unix.cpp \
 		  $$TOOLS_CPP/qfile_unix.cpp \
 		  $$TOOLS_CPP/qfileinfo_unix.cpp \
-		  $$TOOLS_CPP/qmutex_unix.cpp \
-		  $$TOOLS_CPP/qthreadstorage_unix.cpp \
-		  $$TOOLS_CPP/qwaitcondition_unix.cpp
+		  $$TOOLS_CPP/tqmutex_unix.cpp \
+		  $$TOOLS_CPP/tqthreadstorage_unix.cpp \
+		  $$TOOLS_CPP/tqwaitcondition_unix.cpp
 
         mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp
 	mac {
@@ -128,11 +128,11 @@ tools {
 		  $$TOOLS_CPP/qlibrary.cpp \
 		  $$TOOLS_CPP/qlocale.cpp \
 		  $$TOOLS_CPP/tqmap.cpp \
-		  $$TOOLS_CPP/qmutexpool.cpp \
+		  $$TOOLS_CPP/tqmutexpool.cpp \
 		  $$TOOLS_CPP/tqptrcollection.cpp \
 		  $$TOOLS_CPP/qregexp.cpp \
 		  $$TOOLS_CPP/tqstring.cpp \
-		  $$TOOLS_CPP/qsemaphore.cpp \
+		  $$TOOLS_CPP/tqsemaphore.cpp \
 		  $$TOOLS_CPP/qsettings.cpp \
 		  $$TOOLS_CPP/tqstringlist.cpp \
 		  $$TOOLS_CPP/tqtextstream.cpp \
diff --git a/src/tools/ntqmutex.h b/src/tools/tqmutex.h
index c517c6355..c517c6355 100644
--- a/src/tools/ntqmutex.h
+++ b/src/tools/tqmutex.h
diff --git a/src/tools/qmutex_p.h b/src/tools/tqmutex_p.h
index 3e9de8e5c..ee841f5e2 100644
--- a/src/tools/qmutex_p.h
+++ b/src/tools/tqmutex_p.h
@@ -49,7 +49,7 @@
 //  -------------
 //
 // This file is not part of the TQt API.  It exists for the convenience
-// of qmutex_unix.cpp and qmutex_win.cpp.  This header file may change
+// of tqmutex_unix.cpp and tqmutex_win.cpp.  This header file may change
 // from version to version without notice, or even be removed.
 //
 // We mean it.
diff --git a/src/tools/qmutex_unix.cpp b/src/tools/tqmutex_unix.cpp
index 597d3e628..9c793a02d 100644
--- a/src/tools/qmutex_unix.cpp
+++ b/src/tools/tqmutex_unix.cpp
@@ -51,8 +51,8 @@ typedef pthread_mutex_t     Q_MUTEX_T;
 #endif
 #define Q_RECURSIVE_MUTEX_TYPE PTHREAD_MUTEX_RECURSIVE
 
-#include "ntqmutex.h"
-#include "qmutex_p.h"
+#include "tqmutex.h"
+#include "tqmutex_p.h"
 
 #include <errno.h>
 #include <string.h>
@@ -163,7 +163,7 @@ int TQRealMutexPrivate::level()
 
 
 /*!
-    \class TQMutex ntqmutex.h
+    \class TQMutex tqmutex.h
     \threadsafe
     \brief The TQMutex class provides access serialization between threads.
 
@@ -352,7 +352,7 @@ int TQMutex::level()
 }
 
 /*!
-    \class TQMutexLocker ntqmutex.h
+    \class TQMutexLocker tqmutex.h
     \brief The TQMutexLocker class simplifies locking and unlocking TQMutexes.
 
     \threadsafe
diff --git a/src/tools/qmutexpool.cpp b/src/tools/tqmutexpool.cpp
index 72c66c8ca..a7b17da3d 100644
--- a/src/tools/qmutexpool.cpp
+++ b/src/tools/tqmutexpool.cpp
@@ -36,17 +36,17 @@
 **
 **********************************************************************/
 
-#include "qmutexpool_p.h"
+#include "tqmutexpool_p.h"
 
 #ifdef TQT_THREAD_SUPPORT
 
-#include <ntqthread.h>
+#include <tqthread.h>
 
 TQ_EXPORT TQMutexPool *tqt_global_mutexpool = 0;
 
 
 /*!
-    \class TQMutexPool qmutexpool_p.h
+    \class TQMutexPool tqmutexpool_p.h
     \brief The TQMutexPool class provides a pool of TQMutex objects.
 
     \internal
diff --git a/src/tools/qmutexpool_p.h b/src/tools/tqmutexpool_p.h
index a0bb28562..28a7ac63a 100644
--- a/src/tools/qmutexpool_p.h
+++ b/src/tools/tqmutexpool_p.h
@@ -54,7 +54,7 @@
 #ifdef TQT_THREAD_SUPPORT
 
 #ifndef QT_H
-#include "ntqmutex.h"
+#include "tqmutex.h"
 #include "ntqmemarray.h"
 #endif // QT_H
 
diff --git a/src/tools/qsemaphore.cpp b/src/tools/tqsemaphore.cpp
index 810837b4c..a5cdfc630 100644
--- a/src/tools/qsemaphore.cpp
+++ b/src/tools/tqsemaphore.cpp
@@ -40,13 +40,13 @@
 
 #if defined(TQT_THREAD_SUPPORT)
 
-#include "ntqsemaphore.h"
-#include "ntqmutex.h"
-#include "ntqwaitcondition.h"
+#include "tqsemaphore.h"
+#include "tqmutex.h"
+#include "tqwaitcondition.h"
 
 
 /*!
-    \class TQSemaphore ntqsemaphore.h
+    \class TQSemaphore tqsemaphore.h
     \threadsafe
     \brief The TQSemaphore class provides a robust integer semaphore.
 
diff --git a/src/tools/ntqsemaphore.h b/src/tools/tqsemaphore.h
index 0dc8e81de..0dc8e81de 100644
--- a/src/tools/ntqsemaphore.h
+++ b/src/tools/tqsemaphore.h
diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp
index dbf179404..71eced17d 100644
--- a/src/tools/tqstring.cpp
+++ b/src/tools/tqstring.cpp
@@ -94,7 +94,7 @@
 #endif
 
 #if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE)
-#include "ntqmutex.h"
+#include "tqmutex.h"
 #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE
 
 extern TQMutex *tqt_sharedStringMutex;
diff --git a/src/tools/qthreadinstance_p.h b/src/tools/tqthreadinstance_p.h
index 076c2ba19..1cc0d083e 100644
--- a/src/tools/qthreadinstance_p.h
+++ b/src/tools/tqthreadinstance_p.h
@@ -54,7 +54,7 @@
 #ifdef TQT_THREAD_SUPPORT
 
 #ifndef QT_H
-#include "ntqmutex.h"
+#include "tqmutex.h"
 #include "ntqwindowdefs.h"
 #endif // QT_H
 
diff --git a/src/tools/ntqthreadstorage.h b/src/tools/tqthreadstorage.h
index 588621237..588621237 100644
--- a/src/tools/ntqthreadstorage.h
+++ b/src/tools/tqthreadstorage.h
diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/tqthreadstorage_unix.cpp
index 86192868e..9a7e179b2 100644
--- a/src/tools/qthreadstorage_unix.cpp
+++ b/src/tools/tqthreadstorage_unix.cpp
@@ -39,18 +39,18 @@
 #ifdef TQT_THREAD_SUPPORT
 
 #include "ntqapplication.h"
-#include "ntqthread.h"
+#include "tqthread.h"
 #include "qplatformdefs.h"
 
-#include "ntqthreadstorage.h"
-#include <private/qthreadinstance_p.h>
+#include "tqthreadstorage.h"
+#include <private/tqthreadinstance_p.h>
 
 #include <string.h>
 
 // #define TQTHREADSTORAGE_DEBUG
 
 
-// keep this in sync with the implementation in qthreadstorage.cpp
+// keep this in sync with the implementation in tqthreadstorage.cpp
 static const int MAX_THREAD_STORAGE = 257; // 256 maximum + 1 used in TQRegExp
 
 static pthread_mutex_t thread_storage_mutex = PTHREAD_MUTEX_INITIALIZER;
diff --git a/src/tools/ntqwaitcondition.h b/src/tools/tqwaitcondition.h
index 503d5d6c9..503d5d6c9 100644
--- a/src/tools/ntqwaitcondition.h
+++ b/src/tools/tqwaitcondition.h
diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/tqwaitcondition_unix.cpp
index 62038bae5..78fdb16bc 100644
--- a/src/tools/qwaitcondition_unix.cpp
+++ b/src/tools/tqwaitcondition_unix.cpp
@@ -44,9 +44,9 @@
 
 typedef pthread_mutex_t Q_MUTEX_T;
 
-#include "ntqwaitcondition.h"
-#include "ntqmutex.h"
-#include "qmutex_p.h"
+#include "tqwaitcondition.h"
+#include "tqmutex.h"
+#include "tqmutex_p.h"
 
 #include <errno.h>
 #include <string.h>
@@ -58,7 +58,7 @@ struct TQWaitConditionPrivate {
 
 
 /*!
-    \class TQWaitCondition ntqwaitcondition.h
+    \class TQWaitCondition tqwaitcondition.h
     \threadsafe
     \brief The TQWaitCondition class allows waiting/waking for conditions between threads.