Rename date and time nt* related files to equivalent tq*

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

84 files changed, 110 insertions, 110 deletions

diff --git a/src/canvas/tqcanvas.cpp b/src/canvas/tqcanvas.cpp
index aa38c2055..8249f454a 100644
--- a/src/canvas/tqcanvas.cpp
+++ b/src/canvas/tqcanvas.cpp
@@ -46,7 +46,7 @@
 #include "tqptrdict.h"
 #include "ntqpainter.h"
 #include "ntqpolygonscanner.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqtl.h"
 
 #include <stdlib.h>
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index 79fe33346..7dfc1fb2a 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -88,7 +88,7 @@
 #include "ntqsplitter.h"
 #include "tqstrlist.h"
 #include "tqstyle.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqtoolbutton.h"
 #include "ntqtooltip.h"
 #include "ntqvbox.h"
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index 0424a9ec6..1202d4b76 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -45,12 +45,12 @@
 #include "ntqaccel.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
 #include "ntqpushbutton.h"
 #include "ntqcursor.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include <limits.h>
 
 // If the operation is expected to take this long (as predicted by
diff --git a/src/kernel/ntqasyncio.h b/src/kernel/ntqasyncio.h
index 19fe284b0..b2c88ce4d 100644
--- a/src/kernel/ntqasyncio.h
+++ b/src/kernel/ntqasyncio.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqobject.h"
 #include "ntqsignal.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #endif // QT_H
 
 #ifndef TQT_NO_ASYNC_IO
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index c0c34533a..587b8720a 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -948,14 +948,14 @@ public:
     // compatibility
     typedef Dock ToolBarDock;
 
-    // documented in qdatetime.cpp
+    // documented in tqdatetime.cpp
     enum DateFormat {
 	TextDate,      // default TQt
 	ISODate,       // ISO 8601
 	LocalDate      // locale dependent
     };
 
