Rename remaining ntq[i-l]* related files to equivalent tq*

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

50 files changed, 78 insertions, 78 deletions

diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index 16c964f58..9096ff9f6 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -62,7 +62,7 @@
 #include "tqstring.h"
 #include "tqregexp.h"
 #if !defined(TQT_NO_CUPS) || !defined(TQT_NO_NIS)
-#include "ntqlibrary.h"
+#include "tqlibrary.h"
 #endif
 
 #ifndef TQT_NO_NIS
diff --git a/src/dialogs/qt_dialogs.pri b/src/dialogs/qt_dialogs.pri
index 4957a1e70..9702afad1 100644
--- a/src/dialogs/qt_dialogs.pri
+++ b/src/dialogs/qt_dialogs.pri
@@ -12,7 +12,7 @@ dialogs {
 		  $$DIALOGS_H/tqprogressdialog.h \
 		  $$DIALOGS_H/tqtabdialog.h \
 		  $$DIALOGS_H/tqwizard.h \
-		  $$DIALOGS_H/ntqinputdialog.h
+		  $$DIALOGS_H/tqinputdialog.h
 
         !embedded:mac:SOURCES  += $$DIALOGS_CPP/tqfiledialog_mac.cpp $$DIALOGS_CPP/tqcolordialog_mac.cpp
 	win32:SOURCES += $$DIALOGS_CPP/tqfiledialog_win.cpp
@@ -28,5 +28,5 @@ dialogs {
 		  $$DIALOGS_CPP/tqprogressdialog.cpp \
 		  $$DIALOGS_CPP/tqtabdialog.cpp \
 		  $$DIALOGS_CPP/tqwizard.cpp \
-		  $$DIALOGS_CPP/qinputdialog.cpp
+		  $$DIALOGS_CPP/tqinputdialog.cpp
 }
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index 6eb5006a6..77de59b62 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -70,7 +70,7 @@
 #include "tqheader.h"
 #include "tqlabel.h"
 #include "tqlayout.h"
-#include "ntqlibrary.h"
+#include "tqlibrary.h"
 #include "tqlineedit.h"
 #include "tqlistbox.h"
 #include "tqlistview.h"
diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/tqinputdialog.cpp
index a459846df..b23bbaeaf 100644
--- a/src/dialogs/qinputdialog.cpp
+++ b/src/dialogs/tqinputdialog.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqinputdialog.h"
+#include "tqinputdialog.h"
 
 #ifndef TQT_NO_INPUTDIALOG
 
diff --git a/src/dialogs/ntqinputdialog.h b/src/dialogs/tqinputdialog.h
index 67434b3ae..67434b3ae 100644
--- a/src/dialogs/ntqinputdialog.h
+++ b/src/dialogs/tqinputdialog.h
diff --git a/src/inputmethod/qt_inputmethod.pri b/src/inputmethod/qt_inputmethod.pri
index b4f719350..59ccd37c5 100644
--- a/src/inputmethod/qt_inputmethod.pri
+++ b/src/inputmethod/qt_inputmethod.pri
@@ -2,9 +2,9 @@
 
 inputmethod {
 	INPUTMETHOD_P = inputmethod
-	HEADERS +=$$INPUTMETHOD_H/ntqinputcontextfactory.h \
-		  $$INPUTMETHOD_P/qinputcontextinterface_p.h \
-		  $$INPUTMETHOD_H/ntqinputcontextplugin.h
-	SOURCES +=$$INPUTMETHOD_CPP/qinputcontextfactory.cpp \
-		  $$INPUTMETHOD_CPP/qinputcontextplugin.cpp
+	HEADERS +=$$INPUTMETHOD_H/tqinputcontextfactory.h \
+		  $$INPUTMETHOD_P/tqinputcontextinterface_p.h \
+		  $$INPUTMETHOD_H/tqinputcontextplugin.h
+	SOURCES +=$$INPUTMETHOD_CPP/tqinputcontextfactory.cpp \
+		  $$INPUTMETHOD_CPP/tqinputcontextplugin.cpp
 }
diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/tqinputcontextfactory.cpp
index 63aff8375..95fc40766 100644
--- a/src/inputmethod/qinputcontextfactory.cpp
+++ b/src/inputmethod/tqinputcontextfactory.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: qinputcontextfactory.cpp,v 1.2 2004/06/20 18:43:11 daisuke Exp $
+** $Id: tqinputcontextfactory.cpp,v 1.2 2004/06/20 18:43:11 daisuke Exp $
 **
 ** Implementation of TQInputContextFactory class
 **
@@ -35,9 +35,9 @@
 **
 **********************************************************************/
 
-#include "qinputcontextinterface_p.h" // up here for GCC 2.7.* compatibility
-#include "ntqinputcontextfactory.h"
-#include "ntqinputcontext.h"
+#include "tqinputcontextinterface_p.h" // up here for GCC 2.7.* compatibility
+#include "tqinputcontextfactory.h"
+#include "tqinputcontext.h"
 
 #ifndef TQT_NO_IM
 
diff --git a/src/inputmethod/ntqinputcontextfactory.h b/src/inputmethod/tqinputcontextfactory.h
index ddebf25b8..84c3cae85 100644
--- a/src/inputmethod/ntqinputcontextfactory.h
+++ b/src/inputmethod/tqinputcontextfactory.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: ntqinputcontextfactory.h,v 1.1.1.1 2004/05/11 11:16:49 daisuke Exp $
+** $Id: tqinputcontextfactory.h,v 1.1.1.1 2004/05/11 11:16:49 daisuke Exp $
 **
 ** Definition of TQInputContextFactory class
 **
diff --git a/src/inputmethod/qinputcontextinterface_p.h b/src/inputmethod/tqinputcontextinterface_p.h
index d42f81c50..195be7fe9 100644
--- a/src/inputmethod/qinputcontextinterface_p.h
+++ b/src/inputmethod/tqinputcontextinterface_p.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: qinputcontextinterface_p.h,v 1.2 2004/06/20 18:43:11 daisuke Exp $
+** $Id: tqinputcontextinterface_p.h,v 1.2 2004/06/20 18:43:11 daisuke Exp $
 **
 ** ...
 **
diff --git a/src/inputmethod/qinputcontextplugin.cpp b/src/inputmethod/tqinputcontextplugin.cpp
index 1e2a6701e..7acdc9300 100644
--- a/src/inputmethod/qinputcontextplugin.cpp
+++ b/src/inputmethod/tqinputcontextplugin.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: qinputcontextplugin.cpp,v 1.2 2004/06/20 18:43:11 daisuke Exp $
+** $Id: tqinputcontextplugin.cpp,v 1.2 2004/06/20 18:43:11 daisuke Exp $
 **
 ** Implementation of TQInputContextPlugin class
 **
@@ -35,15 +35,15 @@
 **
 **********************************************************************/
 
-#include "ntqinputcontextplugin.h"
+#include "tqinputcontextplugin.h"
 
 #ifndef TQT_NO_IM
 #ifndef TQT_NO_COMPONENT
 
-#include "qinputcontextinterface_p.h"
+#include "tqinputcontextinterface_p.h"
 
 /*!
-    \class TQInputContextPlugin ntqinputcontextplugin.h
+    \class TQInputContextPlugin tqinputcontextplugin.h
     \brief The TQInputContextPlugin class provides an abstract base for custom TQInputContext plugins.
     \reentrant
     \ingroup plugins
diff --git a/src/inputmethod/ntqinputcontextplugin.h b/src/inputmethod/tqinputcontextplugin.h
index a67d0b26a..bacea5968 100644
--- a/src/inputmethod/ntqinputcontextplugin.h
+++ b/src/inputmethod/tqinputcontextplugin.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: ntqinputcontextplugin.h,v 1.2 2004/06/20 18:43:11 daisuke Exp $
+** $Id: tqinputcontextplugin.h,v 1.2 2004/06/20 18:43:11 daisuke Exp $
 **
 ** Definition of TQInputContextPlugin class
 **
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index c6bdd1b0d..f5ec7dd1d 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -335,7 +335,7 @@ public:
     };
 #endif
 
-    // documented in qkeysequence.cpp
+    // documented in tqkeysequence.cpp
     enum SequenceMatch {
 	NoMatch,
 	PartialMatch,
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index e04574828..0a1ffc22b 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -28,7 +28,7 @@
 #include "tqstring.h"
 #include "tqptrlist.h"
 #include "tqiodevice.h"
-#include "ntqkeysequence.h"
+#include "tqkeysequence.h"
 #include "ntqwindowdefs.h"
 #include "tqgdict.h"
 #include "tqfont.h"
@@ -114,13 +114,13 @@
 #include "tqpicture.h"
 #include <tqjiscodec.h>
 #include <tqeucjpcodec.h>
-#include <ntqkeycode.h>
+#include <tqkeycode.h>
 #include <tqaccel.h>
 #include "tqlabel.h"
 #include "tqlayout.h"
 #include <tqlcdnumber.h>
-#include <ntqlibrary.h>
-#include <ntqinputdialog.h>
+#include <tqlibrary.h>
+#include <tqinputdialog.h>
 #include "tqscrollbar.h"
 #include "tqscrollview.h"
 #include "tqdir.h"
@@ -302,7 +302,7 @@
 #include "private/tqdialogbuttons_p.h"
 #include "private/tqwidgetinterface_p.h"
 #include "private/tqwidgetresizehandler_p.h"
-#include "private/qlibrary_p.h"
+#include "private/tqlibrary_p.h"
 #endif // Private headers
 
 
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index a4fded7f0..8f04514cf 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -61,7 +61,7 @@
 #include "tqdir.h"
 #include "tqfileinfo.h"
 #ifdef TQ_WS_WIN
-#include "qinputcontext_p.h"
+#include "tqinputcontext_p.h"
 #endif
 #include "tqfontdata_p.h"
 
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index b611778d7..c1d8345b1 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -90,7 +90,7 @@
 
 // Input method stuff - UNFINISHED
 #ifndef TQT_NO_IM
-#include "ntqinputcontext.h"
+#include "tqinputcontext.h"
 #endif // TQT_NO_IM
 #include "qinternal_p.h" // shared double buffer cleanup
 
diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp
index 6c1190fb3..5d22fdf49 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/qscriptengine_x11.cpp
@@ -1900,7 +1900,7 @@ static void indic_attributes(int script, const TQString &text, int from, int len
 // --------------------------------------------------------------------------------------------------------------------------------------------
 
 #include <tqtextcodec.h>
-#include <ntqlibrary.h>
+#include <tqlibrary.h>
 
 
 static void thaiWordBreaks(const TQChar *string, const int len, TQCharAttributes *attributes)
diff --git a/src/kernel/qt_gfx.pri b/src/kernel/qt_gfx.pri
index c66f3141e..fadd1277f 100644
--- a/src/kernel/qt_gfx.pri
+++ b/src/kernel/qt_gfx.pri
@@ -39,8 +39,8 @@ mng {
 else:DEFINES += TQT_NO_IMAGEIO_MNG
 
 #jpeg support..
-HEADERS += $$KERNEL_H/ntqjpegio.h 
-SOURCES += $$KERNEL_CPP/qjpegio.cpp
+HEADERS += $$KERNEL_H/tqjpegio.h 
+SOURCES += $$KERNEL_CPP/tqjpegio.cpp
 jpeg {
         system-jpeg {
 	   unix:LIBS += -ljpeg
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index d52783f7c..03904d262 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -35,8 +35,8 @@ kernel {
 		  $$KERNEL_H/tqimage.h \
 		  $$KERNEL_P/tqimageformatinterface_p.h \
 		  $$KERNEL_H/tqimageformatplugin.h \
-		  $$KERNEL_H/ntqkeycode.h \
-		  $$KERNEL_H/ntqkeysequence.h \
+		  $$KERNEL_H/tqkeycode.h \
+		  $$KERNEL_H/tqkeysequence.h \
 		  $$KERNEL_H/tqlayout.h \
 		  $$KERNEL_P/tqlayoutengine_p.h \
 		  $$KERNEL_H/tqtranslator.h \
@@ -100,9 +100,9 @@ kernel {
 
 	inputmethod {
 		unix:x11 {
-			HEADERS += $$KERNEL_H/ntqinputcontext.h
+			HEADERS += $$KERNEL_H/tqinputcontext.h
 		} else {
-			HEADERS += $$KERNEL_P/qinputcontext_p.h
+			HEADERS += $$KERNEL_P/tqinputcontext_p.h
 		}
 	}
 
@@ -118,7 +118,7 @@ kernel {
 		  $$KERNEL_CPP/qdnd_win.cpp \
 		  $$KERNEL_CPP/tqeventloop_win.cpp \
 		  $$KERNEL_CPP/tqfont_win.cpp \
-		  $$KERNEL_CPP/qinputcontext_win.cpp \
+		  $$KERNEL_CPP/tqinputcontext_win.cpp \
 		  $$KERNEL_CPP/tqmime_win.cpp \
 		  $$KERNEL_CPP/tqpixmap_win.cpp \
 		  $$KERNEL_CPP/tqprinter_win.cpp \
@@ -140,8 +140,8 @@ kernel {
 			  $$KERNEL_CPP/qdnd_x11.cpp \
 			  $$KERNEL_CPP/tqdesktopwidget_x11.cpp \
 			  $$KERNEL_CPP/tqfont_x11.cpp \
-			  $$KERNEL_CPP/qinputcontext.cpp \
-			  $$KERNEL_CPP/qinputcontext_x11.cpp \
+			  $$KERNEL_CPP/tqinputcontext.cpp \
+			  $$KERNEL_CPP/tqinputcontext_x11.cpp \
 			  $$KERNEL_CPP/tqmotifdnd_x11.cpp \
 			  $$KERNEL_CPP/tqpixmap_x11.cpp \
 			  $$KERNEL_CPP/tqpaintdevice_x11.cpp \
@@ -217,7 +217,7 @@ kernel {
 		  $$KERNEL_CPP/tqiconset.cpp \
 		  $$KERNEL_CPP/tqimage.cpp \
 		  $$KERNEL_CPP/tqimageformatplugin.cpp \
-		  $$KERNEL_CPP/qkeysequence.cpp \
+		  $$KERNEL_CPP/tqkeysequence.cpp \
 		  $$KERNEL_CPP/tqlayout.cpp \
 		  $$KERNEL_CPP/tqlayoutengine.cpp \
 		  $$KERNEL_CPP/tqtranslator.cpp \
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index ac94aea12..8f5768696 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -63,7 +63,7 @@
 #include "tqsizepolicy.h"
 #include "ntqshared.h"
 #include "tqbitarray.h"
-#include "ntqkeysequence.h"
+#include "tqkeysequence.h"
 #include "tqpen.h"
 
 #ifndef DBL_DIG
diff --git a/src/kernel/tqaccel.h b/src/kernel/tqaccel.h
index 22c2f80e1..c883ba2ff 100644
--- a/src/kernel/tqaccel.h
+++ b/src/kernel/tqaccel.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqobject.h"
-#include "ntqkeysequence.h"
+#include "tqkeysequence.h"
 #endif // QT_H
 
 #ifndef TQT_NO_ACCEL
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index 6c1d1ffad..b71804321 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -48,7 +48,7 @@
 #include "tqasyncimageio.h"
 #include "tqpngio.h"
 #include "ntqmngio.h"
-#include "ntqjpegio.h"
+#include "tqjpegio.h"
 #include "tqmap.h"
 #include <private/qpluginmanager_p.h>
 #include "tqimageformatinterface_p.h"
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/tqinputcontext.cpp
index 8693da969..7d15aa0c7 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/tqinputcontext.cpp
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: qinputcontext.cpp,v 1.6 2004/06/22 06:47:30 daisuke Exp $
+** $Id: tqinputcontext.cpp,v 1.6 2004/06/22 06:47:30 daisuke Exp $
 **
 ** Implementation of TQInputContext class
 **
@@ -35,7 +35,7 @@
 
 //#define TQT_NO_IM_PREEDIT_RELOCATION
 
-#include "ntqinputcontext.h"
+#include "tqinputcontext.h"
 
 #ifndef TQT_NO_IM
 
@@ -93,7 +93,7 @@ public:
 
 // UPDATED COMMENT REQUIRED -- 2004-07-08 YamaKen
 /*!
-    \class TQInputContext ntqinputcontext.h
+    \class TQInputContext tqinputcontext.h
     \brief The TQInputContext class abstracts the input method dependent data and composing state.
 
     \ingroup i18n
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/tqinputcontext.h
index 426aa796a..06f72f206 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/tqinputcontext.h
@@ -1,5 +1,5 @@
 /****************************************************************************
-** $Id: ntqinputcontext.h,v 1.8 2004/06/22 06:47:30 daisuke Exp $
+** $Id: tqinputcontext.h,v 1.8 2004/06/22 06:47:30 daisuke Exp $
 **
 ** Definition of TQInputContext
 **
diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/tqinputcontext_p.h
index 37ba52b6c..37ba52b6c 100644
--- a/src/kernel/qinputcontext_p.h
+++ b/src/kernel/tqinputcontext_p.h
diff --git a/src/kernel/qinputcontext_x11.cpp b/src/kernel/tqinputcontext_x11.cpp
index 0a314dfbb..d0f8699b3 100644
--- a/src/kernel/qinputcontext_x11.cpp
+++ b/src/kernel/tqinputcontext_x11.cpp
@@ -36,7 +36,7 @@
 **
 **********************************************************************/
 
-#include "ntqinputcontext.h"
+#include "tqinputcontext.h"
 
 #ifndef TQT_NO_IM
 
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/tqjpegio.cpp
index 56b22fbbf..f76aad44d 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/tqjpegio.cpp
@@ -43,7 +43,7 @@
 #ifndef TQT_NO_IMAGEIO_JPEG
 
 #include "tqiodevice.h"
-#include "ntqjpegio.h"
+#include "tqjpegio.h"
 
 #include <stdio.h>      // jpeglib needs this to be pre-included
 #include <setjmp.h>
diff --git a/src/kernel/ntqjpegio.h b/src/kernel/tqjpegio.h
index 10ae8d7cf..10ae8d7cf 100644
--- a/src/kernel/ntqjpegio.h
+++ b/src/kernel/tqjpegio.h
diff --git a/src/kernel/ntqkeycode.h b/src/kernel/tqkeycode.h
index bca9305ba..bca9305ba 100644
--- a/src/kernel/ntqkeycode.h
+++ b/src/kernel/tqkeycode.h
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/tqkeysequence.cpp
index 8fd7485b8..94ba5cf53 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/tqkeysequence.cpp
@@ -38,7 +38,7 @@
 **
 **********************************************************************/
 
-#include "ntqkeysequence.h"
+#include "tqkeysequence.h"
 
 #ifndef TQT_NO_ACCEL
 
@@ -57,7 +57,7 @@
 #endif
 
 /*!
-    \class TQKeySequence ntqkeysequence.h
+    \class TQKeySequence tqkeysequence.h
     \brief The TQKeySequence class encapsulates a key sequence as used
     by accelerators.
 
diff --git a/src/kernel/ntqkeysequence.h b/src/kernel/tqkeysequence.h
index e4800839d..e4800839d 100644
--- a/src/kernel/ntqkeysequence.h
+++ b/src/kernel/tqkeysequence.h
diff --git a/src/kernel/tqttdeintegration_x11.cpp b/src/kernel/tqttdeintegration_x11.cpp
index 6bd89a390..0b8e794c2 100644
--- a/src/kernel/tqttdeintegration_x11.cpp
+++ b/src/kernel/tqttdeintegration_x11.cpp
@@ -6,7 +6,7 @@
 #include <tqcolordialog.h>
 #include <tqfiledialog.h>
 #include <tqfontdialog.h>
-#include <ntqlibrary.h>
+#include <tqlibrary.h>
 #include <tqregexp.h>
 #include <ntqmessagebox.h>
 #include <stdlib.h>
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index d0e37df41..4aa4a09ed 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -64,7 +64,7 @@
 #endif
 #if defined(TQ_WS_WIN)
 #include "qt_windows.h"
-#include "qinputcontext_p.h"
+#include "tqinputcontext_p.h"
 #endif
 #include "tqfontdata_p.h"
 
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index bccd0110b..b7136818f 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -66,8 +66,8 @@ bool qt_wstate_iconified( WId );
 void qt_updated_rootinfo();
 
 #ifndef TQT_NO_IM
-#include "ntqinputcontext.h"
-#include "ntqinputcontextfactory.h"
+#include "tqinputcontext.h"
+#include "tqinputcontextfactory.h"
 #endif
 
 // Paint event clipping magic
diff --git a/src/libqt.map b/src/libqt.map
index 81a903a16..1e75da0c0 100644
--- a/src/libqt.map
+++ b/src/libqt.map
@@ -43,7 +43,7 @@
 	TQFontDef::*;
 	TQFontStruct::*;
 	TQFont*Codec::*;
-	QInputContext::*
+	TQInputContext::*
   };
   TT_*;
   TTO_*;
diff --git a/src/opengl/tqgl_x11.cpp b/src/opengl/tqgl_x11.cpp
index e3fdfc504..cf82fe355 100644
--- a/src/opengl/tqgl_x11.cpp
+++ b/src/opengl/tqgl_x11.cpp
@@ -74,7 +74,7 @@ extern "C" {
 
 #include "tqgl_x11_p.h"
 #ifdef QT_DLOPEN_OPENGL
-#include "ntqlibrary.h"
+#include "tqlibrary.h"
 
 extern "C" {
 _glCallLists qt_glCallLists;
diff --git a/src/tools/qcomlibrary_p.h b/src/tools/qcomlibrary_p.h
index f738aff52..ede724194 100644
--- a/src/tools/qcomlibrary_p.h
+++ b/src/tools/qcomlibrary_p.h
@@ -53,7 +53,7 @@
 
 #ifndef QT_H
 #include "qcom_p.h"
-#include "ntqlibrary.h"
+#include "tqlibrary.h"
 #endif // QT_H
 
 #ifndef TQT_NO_COMPONENT
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index ba4e5dd79..03bf94e37 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -31,8 +31,8 @@ tools {
 		  $$TOOLS_H/tqintcache.h \
 		  $$TOOLS_H/tqintdict.h \
 		  $$TOOLS_H/tqiodevice.h \
-		  $$TOOLS_H/ntqlibrary.h \
-		  $$TOOLS_P/qlibrary_p.h \
+		  $$TOOLS_H/tqlibrary.h \
+		  $$TOOLS_P/tqlibrary_p.h \
 		  $$TOOLS_H/tqlocale.h \
 		  $$TOOLS_P/tqlocale_p.h \
 		  $$TOOLS_H/tqptrlist.h \
@@ -70,7 +70,7 @@ tools {
 	win32:SOURCES += $$TOOLS_CPP/tqdir_win.cpp \
 	 	  $$TOOLS_CPP/tqfile_win.cpp \
 		  $$TOOLS_CPP/tqfileinfo_win.cpp \
-		  $$TOOLS_CPP/qlibrary_win.cpp \
+		  $$TOOLS_CPP/tqlibrary_win.cpp \
 		  $$TOOLS_CPP/tqsettings_win.cpp \
 		  $$TOOLS_CPP/tqmutex_win.cpp \
 		  $$TOOLS_CPP/tqwaitcondition_win.cpp \
@@ -103,7 +103,7 @@ tools {
 		SOURCES+=3rdparty/dlcompat/dlfcn.c
 		INCLUDEPATH+=3rdparty/dlcompat
 	    }
-	unix:SOURCES += $$TOOLS_CPP/qlibrary_unix.cpp
+	unix:SOURCES += $$TOOLS_CPP/tqlibrary_unix.cpp
 
 	SOURCES += $$TOOLS_CPP/tqbitarray.cpp \
 		  $$TOOLS_CPP/tqbuffer.cpp \
@@ -124,7 +124,7 @@ tools {
 		  $$TOOLS_CPP/tqgpluginmanager.cpp \
 		  $$TOOLS_CPP/tqgvector.cpp \
 		  $$TOOLS_CPP/tqiodevice.cpp \
-		  $$TOOLS_CPP/qlibrary.cpp \
+		  $$TOOLS_CPP/tqlibrary.cpp \
 		  $$TOOLS_CPP/tqlocale.cpp \
 		  $$TOOLS_CPP/tqmap.cpp \
 		  $$TOOLS_CPP/tqmutexpool.cpp \
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 79c651b3c..d1a2bce22 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -17,7 +17,7 @@
 #include <tqcstring.h>
 #include <tqdict.h>
 #include <tqintdict.h>
-#include <ntqlibrary.h>
+#include <tqlibrary.h>
 #include <tqmap.h>
 #include <tqmemarray.h>
 #include <tqptrlist.h>
diff --git a/src/tools/tqfeatures.txt b/src/tools/tqfeatures.txt
index 5e7c9c267..ef466fd36 100644
--- a/src/tools/tqfeatures.txt
+++ b/src/tools/tqfeatures.txt
@@ -1030,7 +1030,7 @@ SeeAlso: ???
 Feature: INPUTDIALOG
 Section: Widgets
 Requires: DIALOG COMBOBOX LABEL PUSHBUTTON SPINBOX WIDGETSTACK LAYOUT
-Name: QInputDialog
+Name: TQInputDialog
 SeeAlso: ???
 
 Feature: ERRORMESSAGE
diff --git a/src/tools/tqgpluginmanager_p.h b/src/tools/tqgpluginmanager_p.h
index 069b7e27a..7b713990c 100644
--- a/src/tools/tqgpluginmanager_p.h
+++ b/src/tools/tqgpluginmanager_p.h
@@ -41,7 +41,7 @@
 
 #ifndef QT_H
 #include "tqdict.h"
-#include "ntqlibrary.h"
+#include "tqlibrary.h"
 #include "ntquuid.h"
 #include "tqstringlist.h"
 #include "qcom_p.h"
diff --git a/src/tools/qlibrary.cpp b/src/tools/tqlibrary.cpp
index 6b586fcdf..05ceee649 100644
--- a/src/tools/qlibrary.cpp
+++ b/src/tools/tqlibrary.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include <private/qlibrary_p.h>
+#include <private/tqlibrary_p.h>
 #include <tqstringlist.h>
 #include <tqfile.h>
 
@@ -69,7 +69,7 @@ TQLibraryPrivate::TQLibraryPrivate( TQLibrary *lib )
 
 
 /*!
-    \class TQLibrary ntqlibrary.h
+    \class TQLibrary tqlibrary.h
     \reentrant
     \brief The TQLibrary class provides a wrapper for handling shared libraries.
 
diff --git a/src/tools/ntqlibrary.h b/src/tools/tqlibrary.h
index d8b5f4ba5..d8b5f4ba5 100644
--- a/src/tools/ntqlibrary.h
+++ b/src/tools/tqlibrary.h
diff --git a/src/tools/qlibrary_p.h b/src/tools/tqlibrary_p.h
index 0a687b1ca..1ae03c601 100644
--- a/src/tools/qlibrary_p.h
+++ b/src/tools/tqlibrary_p.h
@@ -53,7 +53,7 @@
 //
 //
 
-#include "ntqlibrary.h"
+#include "tqlibrary.h"
 
 #ifndef TQT_NO_LIBRARY
 
diff --git a/src/tools/qlibrary_unix.cpp b/src/tools/tqlibrary_unix.cpp
index 8c08772ac..c541625d9 100644
--- a/src/tools/qlibrary_unix.cpp
+++ b/src/tools/tqlibrary_unix.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "qplatformdefs.h"
-#include "private/qlibrary_p.h"
+#include "private/tqlibrary_p.h"
 
 #ifndef TQT_NO_LIBRARY
 
diff --git a/src/tools/tqsettings.cpp b/src/tools/tqsettings.cpp
index a2ef55da7..18638b571 100644
--- a/src/tools/tqsettings.cpp
+++ b/src/tools/tqsettings.cpp
@@ -448,7 +448,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream)
 
 #ifdef TQ_WS_WIN // for homedirpath reading from registry
 #include "qt_windows.h"
-#include "ntqlibrary.h"
+#include "tqlibrary.h"
 
 #ifndef CSIDL_APPDATA
 #define CSIDL_APPDATA                   0x001a        // <user name>\Application Data
diff --git a/src/widgets/tqaction.h b/src/widgets/tqaction.h
index e45129341..809e55034 100644
--- a/src/widgets/tqaction.h
+++ b/src/widgets/tqaction.h
@@ -45,7 +45,7 @@
 #include "tqobject.h"
 #include "tqiconset.h"
 #include "tqstring.h"
-#include "ntqkeysequence.h"
+#include "tqkeysequence.h"
 #endif // QT_H
 
 #ifndef TQT_NO_ACTION
diff --git a/src/widgets/tqbutton.h b/src/widgets/tqbutton.h
index 5683e44b7..52b4f6597 100644
--- a/src/widgets/tqbutton.h
+++ b/src/widgets/tqbutton.h
@@ -43,7 +43,7 @@
 
 #ifndef QT_H
 #include "tqwidget.h"
-#include "ntqkeysequence.h"
+#include "tqkeysequence.h"
 #endif // QT_H
 
 #ifndef TQT_NO_BUTTON
diff --git a/src/widgets/tqlineedit.cpp b/src/widgets/tqlineedit.cpp
index 7cced4e9c..150e7f1d6 100644
--- a/src/widgets/tqlineedit.cpp
+++ b/src/widgets/tqlineedit.cpp
@@ -43,7 +43,7 @@
 
 // Keep this position to avoid patch rejection
 #ifndef TQT_NO_IM
-#include "ntqinputcontext.h"
+#include "tqinputcontext.h"
 #endif
 
 #include "tqpainter.h"
@@ -71,7 +71,7 @@
 #endif
 
 #ifndef TQT_NO_ACCEL
-#include "ntqkeysequence.h"
+#include "tqkeysequence.h"
 #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
 #else
 #define ACCEL_KEY(k) "\t" + TQString("Ctrl+" #k)
diff --git a/src/widgets/tqmenudata.h b/src/widgets/tqmenudata.h
index b5e92cb6a..24e5d9788 100644
--- a/src/widgets/tqmenudata.h
+++ b/src/widgets/tqmenudata.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "tqglobal.h"
 #include "tqiconset.h" // conversion TQPixmap->TQIconset
-#include "ntqkeysequence.h"
+#include "tqkeysequence.h"
 #include "tqstring.h"
 #include "tqsignal.h"
 #include "tqfont.h"
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 135c981cc..54dc1b2db 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -44,7 +44,7 @@
 
 // Keep this position to avoid patch rejection
 #ifndef TQT_NO_IM
-#include "ntqinputcontext.h"
+#include "tqinputcontext.h"
 #endif
 
 #include "../kernel/qrichtext_p.h"
@@ -79,7 +79,7 @@
 #include <tqguardedptr.h>
 
 #ifndef TQT_NO_ACCEL
-#include <ntqkeysequence.h>
+#include <tqkeysequence.h>
 #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
 #else
 #define ACCEL_KEY(k) "\t" + TQString("Ctrl+" #k)