7 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index 323f38109..89917cbec 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -591,7 +591,7 @@ SeeAlso: ???
 Feature: LABEL
 Section: Widgets
 Requires: FRAME
-Name: QLabel
+Name: TQLabel
 SeeAlso: ???
 
 Feature: TOOLBAR
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index ff5fd5c74..5e9f38a8a 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -862,7 +862,7 @@ TQtMsgHandler qInstallMsgHandler( TQtMsgHandler h )
 /*
     Dijkstra's bisection algorithm to find the square root as an integer.
     Deliberately not exported as part of the TQt API, but used in
-    qsimplerichtext.cpp
+    tqsimplerichtext.cpp
 */
 unsigned int qt_int_sqrt( unsigned int n )
 {
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index c4cced519..5eb816580 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -34,8 +34,8 @@ tools {
 		  $$TOOLS_H/tqiodevice.h \
 		  $$TOOLS_H/ntqlibrary.h \
 		  $$TOOLS_P/qlibrary_p.h \
-		  $$TOOLS_H/ntqlocale.h \
-		  $$TOOLS_P/qlocale_p.h \
+		  $$TOOLS_H/tqlocale.h \
+		  $$TOOLS_P/tqlocale_p.h \
 		  $$TOOLS_H/tqptrlist.h \
 		  $$TOOLS_H/tqmap.h \
 		  $$TOOLS_H/tqmutex.h \
@@ -126,7 +126,7 @@ tools {
 		  $$TOOLS_CPP/qgvector.cpp \
 		  $$TOOLS_CPP/tqiodevice.cpp \
 		  $$TOOLS_CPP/qlibrary.cpp \
-		  $$TOOLS_CPP/qlocale.cpp \
+		  $$TOOLS_CPP/tqlocale.cpp \
 		  $$TOOLS_CPP/tqmap.cpp \
 		  $$TOOLS_CPP/tqmutexpool.cpp \
 		  $$TOOLS_CPP/tqptrcollection.cpp \
@@ -143,7 +143,7 @@ tools {
         irix-cc* {
                 CXXFLAGS_PRELINK = $$QMAKE_CXXFLAGS
                 CXXFLAGS_PRELINK -= -O2
-                QMAKE_PRE_LINK          = $(CXX) -c $$CXXFLAGS_PRELINK -O1 $(INCPATH) -o $(OBJECTS_DIR)/qlocale.o tools/qlocale.cpp
+                QMAKE_PRE_LINK          = $(CXX) -c $$CXXFLAGS_PRELINK -O1 $(INCPATH) -o $(OBJECTS_DIR)/tqlocale.o tools/tqlocale.cpp
         }
 }
 
diff --git a/src/tools/qlocale.cpp b/src/tools/tqlocale.cpp
index fc02f8ef2..57ddcfb3f 100644
--- a/src/tools/qlocale.cpp
+++ b/src/tools/tqlocale.cpp
@@ -43,8 +43,8 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include "ntqlocale.h"
-#include "qlocale_p.h"
+#include "tqlocale.h"
+#include "tqlocale_p.h"
 #include "ntqnamespace.h"
 
 #ifdef QT_QLOCALE_USES_FCVT
diff --git a/src/tools/ntqlocale.h b/src/tools/tqlocale.h
index d3a578d1c..d3a578d1c 100644
--- a/src/tools/ntqlocale.h
+++ b/src/tools/tqlocale.h
diff --git a/src/tools/qlocale_p.h b/src/tools/tqlocale_p.h
index 8d562d22c..8d562d22c 100644
--- a/src/tools/qlocale_p.h
+++ b/src/tools/tqlocale_p.h
diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp
index 58a377cd7..546069d48 100644
--- a/src/tools/tqstring.cpp
+++ b/src/tools/tqstring.cpp
@@ -56,8 +56,8 @@
 #ifndef TQT_NO_TEXTCODEC
 #include "tqtextcodec.h"
 #endif
-#include "ntqlocale.h"
-#include "qlocale_p.h"
+#include "tqlocale.h"
+#include "tqlocale_p.h"
 
 #include "qunicodetables_p.h"
 #include <limits.h>