-    // documented in qdatetime.cpp
+    // documented in tqdatetime.cpp
     enum TimeSpec {
 	LocalTime,
 	UTC
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 5afa96e1d..4dee12662 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -48,7 +48,7 @@
 #include "tqstrlist.h"
 #include "tqvaluelist.h"
 #include "tqmap.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqmime.h"
 #include "ntqasciidict.h"
 #include "ntqpaintdevice.h"
@@ -95,7 +95,7 @@
 #include <ntqgrid.h>
 #include "ntqrangecontrol.h"
 #include "ntqbuttongroup.h"
-#include <ntqdatetimeedit.h>
+#include <tqdatetimeedit.h>
 #include "ntqgvector.h"
 #include "ntqhbox.h"
 #include <ntqhbuttongroup.h>
@@ -185,7 +185,7 @@
 #include <ntqsettings.h>
 #include <ntqsgistyle.h>
 #include <ntqfontdialog.h>
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include <ntqsignalmapper.h>
 #include <ntqsignalslotimp.h>
 #include <ntqsimplerichtext.h>
diff --git a/src/kernel/ntqurlinfo.h b/src/kernel/ntqurlinfo.h
index b9fa36eae..8c0269f84 100644
--- a/src/kernel/ntqurlinfo.h
+++ b/src/kernel/ntqurlinfo.h
@@ -42,7 +42,7 @@
 #define TQURLINFO_H
 
 #ifndef QT_H
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "tqstring.h"
 #endif // QT_H
 
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 0a1d62cf8..33fa0ceca 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -73,7 +73,7 @@
 #include "ntqbitarray.h"
 #include "ntqpainter.h"
 #include "ntqpixmapcache.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "tqtextcodec.h"
 #include "ntqdatastream.h"
 #include "ntqbuffer.h"
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index 7776cf606..dbe3a7f78 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -67,7 +67,7 @@
 #include "ntqapplication.h"
 #include "ntqeventloop.h"
 #include "ntqbitmap.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqdragobject.h"
 #include "ntqbuffer.h"
 #include "tqtextcodec.h"
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index 859a3c1a6..7e2a1fd04 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -46,7 +46,7 @@
 
 #include "tqwidget.h"
 #include "ntqintdict.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqdict.h"
 #include "ntqguardedptr.h"
 #include "ntqdragobject.h"
diff --git a/src/kernel/qeventloop.cpp b/src/kernel/qeventloop.cpp
index 402894f2a..e08a1ee1c 100644
--- a/src/kernel/qeventloop.cpp
+++ b/src/kernel/qeventloop.cpp
@@ -39,7 +39,7 @@
 #include "qeventloop_p.h" // includes qplatformdefs.h
 #include "ntqeventloop.h"
 #include "ntqapplication.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 
 #ifdef TQT_THREAD_SUPPORT
 #  include "ntqthread.h"
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp
index c449b8961..d1045740d 100644
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
@@ -40,7 +40,7 @@
 
 #include <qplatformdefs.h>
 
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #include <ntqpaintdevicemetrics.h>
 
 #include "qt_x11_p.h"
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index deb0225c3..5c46cbd74 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 
 #ifndef TQT_NO_IMAGEIO_MNG
 
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index d52f662a7..7be719725 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -40,7 +40,7 @@
 
 // #define QT_SAVE_MOVIE_HACK
 
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqpainter.h"
 #include "tqptrlist.h"
 #include "ntqbitmap.h"
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp
index 8d7ff8f1a..718a7ac11 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/qnetworkprotocol.cpp
@@ -44,7 +44,7 @@
 
 #include "ntqlocalfs.h"
 #include "ntqurloperator.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "tqmap.h"
 #include "tqptrqueue.h"
 
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 87f76848d..0e5a2299a 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -53,7 +53,7 @@
 #include "tqptrqueue.h"
 #include "tqptrlist.h"
 #include "ntqsocketnotifier.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqcleanuphandler.h"
 #include "ntqregexp.h"
 #include "private/qinternal_p.h"
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index 943cefff4..c9ce2ea7d 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -60,7 +60,7 @@
 #include "ntqapplication.h"
 #include "ntqpaintdevicemetrics.h"
 #include "tqimage.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "tqstring.h"
 #include "ntqdict.h"
 #include "ntqmemarray.h"
@@ -5351,7 +5351,7 @@ static void emitBits( char *out, int & byte, int & bit,
 
 //#define DEBUG_COMPRESS
 #ifdef DEBUG_COMPRESS
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #endif
 
 static TQByteArray compress( const TQImage & image, bool gray ) {
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index c812e5843..446019b6e 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -78,7 +78,7 @@ kernel {
 		  $$KERNEL_H/tqstyle.h \
 		  $$KERNEL_H/tqstylesheet.h \
 		  $$KERNEL_H/ntqthread.h \
-		  $$KERNEL_H/ntqtimer.h \
+		  $$KERNEL_H/tqtimer.h \
 		  $$KERNEL_H/ntqurl.h \
 		  $$KERNEL_H/ntqlocalfs.h \
 		  $$KERNEL_H/ntqurloperator.h \
@@ -249,7 +249,7 @@ kernel {
 		  $$KERNEL_CPP/qsound.cpp \
 		  $$KERNEL_CPP/tqstylesheet.cpp \
 		  $$KERNEL_CPP/qthread.cpp \
-		  $$KERNEL_CPP/qtimer.cpp \
+		  $$KERNEL_CPP/tqtimer.cpp \
 		  $$KERNEL_CPP/qurl.cpp \
 		  $$KERNEL_CPP/qlocalfs.cpp \
 		  $$KERNEL_CPP/qurloperator.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index a4655ff25..aff826dc0 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -26,7 +26,7 @@
 #include <ntqapplication.h>
 #include <ntqbitmap.h>
 #include <ntqcursor.h>
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #include <ntqglobal.h>
 #include <tqimage.h>
 #include <ntqmetaobject.h>  // All moc genereated code has this include
@@ -38,7 +38,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqstyle.h>
-#include <ntqtimer.h>
+#include <tqtimer.h>
 #include <tqwidget.h>
 
 #include <limits.h>
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index d3782f483..7e9b659ac 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -59,7 +59,7 @@
 #include "ntqpointarray.h"
 #include "ntqbitmap.h"
 #include "ntqcursor.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqsizepolicy.h"
 #include "ntqshared.h"
 #include "ntqbitarray.h"
diff --git a/src/kernel/qtimer.cpp b/src/kernel/tqtimer.cpp
index ca2dddb9e..11fecf81f 100644
--- a/src/kernel/qtimer.cpp
+++ b/src/kernel/tqtimer.cpp
@@ -38,12 +38,12 @@
 **
 **********************************************************************/
 
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqsignal.h"
 #include "tqobjectlist.h"
 
 /*!
-    \class TQTimer ntqtimer.h
+    \class TQTimer tqtimer.h
     \brief The TQTimer class provides timer signals and single-shot timers.
 
     \ingroup time
@@ -303,7 +303,7 @@ bool TQSingleShotTimer::event( TQEvent * )
     Example:
     \code
 	#include <ntqapplication.h>
-	#include <ntqtimer.h>
+	#include <tqtimer.h>
 
 	int main( int argc, char **argv )
 	{
diff --git a/src/kernel/ntqtimer.h b/src/kernel/tqtimer.h
index 40aae8724..40aae8724 100644
--- a/src/kernel/ntqtimer.h
+++ b/src/kernel/tqtimer.h
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index 78d1e850e..bc31e7e75 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -48,7 +48,7 @@
 #include "tqobjectlist.h"
 #include "ntqlayout.h"
 #include "tqtextcodec.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqcursor.h"
 #include "qt_x11_p.h"
 #include <stdlib.h>
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index 566a8589f..32f30dc06 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -16,7 +16,7 @@ SOURCES		= ../tools/qbuffer.cpp	    \
 		  ../tools/tqptrcollection.cpp  \
 		  ../tools/qcstring.cpp	    \
 		  ../tools/qdatastream.cpp  \
-		  ../tools/qdatetime.cpp    \
+		  ../tools/tqdatetime.cpp    \
 		  ../tools/qfile.cpp	    \
 		  ../tools/qdir.cpp	    \
 		  ../tools/qfileinfo.cpp    \
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 0d675fbc7..eb5cb1320 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -60,7 +60,7 @@ void yyerror( const char *msg );
 
 #include "qplatformdefs.h"
 #include "ntqasciidict.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqdict.h"
 #include "ntqfile.h"
 #include "ntqdir.h"
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index d070c4230..bde5c9f53 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -73,7 +73,7 @@ void yyerror( const char *msg );
 
 #include "qplatformdefs.h"
 #include "ntqasciidict.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqdict.h"
 #include "ntqfile.h"
 #include "ntqdir.h"
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index dc641569a..69fb60f52 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -64,11 +64,11 @@
 
 #ifndef TQT_NO_DNS
 
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqdict.h"
 #include "tqptrlist.h"
 #include "tqstring.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqapplication.h"
 #include "tqptrvector.h"
 #include "tqstrlist.h"
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 756f3ec09..9e9135113 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -48,7 +48,7 @@
 #include "ntqurloperator.h"
 #include "tqstringlist.h"
 #include "ntqregexp.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqfileinfo.h"
 #include "tqptrdict.h" // binary compatibility
 
diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp
index b37d4789d..0d8b83fb1 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/qhttp.cpp
@@ -50,7 +50,7 @@
 #include "ntqcstring.h"
 #include "ntqbuffer.h"
 #include "ntqurloperator.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "private/qinternal_p.h"
 
 //#define TQHTTP_DEBUG
diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp
index 687c13f90..17050c9c1 100644
--- a/src/network/qsocket.cpp
+++ b/src/network/qsocket.cpp
@@ -41,7 +41,7 @@
 #include "ntqsocket.h"
 #ifndef TQT_NO_NETWORK
 #include "tqptrlist.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqsocketdevice.h"
 #include "ntqdns.h"
 #include "private/qinternal_p.h"
diff --git a/src/sql/drivers/cache/tqsqlcachedresult.cpp b/src/sql/drivers/cache/tqsqlcachedresult.cpp
index 6b0b77e35..709e61944 100644
--- a/src/sql/drivers/cache/tqsqlcachedresult.cpp
+++ b/src/sql/drivers/cache/tqsqlcachedresult.cpp
@@ -38,7 +38,7 @@
 **********************************************************************/
 
 #include "tqsqlcachedresult.h"
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 
 #ifndef TQT_NO_SQL
 static const uint initial_cache_size = 128;
diff --git a/src/sql/drivers/ibase/tqsql_ibase.cpp b/src/sql/drivers/ibase/tqsql_ibase.cpp
index e96d15b6a..425d0e311 100644
--- a/src/sql/drivers/ibase/tqsql_ibase.cpp
+++ b/src/sql/drivers/ibase/tqsql_ibase.cpp
@@ -14,7 +14,7 @@
 
 #include "tqsql_ibase.h"
 
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #include <private/tqsqlextension_p.h>
 
 #include <ibase.h>
diff --git a/src/sql/drivers/mysql/tqsql_mysql.cpp b/src/sql/drivers/mysql/tqsql_mysql.cpp
index d91720e80..603a5b960 100644
--- a/src/sql/drivers/mysql/tqsql_mysql.cpp
+++ b/src/sql/drivers/mysql/tqsql_mysql.cpp
@@ -41,7 +41,7 @@
 #include "tqsql_mysql.h"
 #include <private/tqsqlextension_p.h>
 
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #include <tqvaluevector.h>
 #include <tqsqlrecord.h>
 
diff --git a/src/sql/drivers/odbc/tqsql_odbc.cpp b/src/sql/drivers/odbc/tqsql_odbc.cpp
index 605948ca1..a9a3aa468 100644
--- a/src/sql/drivers/odbc/tqsql_odbc.cpp
+++ b/src/sql/drivers/odbc/tqsql_odbc.cpp
@@ -45,7 +45,7 @@
 #include <qt_windows.h>
 #include <ntqapplication.h>
 #endif
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #include <private/tqsqlextension_p.h>
 #include <private/qinternal_p.h>
 #include <stdlib.h>
diff --git a/src/sql/drivers/psql/tqsql_psql.cpp b/src/sql/drivers/psql/tqsql_psql.cpp
index 1ea64fb75..ecc63a635 100644
--- a/src/sql/drivers/psql/tqsql_psql.cpp
+++ b/src/sql/drivers/psql/tqsql_psql.cpp
@@ -46,7 +46,7 @@
 #include <ntqpointarray.h>
 #include <tqsqlrecord.h>
 #include <ntqregexp.h>
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 // PostgreSQL header <utils/elog.h> included by <postgres.h> redefines DEBUG.
 #if defined(DEBUG)
 # undef DEBUG
diff --git a/src/sql/drivers/sqlite/tqsql_sqlite.cpp b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
index 4b7191bb4..8ec7425cd 100644
--- a/src/sql/drivers/sqlite/tqsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
@@ -14,7 +14,7 @@
 
 #include "tqsql_sqlite.h"
 
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #include <ntqregexp.h>
 #include <ntqfile.h>
 #include <tqptrvector.h>
diff --git a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
index ec577c873..8eef4a3ac 100644
--- a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
+++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
@@ -14,7 +14,7 @@
 
 #include "tqsql_sqlite3.h"
 
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #include <tqvaluevector.h>
 #include <ntqregexp.h>
 #include <ntqfile.h>
diff --git a/src/sql/tqdatatable.cpp b/src/sql/tqdatatable.cpp
index bb81ff6c1..c62b607f8 100644
--- a/src/sql/tqdatatable.cpp
+++ b/src/sql/tqdatatable.cpp
@@ -51,9 +51,9 @@
 #include "ntqpopupmenu.h"
 #include "tqvaluelist.h"
 #include "tqsqlmanager_p.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqcursor.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 
 //#define QT_DEBUG_DATATABLE
 
diff --git a/src/sql/tqeditorfactory.cpp b/src/sql/tqeditorfactory.cpp
index 918f5f32f..7893a1355 100644
--- a/src/sql/tqeditorfactory.cpp
+++ b/src/sql/tqeditorfactory.cpp
@@ -45,7 +45,7 @@
 #include "ntqcombobox.h"
 
 #include "tqeditorfactory.h"
-#include "ntqdatetimeedit.h"
+#include "tqdatetimeedit.h"
 
 #ifndef TQT_NO_SQL_EDIT_WIDGETS
 
diff --git a/src/sql/tqsqlcursor.cpp b/src/sql/tqsqlcursor.cpp
index 858a3668a..55f9c9a38 100644
--- a/src/sql/tqsqlcursor.cpp
+++ b/src/sql/tqsqlcursor.cpp
@@ -44,7 +44,7 @@
 
 #include "tqsqldriver.h"
 #include "tqsqlresult.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "tqsqldatabase.h"
 #include "tqsql.h"
 
diff --git a/src/sql/tqsqldriver.cpp b/src/sql/tqsqldriver.cpp
index f24fedf47..d688b9a46 100644
--- a/src/sql/tqsqldriver.cpp
+++ b/src/sql/tqsqldriver.cpp
@@ -42,7 +42,7 @@
 
 #ifndef TQT_NO_SQL
 
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "tqsqlextension_p.h"
 
 // database states
diff --git a/src/sql/tqsqleditorfactory.cpp b/src/sql/tqsqleditorfactory.cpp
index f7ac2d9e8..6be4a2d36 100644
--- a/src/sql/tqsqleditorfactory.cpp
+++ b/src/sql/tqsqleditorfactory.cpp
@@ -48,7 +48,7 @@
 #include "ntqlineedit.h"
 #include "ntqspinbox.h"
 #include "ntqcombobox.h"
-#include "ntqdatetimeedit.h"
+#include "tqdatetimeedit.h"
 
 /*!
     \class TQSqlEditorFactory tqsqleditorfactory.h
diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp
index 31f6dd0bd..c696dbaf2 100644
--- a/src/table/qtable.cpp
+++ b/src/table/qtable.cpp
@@ -52,7 +52,7 @@
 #include <ntqlineedit.h>
 #include <ntqcursor.h>
 #include <ntqapplication.h>
-#include <ntqtimer.h>
+#include <tqtimer.h>
 #include <tqobjectlist.h>
 #include <tqiconset.h>
 #include <ntqcombobox.h>
diff --git a/src/tools/ntqfileinfo.h b/src/tools/ntqfileinfo.h
index eab7f63d1..3c4e3b3a3 100644
--- a/src/tools/ntqfileinfo.h
+++ b/src/tools/ntqfileinfo.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "ntqfile.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #endif // QT_H
 
 
diff --git a/src/tools/ntqsettings.h b/src/tools/ntqsettings.h
index f5804e89f..ee8e8e3b2 100644
--- a/src/tools/ntqsettings.h
+++ b/src/tools/ntqsettings.h
@@ -42,7 +42,7 @@
 #define TQSETTINGS_H
 
 #ifndef QT_H
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "tqstringlist.h"
 #endif // QT_H
 
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index 20366db9a..27ffbb8ce 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -42,7 +42,7 @@
 #include <ntqapplication.h>
 #include <ntqsettings.h>
 #include <ntqfileinfo.h>
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #include <ntqcleanuphandler.h>
 #ifndef NO_ERRNO_H
 #include <errno.h>
diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt
index 6751ce41d..765061ff2 100644
--- a/src/tools/qfeatures.txt
+++ b/src/tools/qfeatures.txt
@@ -170,7 +170,7 @@ SeeAlso: ???
 Feature: DATESTRING
 Section: Data structures
 Requires:
-Name: QDate/QTime/QDateTime toString() and fromString()
+Name: TQDate/TQTime/TQDateTime toString() and fromString()
 SeeAlso: ???
 
 Feature: ICONSET
@@ -1048,7 +1048,7 @@ SeeAlso: ???
 Feature: DATETIMEEDIT
 Section: Widgets
 Requires: RICHTEXT SPINWIDGET DATESTRING
-Name: QDateTimeEdit
+Name: TQDateTimeEdit
 SeeAlso: ???
 
 Feature: TEXTCODECPLUGIN
diff --git a/src/tools/qfileinfo.cpp b/src/tools/qfileinfo.cpp
index 9ef1462cd..f5e85119b 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/qfileinfo.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 
 #include "ntqfileinfo.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqdir.h"
 #include "qfiledefs_p.h"
 #include "ntqdeepcopy.h"
diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/qfileinfo_unix.cpp
index 0a2036053..159b43ae2 100644
--- a/src/tools/qfileinfo_unix.cpp
+++ b/src/tools/qfileinfo_unix.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 #include "ntqfileinfo.h"
 #include "qfiledefs_p.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqdir.h"
 
 #include <limits.h>
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index 21d433d71..910580f7a 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 
 #include "ntqasciidict.h"
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 #include <limits.h>
 #include <stdio.h>
 #include <limits.h>
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 54cfd4414..b57e00435 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -13,7 +13,7 @@ tools {
 		  $$TOOLS_P/qcomlibrary_p.h \
 		  $$TOOLS_H/ntqcstring.h \
 		  $$TOOLS_H/ntqdatastream.h \
-		  $$TOOLS_H/ntqdatetime.h \
+		  $$TOOLS_H/tqdatetime.h \
 		  $$TOOLS_H/ntqdeepcopy.h \
 		  $$TOOLS_H/ntqdict.h \
 		  $$TOOLS_H/ntqdir.h \
@@ -112,7 +112,7 @@ tools {
 		  $$TOOLS_CPP/qcomlibrary.cpp \
 		  $$TOOLS_CPP/qcstring.cpp \
 		  $$TOOLS_CPP/qdatastream.cpp \
-		  $$TOOLS_CPP/qdatetime.cpp \
+		  $$TOOLS_CPP/tqdatetime.cpp \
 		  $$TOOLS_CPP/qdeepcopy.cpp \
 		  $$TOOLS_CPP/qdir.cpp \
 		  $$TOOLS_CPP/qfile.cpp \
diff --git a/src/tools/quuid.cpp b/src/tools/quuid.cpp
index 15e3b3c6e..34b6e3db7 100644
--- a/src/tools/quuid.cpp
+++ b/src/tools/quuid.cpp
@@ -401,7 +401,7 @@ TQUuid TQUuid::createUuid()
     return TQUuid(uuid_string);
 }
 #else // !Q_OS_LINUX
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "stdlib.h" // For srand/rand
 TQUuid TQUuid::createUuid()
 {
diff --git a/src/tools/qdatetime.cpp b/src/tools/tqdatetime.cpp
index 51f0e51de..d6f212a12 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/tqdatetime.cpp
@@ -40,7 +40,7 @@
 
 #include "qplatformdefs.h"
 
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqdatastream.h"
 #include "ntqregexp.h"
 
@@ -202,7 +202,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa
  *****************************************************************************/
 
 /*!
-    \class TQDate ntqdatetime.h
+    \class TQDate tqdatetime.h
     \reentrant
     \brief The TQDate class provides date functions.
 
@@ -1240,7 +1240,7 @@ void TQDate::julianToGregorian( uint jd, int &y, int &m, int &d )
  *****************************************************************************/
 
 /*!
-    \class TQTime ntqdatetime.h
+    \class TQTime tqdatetime.h
     \reentrant
 
     \brief The TQTime class provides clock time functions.
@@ -1862,7 +1862,7 @@ int TQTime::elapsed() const
  *****************************************************************************/
 
 /*!
-    \class TQDateTime ntqdatetime.h
+    \class TQDateTime tqdatetime.h
     \reentrant
     \brief The TQDateTime class provides date and time functions.
 
diff --git a/src/tools/ntqdatetime.h b/src/tools/tqdatetime.h
index 545f1f56b..545f1f56b 100644
--- a/src/tools/ntqdatetime.h
+++ b/src/tools/tqdatetime.h
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index 3b91b18fb..6eeb59f05 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -43,7 +43,7 @@
 #include "ntqbuttongroup.h"
 #include "ntqbitmap.h"
 #include "ntqpainter.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqaccel.h"
 #include "ntqpixmapcache.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index e8c1e28e0..47dfb959f 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -46,7 +46,7 @@
 #include "ntqdrawutil.h"
 #include "tqstrlist.h"
 #include "ntqpixmap.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqapplication.h"
 #include "ntqlineedit.h"
 #include "ntqbitmap.h"
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index bfcd8dba7..77155540e 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -51,7 +51,7 @@
 #include "ntqtoolbar.h"
 #include "ntqlayout.h"
 #include "ntqmainwindow.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqtooltip.h"
 #include "ntqguardedptr.h"
 #include "ntqcursor.h"
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index 07dee3f56..e81144261 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -44,8 +44,8 @@
 #include "qeffects_p.h"
 #include "ntqpixmap.h"
 #include "tqimage.h"
-#include "ntqtimer.h"
-#include "ntqdatetime.h"
+#include "tqtimer.h"
+#include "tqdatetime.h"
 #include "ntqguardedptr.h"
 #include "ntqscrollview.h"
 
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index f03b57cb9..87a63e7fc 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -54,7 +54,7 @@
 #include "ntqapplication.h"
 #include "ntqvalidator.h"
 #include "ntqdragobject.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqpopupmenu.h"
 #include "tqstringlist.h"
 #include "ntqguardedptr.h"
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index 48ee6dc19..d18381f8e 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -53,7 +53,7 @@
 #include "ntqpixmap.h"
 #include "ntqapplication.h"
 #include "tqptrdict.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "tqstringlist.h"
 #include "tqstyle.h"
 #include "ntqpopupmenu.h"
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index ac2369637..14fcb6735 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqlistview.h"
 #ifndef TQT_NO_LISTVIEW
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqheader.h"
 #include "ntqpainter.h"
 #include "ntqcursor.h"
@@ -49,7 +49,7 @@
 #include "tqstrlist.h"
 #include "ntqapplication.h"
 #include "ntqbitmap.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "tqptrdict.h"
 #include "tqptrvector.h"
 #include "tqiconset.h"
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index 0048f566b..1f33829f7 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -41,7 +41,7 @@
 #include "ntqmainwindow.h"
 #ifndef TQT_NO_MAINWINDOW
 
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqlayout.h"
 #include "tqobjectlist.h"
 #include "ntqintdict.h"
@@ -56,7 +56,7 @@
 #include "ntqstatusbar.h"
 #include "ntqscrollview.h"
 #include "ntqtooltip.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqwhatsthis.h"
 #include "ntqbitmap.h"
 #include "ntqdockarea.h"
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index fa25ebbac..2a99c223d 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -54,7 +54,7 @@
 #include "ntqcleanuphandler.h"
 #include "../kernel/qinternal_p.h"
 #include "tqstyle.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "ntqaccessible.h"
 #endif
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp
index 09fe86a66..6ce84317b 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/qmultilineedit.cpp
@@ -49,7 +49,7 @@
 #include "ntqapplication.h"
 #include "ntqdragobject.h"
 #include "ntqpopupmenu.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqdict.h"
 #include "../kernel/qrichtext_p.h"
 
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index d2926d42a..6827f1b4d 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -47,15 +47,15 @@
 #include "ntqapplication.h"
 #include "ntqpixmap.h"
 #include "ntqpixmapcache.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqwhatsthis.h"
 #include "tqobjectlist.h"
 #include "ntqguardedptr.h"
 #include "qeffects_p.h"
 #include "ntqcursor.h"
 #include "tqstyle.h"
-#include "ntqtimer.h"
-#include "ntqdatetime.h"
+#include "tqtimer.h"
+#include "tqdatetime.h"
 #if defined(QT_ACCESSIBILITY_SUPPORT)
 #include "ntqaccessible.h"
 #endif
diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp
index d38607085..2ac1e377b 100644
--- a/src/widgets/qscrollbar.cpp
+++ b/src/widgets/qscrollbar.cpp
@@ -43,7 +43,7 @@
 #include "ntqpainter.h"
 #include "ntqbitmap.h"
 #include "ntqapplication.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "tqstyle.h"
 #ifndef TQT_NO_CURSOR
 #include <ntqcursor.h>
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index e6f459cbd..a07a3cce5 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -49,7 +49,7 @@
 #include "ntqscrollview.h"
 #include "tqptrdict.h"
 #include "ntqapplication.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "tqstyle.h"
 #include "ntqlistview.h"
 #ifdef TQ_WS_MAC
diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp
index f77fc4d42..4600ff826 100644
--- a/src/widgets/qslider.cpp
+++ b/src/widgets/qslider.cpp
@@ -42,7 +42,7 @@
 #ifndef TQT_NO_SLIDER
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqbitmap.h"
 #include "ntqapplication.h"
 #include "tqstyle.h"
diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/qspinwidget.cpp
index 6086ce11a..e2d67796d 100644
--- a/src/widgets/qspinwidget.cpp
+++ b/src/widgets/qspinwidget.cpp
@@ -41,7 +41,7 @@
 #ifndef TQT_NO_SPINWIDGET
 
 #include "ntqrect.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "tqstyle.h"
 #include "ntqpainter.h"
 
diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp
index b5c8b9cab..c7f357e3b 100644
--- a/src/widgets/qstatusbar.cpp
+++ b/src/widgets/qstatusbar.cpp
@@ -44,7 +44,7 @@
 #include "tqptrlist.h"
 #include "ntqlayout.h"
 #include "ntqpainter.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqdrawutil.h"
 #include "tqstyle.h"
 #include "ntqsizegrip.h"
diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp
index 8cd8ba2a8..d9fececf1 100644
--- a/src/widgets/qsyntaxhighlighter.cpp
+++ b/src/widgets/qsyntaxhighlighter.cpp
@@ -44,7 +44,7 @@
 #ifndef TQT_NO_SYNTAXHIGHLIGHTER
 #include "../kernel/qrichtext_p.h"
 #include "tqtextedit.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 
 /*!
     \class TQSyntaxHighlighter ntqsyntaxhighlighter.h
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 08b852de5..a74eb7483 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -58,7 +58,7 @@ widgets {
 		  $$WIDGETS_H/ntqwhatsthis.h \
 		  $$WIDGETS_H/tqwidgetstack.h \
 		  $$WIDGETS_H/ntqaction.h \
-		  $$WIDGETS_H/ntqdatetimeedit.h \
+		  $$WIDGETS_H/tqdatetimeedit.h \
 		  $$WIDGETS_H/tqtextview.h \
 		  $$WIDGETS_H/tqtextbrowser.h \
 		  $$WIDGETS_H/tqtextedit.h \
@@ -120,7 +120,7 @@ widgets {
 		  $$WIDGETS_CPP/qwhatsthis.cpp \
 		  $$WIDGETS_CPP/tqwidgetstack.cpp \
 		  $$WIDGETS_CPP/qaction.cpp \
-		  $$WIDGETS_CPP/qdatetimeedit.cpp \
+		  $$WIDGETS_CPP/tqdatetimeedit.cpp \
 		  $$WIDGETS_CPP/qeffects.cpp \
 		  $$WIDGETS_CPP/tqtextview.cpp \
 		  $$WIDGETS_CPP/tqtextbrowser.cpp \
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index c14e2a82a..553811d27 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -47,11 +47,11 @@
 #include <ntqcursor.h>
 #include "ntqapplication.h"
 #include "tqstyle.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "private/qapplication_p.h"
 #include "ntqtooltip.h"
 #include "tqimage.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqpainter.h"
 #include "tqstyle.h"
 #include "private/qinternal_p.h"
diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp
index 08c57b58d..20eba04d4 100644
--- a/src/widgets/qtoolbar.cpp
+++ b/src/widgets/qtoolbar.cpp
@@ -52,7 +52,7 @@
 #include "ntqtoolbutton.h"
 #include "ntqpopupmenu.h"
 #include "ntqcombobox.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "tqwidgetlist.h"
 #include "tqstyle.h"
 
diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp
index c426a5d68..c366dfbcb 100644
--- a/src/widgets/qtoolbox.cpp
+++ b/src/widgets/qtoolbox.cpp
@@ -54,7 +54,7 @@
 #include <tqvaluelist.h>
 #include <ntqtooltip.h>
 #include <ntqeventloop.h>
-#include <ntqdatetime.h>
+#include <tqdatetime.h>
 
 class TQToolBoxButton : public TQButton
 {
diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp
index 4b9145d4f..bfaaf47fa 100644
--- a/src/widgets/qtoolbutton.cpp
+++ b/src/widgets/qtoolbutton.cpp
@@ -52,7 +52,7 @@
 #include "ntqtoolbar.h"
 #include "tqimage.h"
 #include "tqiconset.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqpopupmenu.h"
 #include "ntqguardedptr.h"
 
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index a9f9624f5..c897c4a58 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -42,7 +42,7 @@
 #include "tqptrdict.h"
 #include "ntqapplication.h"
 #include "ntqguardedptr.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "qeffects_p.h"
 
 static bool globally_enabled = TRUE;
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index b7bc0b15b..64de3654c 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -42,7 +42,7 @@
 #include "ntqpaintdevicemetrics.h"
 #include "ntqpixmap.h"
 #include "ntqpainter.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "tqptrdict.h"
 #include "ntqtoolbutton.h"
 #include "ntqshared.h"
diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/tqdatetimeedit.cpp
index ce74b33a1..0d21eee75 100644
--- a/src/widgets/qdatetimeedit.cpp
+++ b/src/widgets/tqdatetimeedit.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqdatetimeedit.h"
+#include "tqdatetimeedit.h"
 
 #ifndef TQT_NO_DATETIMEEDIT
 
@@ -845,7 +845,7 @@ public:
 
 
 /*!
-    \class TQDateEdit ntqdatetimeedit.h
+    \class TQDateEdit tqdatetimeedit.h
     \brief The TQDateEdit class provides a date editor.
 
     \ingroup advanced
@@ -1781,7 +1781,7 @@ public:
 };
 
 /*!
-    \class TQTimeEdit ntqdatetimeedit.h
+    \class TQTimeEdit tqdatetimeedit.h
     \brief The TQTimeEdit class provides a time editor.
 
     \ingroup advanced
@@ -2600,7 +2600,7 @@ public:
 };
 
 /*!
-    \class TQDateTimeEdit ntqdatetimeedit.h
+    \class TQDateTimeEdit tqdatetimeedit.h
     \brief The TQDateTimeEdit class combines a TQDateEdit and TQTimeEdit
     widget into a single widget for editing datetimes.
 
@@ -2837,6 +2837,6 @@ bool TQDateTimeEdit::autoAdvance() const
     datetime.
 */
 
-#include "qdatetimeedit.moc"
+#include "tqdatetimeedit.moc"
 
 #endif
diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/tqdatetimeedit.h
index f125c673a..334e24d56 100644
--- a/src/widgets/ntqdatetimeedit.h
+++ b/src/widgets/tqdatetimeedit.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqwidget.h"
 #include "tqstring.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #endif // QT_H
 
 #ifndef TQT_NO_DATETIMEEDIT
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index 292086428..2a76b53d6 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -56,7 +56,7 @@
 #include "tqimage.h"
 #include "ntqpen.h"
 #include "ntqbrush.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqcursor.h"
 #include "ntqapplication.h"
 #include "tqtextedit.h"
diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp
index dfafb32c8..d28543409 100644
--- a/src/widgets/tqtextbrowser.cpp
+++ b/src/widgets/tqtextbrowser.cpp
@@ -52,7 +52,7 @@
 #include "tqtextstream.h"
 #include "ntqlayout.h"
 #include "ntqbitmap.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "tqimage.h"
 #include "ntqsimplerichtext.h"
 #include "ntqdragobject.h"
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 33307e4b8..6d48be52b 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -57,7 +57,7 @@
 #include "tqstyle.h"
 #include "ntqsize.h"
 #include "ntqevent.h"
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqapplication.h"
 #include "ntqlistbox.h"
 #include "ntqvbox.h"
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index e7f8381d1..d267177c8 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -55,7 +55,7 @@
 #include "tqiconset.h"
 #include "../widgets/tqwidgetresizehandler_p.h"
 #include "ntqfocusdata.h"
-#include "ntqdatetime.h"
+#include "tqdatetime.h"
 #include "ntqtooltip.h"
 #include "ntqwmatrix.h"
 #include "tqimage.h"
@@ -64,7 +64,7 @@
 #include "ntqbitmap.h"
 
 // magic non-mdi things
-#include "ntqtimer.h"
+#include "tqtimer.h"
 #include "ntqdockarea.h"
 #include "ntqstatusbar.h"
 #include "ntqmainwindow.h"