summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2024-07-07 14:56:09 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2024-07-07 14:56:09 +0900
commit87d29563e3ccdeb7fea0197e262e667ef323ff9c (patch)
tree2d674f204c5205ca577a782e1b50583afd563972 /src
parent628b0bb74c3fc327efff8add9c73ada04b1cbea2 (diff)
downloadtqt3-87d29563e3ccdeb7fea0197e262e667ef323ff9c.tar.gz
tqt3-87d29563e3ccdeb7fea0197e262e667ef323ff9c.zip
Rename utility class nt* related files to equivalent tq*
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src')
-rw-r--r--src/canvas/tqcanvas.cpp2
-rw-r--r--src/codecs/tqjpunicode.cpp2
-rw-r--r--src/dialogs/qerrormessage.cpp2
-rw-r--r--src/dialogs/qfiledialog.cpp6
-rw-r--r--src/dialogs/qprintdialog.cpp2
-rw-r--r--src/kernel/ntqaccessible.h2
-rw-r--r--src/kernel/ntqapplication.h2
-rw-r--r--src/kernel/ntqnetworkprotocol.h2
-rw-r--r--src/kernel/ntqpointarray.h2
-rw-r--r--src/kernel/ntqt.h22
-rw-r--r--src/kernel/qapplication_x11.cpp4
-rw-r--r--src/kernel/qclipboard_x11.cpp2
-rw-r--r--src/kernel/qcolor_x11.cpp2
-rw-r--r--src/kernel/qcursor.cpp2
-rw-r--r--src/kernel/qcursor_x11.cpp2
-rw-r--r--src/kernel/qdnd_x11.cpp6
-rw-r--r--src/kernel/qdrawutil.cpp2
-rw-r--r--src/kernel/qeventloop_unix.cpp2
-rw-r--r--src/kernel/qeventloop_unix_glib.cpp2
-rw-r--r--src/kernel/qeventloop_x11.cpp2
-rw-r--r--src/kernel/qeventloop_x11_glib.cpp2
-rw-r--r--src/kernel/qfont.cpp4
-rw-r--r--src/kernel/qfontengine_p.h2
-rw-r--r--src/kernel/qfontengine_x11.cpp4
-rw-r--r--src/kernel/qinputcontext_p.h2
-rw-r--r--src/kernel/qinternal_p.h2
-rw-r--r--src/kernel/qkeysequence.cpp2
-rw-r--r--src/kernel/qmetaobject.cpp2
-rw-r--r--src/kernel/qmovie.cpp2
-rw-r--r--src/kernel/qpaintdevice_x11.cpp2
-rw-r--r--src/kernel/qpainter.cpp4
-rw-r--r--src/kernel/qpainter_x11.cpp2
-rw-r--r--src/kernel/qpixmap.cpp2
-rw-r--r--src/kernel/qpixmap_x11.cpp2
-rw-r--r--src/kernel/qpixmapcache.cpp2
-rw-r--r--src/kernel/qprocess_unix.cpp2
-rw-r--r--src/kernel/qpsprinter.cpp10
-rw-r--r--src/kernel/qregion_x11.cpp2
-rw-r--r--src/kernel/qrichtext.cpp2
-rw-r--r--src/kernel/qrichtext_p.h4
-rw-r--r--src/kernel/qt_kernel.pri4
-rw-r--r--src/kernel/qt_pch.h2
-rw-r--r--src/kernel/qtranslator.cpp2
-rw-r--r--src/kernel/qvariant.cpp6
-rw-r--r--src/kernel/tqbitmap.cpp (renamed from src/kernel/qbitmap.cpp)4
-rw-r--r--src/kernel/tqbitmap.h (renamed from src/kernel/ntqbitmap.h)0
-rw-r--r--src/kernel/tqdragobject.cpp2
-rw-r--r--src/kernel/tqiconset.cpp2
-rw-r--r--src/kernel/tqimage.cpp4
-rw-r--r--src/kernel/tqobject.cpp2
-rw-r--r--src/kernel/tqobjectdict.h2
-rw-r--r--src/kernel/tqstyle.cpp2
-rw-r--r--src/kernel/tqstylesheet.h2
-rw-r--r--src/kernel/tqttdeintegration_x11.cpp2
-rw-r--r--src/kernel/tqwidget_x11.cpp2
-rw-r--r--src/kernel/tqwidgetintdict.h2
-rw-r--r--src/moc/moc.pro6
-rw-r--r--src/moc/moc.y6
-rw-r--r--src/moc/moc_yacc.cpp6
-rw-r--r--src/network/qdns.cpp2
-rw-r--r--src/network/qftp.cpp2
-rw-r--r--src/network/qhttp.cpp2
-rw-r--r--src/opengl/ntqglcolormap.h2
-rw-r--r--src/opengl/qgl_x11.cpp2
-rw-r--r--src/opengl/qglcolormap.cpp2
-rw-r--r--src/sql/drivers/psql/tqsql_psql.cpp2
-rw-r--r--src/sql/drivers/sqlite/tqsql_sqlite.cpp2
-rw-r--r--src/sql/drivers/sqlite3/tqsql_sqlite3.cpp2
-rw-r--r--src/sql/tqsqldatabase.cpp2
-rw-r--r--src/sql/tqsqlform.cpp2
-rw-r--r--src/sql/tqsqlmanager_p.cpp2
-rw-r--r--src/sql/tqsqlquery.cpp2
-rw-r--r--src/sql/tqsqlrecord.cpp2
-rw-r--r--src/styles/qcommonstyle.cpp2
-rw-r--r--src/styles/qwindowsstyle.cpp2
-rw-r--r--src/table/ntqtable.h4
-rw-r--r--src/tools/ntqiodevice.h2
-rw-r--r--src/tools/qdir.cpp10
-rw-r--r--src/tools/qdir_p.h2
-rw-r--r--src/tools/qdir_unix.cpp2
-rw-r--r--src/tools/qfileinfo.cpp2
-rw-r--r--src/tools/qgcache.cpp2
-rw-r--r--src/tools/qglobal.cpp2
-rw-r--r--src/tools/qgpluginmanager_p.h2
-rw-r--r--src/tools/qsettings.cpp2
-rw-r--r--src/tools/qt_tools.pri30
-rw-r--r--src/tools/qwinexport.cpp12
-rw-r--r--src/tools/tqasciicache.h (renamed from src/tools/ntqasciicache.h)0
-rw-r--r--src/tools/tqasciidict.h (renamed from src/tools/ntqasciidict.h)0
-rw-r--r--src/tools/tqbitarray.cpp (renamed from src/tools/qbitarray.cpp)6
-rw-r--r--src/tools/tqbitarray.h (renamed from src/tools/ntqbitarray.h)0
-rw-r--r--src/tools/tqcache.h (renamed from src/tools/ntqcache.h)0
-rw-r--r--src/tools/tqcstring.cpp (renamed from src/tools/qcstring.cpp)4
-rw-r--r--src/tools/tqcstring.h (renamed from src/tools/ntqcstring.h)2
-rw-r--r--src/tools/tqdatetime.cpp2
-rw-r--r--src/tools/tqdeepcopy.cpp (renamed from src/tools/qdeepcopy.cpp)4
-rw-r--r--src/tools/tqdeepcopy.h (renamed from src/tools/ntqdeepcopy.h)0
-rw-r--r--src/tools/tqdict.h (renamed from src/tools/ntqdict.h)0
-rw-r--r--src/tools/tqintcache.h (renamed from src/tools/ntqintcache.h)0
-rw-r--r--src/tools/tqintdict.h (renamed from src/tools/ntqintdict.h)0
-rw-r--r--src/tools/tqmemarray.h (renamed from src/tools/ntqmemarray.h)0
-rw-r--r--src/tools/tqmutexpool_p.h2
-rw-r--r--src/tools/tqregexp.cpp (renamed from src/tools/qregexp.cpp)14
-rw-r--r--src/tools/tqregexp.h (renamed from src/tools/ntqregexp.h)0
-rw-r--r--src/tools/tqstring.cpp6
-rw-r--r--src/tools/tqstring.h2
-rw-r--r--src/tools/tqstringlist.cpp4
-rw-r--r--src/tools/tqtextstream.cpp2
-rw-r--r--src/widgets/ntqlcdnumber.h2
-rw-r--r--src/widgets/ntqvalidator.h2
-rw-r--r--src/widgets/qbutton.cpp2
-rw-r--r--src/widgets/qcheckbox.cpp2
-rw-r--r--src/widgets/qcombobox.cpp2
-rw-r--r--src/widgets/qdial.cpp2
-rw-r--r--src/widgets/qframe.cpp2
-rw-r--r--src/widgets/qgroupbox.cpp2
-rw-r--r--src/widgets/qheader.cpp2
-rw-r--r--src/widgets/qlabel.cpp2
-rw-r--r--src/widgets/qlcdnumber.cpp2
-rw-r--r--src/widgets/qlistbox.cpp2
-rw-r--r--src/widgets/qlistview.cpp2
-rw-r--r--src/widgets/qmultilineedit.cpp4
-rw-r--r--src/widgets/qpushbutton.cpp2
-rw-r--r--src/widgets/qradiobutton.cpp2
-rw-r--r--src/widgets/qscrollbar.cpp2
-rw-r--r--src/widgets/qslider.cpp2
-rw-r--r--src/widgets/qspinbox.cpp2
-rw-r--r--src/widgets/qsplitter.cpp4
-rw-r--r--src/widgets/qtabbar.cpp2
-rw-r--r--src/widgets/qtabwidget.cpp2
-rw-r--r--src/widgets/qwhatsthis.cpp2
-rw-r--r--src/widgets/tqiconview.cpp4
-rw-r--r--src/widgets/tqiconview.h2
-rw-r--r--src/widgets/tqmainwindow.cpp4
-rw-r--r--src/widgets/tqtextbrowser.cpp2
-rw-r--r--src/widgets/tqtextedit.cpp2
-rw-r--r--src/widgets/tqwidgetstack.h2
-rw-r--r--src/workspace/tqworkspace.cpp2
-rw-r--r--src/xml/qsvgdevice.cpp2
-rw-r--r--src/xml/tqdom.cpp4
-rw-r--r--src/xml/tqxml.cpp2
141 files changed, 205 insertions, 207 deletions
diff --git a/src/canvas/tqcanvas.cpp b/src/canvas/tqcanvas.cpp
index 8249f454a..e1279bb83 100644
--- a/src/canvas/tqcanvas.cpp
+++ b/src/canvas/tqcanvas.cpp
@@ -41,7 +41,7 @@
#include "tqcanvas.h"
#ifndef TQT_NO_CANVAS
#include "ntqapplication.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqimage.h"
#include "tqptrdict.h"
#include "ntqpainter.h"
diff --git a/src/codecs/tqjpunicode.cpp b/src/codecs/tqjpunicode.cpp
index ee03a4ff5..f333f4ccc 100644
--- a/src/codecs/tqjpunicode.cpp
+++ b/src/codecs/tqjpunicode.cpp
@@ -84,7 +84,7 @@
#include "tqjpunicode.h"
#ifndef TQT_NO_BIG_CODECS
-#include "ntqcstring.h"
+#include "tqcstring.h"
#ifdef Q_OS_TEMP
#include "qwinfunctions_wce.h"
#endif
diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp
index 403c44e12..116712ec1 100644
--- a/src/dialogs/qerrormessage.cpp
+++ b/src/dialogs/qerrormessage.cpp
@@ -44,7 +44,7 @@
#include "ntqapplication.h"
#include "ntqcheckbox.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "ntqlabel.h"
#include "ntqlayout.h"
#include "ntqmessagebox.h"
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index a889ec621..084e48edb 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -56,12 +56,12 @@
#include "private/qapplication_p.h"
#include "ntqapplication.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqbuttongroup.h"
#include "ntqcheckbox.h"
#include "ntqcleanuphandler.h"
#include "ntqcombobox.h"
-#include "ntqcstring.h"
+#include "tqcstring.h"
#include "ntqcursor.h"
#include "tqdragobject.h"
#include "ntqfile.h"
@@ -84,7 +84,7 @@
#include "ntqprogressbar.h"
#include "tqptrvector.h"
#include "ntqpushbutton.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "ntqsplitter.h"
#include "tqstrlist.h"
#include "tqstyle.h"
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index 92e5d5ec3..aeef03304 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -60,7 +60,7 @@
#include "ntqheader.h"
#include "tqstyle.h"
#include "tqstring.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#if !defined(TQT_NO_CUPS) || !defined(TQT_NO_NIS)
#include "ntqlibrary.h"
#endif
diff --git a/src/kernel/ntqaccessible.h b/src/kernel/ntqaccessible.h
index 39f68ee3f..2d0302a9d 100644
--- a/src/kernel/ntqaccessible.h
+++ b/src/kernel/ntqaccessible.h
@@ -44,7 +44,7 @@
#include <private/qcom_p.h>
#include "ntqrect.h"
#include "ntqguardedptr.h"
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
#endif // QT_H
#if defined(QT_ACCESSIBILITY_SUPPORT)
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index 9f4c7938f..3568ad454 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "ntqdesktopwidget.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
#include "ntqpalette.h"
#include "ntqtranslator.h"
#include "tqstrlist.h"
diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h
index f41d14c4d..55c7436da 100644
--- a/src/kernel/ntqnetworkprotocol.h
+++ b/src/kernel/ntqnetworkprotocol.h
@@ -44,7 +44,7 @@
#ifndef QT_H
#include "ntqurlinfo.h"
#include "tqstring.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "tqobject.h"
#endif // QT_H
diff --git a/src/kernel/ntqpointarray.h b/src/kernel/ntqpointarray.h
index bd7b50fbc..515935ac7 100644
--- a/src/kernel/ntqpointarray.h
+++ b/src/kernel/ntqpointarray.h
@@ -42,7 +42,7 @@
#define TQPOINTARRAY_H
#ifndef QT_H
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
#include "ntqpoint.h"
#endif // QT_H
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 778a0a93c..e9b0343a4 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -23,8 +23,8 @@
#include "tqobjectdefs.h"
#include "ntqnamespace.h"
#include "ntqgarray.h"
-#include "ntqmemarray.h"
-#include "ntqcstring.h"
+#include "tqmemarray.h"
+#include "tqcstring.h"
#include "tqstring.h"
#include "tqptrlist.h"
#include "ntqiodevice.h"
@@ -42,7 +42,7 @@
#include "ntqtl.h"
#include "tqsize.h"
#include "ntqrect.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
#include "ntqregion.h"
#include "tqsql.h"
#include "tqstrlist.h"
@@ -50,10 +50,10 @@
#include "tqmap.h"
#include "tqdatetime.h"
#include "tqmime.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
#include "ntqpaintdevice.h"
#include "ntqfontmetrics.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "ntqevent.h"
#include "ntqhostaddress.h"
#include "tqstringlist.h"
@@ -89,7 +89,7 @@
#include "ntqgcache.h"
#include <ntqgif.h>
#include <ntqglcolormap.h>
-#include <ntqcache.h>
+#include <tqcache.h>
#include <tqdropsite.h>
#include "ntqgplugin.h"
#include <ntqgrid.h>
@@ -108,8 +108,8 @@
#include "tqimage.h"
#include <tqimageformatplugin.h>
#include "ntqlineedit.h"
-#include <ntqintcache.h>
-#include "ntqintdict.h"
+#include <tqintcache.h>
+#include "tqintdict.h"
#include "ntqmotifstyle.h"
#include "ntqpicture.h"
#include <tqjiscodec.h>
@@ -126,7 +126,7 @@
#include "ntqdir.h"
#include "ntqwindowsstyle.h"
#include "ntqconnection.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqvariant.h"
#include "ntqsignal.h"
#include <ntqmessagebox.h>
@@ -163,7 +163,7 @@
#include <ntqprinter.h>
#include <ntqprocess.h>
#include "ntqprogressbar.h"
-#include <ntqasciicache.h>
+#include <tqasciicache.h>
#include "tqptrdict.h"
#include <ntqcleanuphandler.h>
#include <tqptrqueue.h>
@@ -173,7 +173,7 @@
#include <ntqradiobutton.h>
#include <ntqdial.h>
#include <ntqdockarea.h>
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include <ntqclipboard.h>
#include <tqhebrewcodec.h>
#include <ntqlistbox.h>
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index c2b64a636..47524c6a5 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -70,7 +70,7 @@
#include "tqobjectlist.h"
#include "tqwidgetlist.h"
#include "tqwidgetintdict.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
#include "ntqpainter.h"
#include "ntqpixmapcache.h"
#include "tqdatetime.h"
@@ -80,7 +80,7 @@
#include "ntqsocketnotifier.h"
#include "tqsessionmanager.h"
#include "tqvaluelist.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "ntqguardedptr.h"
#include "ntqclipboard.h"
#include "ntqwhatsthis.h" // ######## dependency
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index e8eeac848..056b3de91 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -66,7 +66,7 @@
#include "ntqapplication.h"
#include "ntqeventloop.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqdatetime.h"
#include "tqdragobject.h"
#include "ntqbuffer.h"
diff --git a/src/kernel/qcolor_x11.cpp b/src/kernel/qcolor_x11.cpp
index 8f02bcde9..b223222a9 100644
--- a/src/kernel/qcolor_x11.cpp
+++ b/src/kernel/qcolor_x11.cpp
@@ -58,7 +58,7 @@
this TQt application.
*****************************************************************************/
-#include "ntqintdict.h"
+#include "tqintdict.h"
struct TQColorData {
uint pix; // allocated pixel value
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index d6b736460..7d1b0a160 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_CURSOR
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqimage.h"
#include "ntqdatastream.h"
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index 8cf9f6dde..f7a073612 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "ntqcursor.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqimage.h"
#include "ntqapplication.h"
#include "ntqdatastream.h"
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index dc4b9678b..0a51b9f2e 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -45,14 +45,14 @@
#ifndef TQT_NO_DRAGANDDROP
#include "tqwidget.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
#include "tqdatetime.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "ntqguardedptr.h"
#include "tqdragobject.h"
#include "tqobjectlist.h"
#include "ntqcursor.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqpainter.h"
#include "qt_x11_p.h"
diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp
index 0ac5bde33..c98ef3dc4 100644
--- a/src/kernel/qdrawutil.cpp
+++ b/src/kernel/qdrawutil.cpp
@@ -40,7 +40,7 @@
#include "ntqdrawutil.h"
#ifndef TQT_NO_DRAWUTIL
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqpixmapcache.h"
#include "ntqapplication.h"
#include "ntqpainter.h"
diff --git a/src/kernel/qeventloop_unix.cpp b/src/kernel/qeventloop_unix.cpp
index 89e31da82..2f71b4c05 100644
--- a/src/kernel/qeventloop_unix.cpp
+++ b/src/kernel/qeventloop_unix.cpp
@@ -39,7 +39,7 @@
#include "qeventloop_p.h" // includes qplatformdefs.h
#include "ntqeventloop.h"
#include "ntqapplication.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.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 5d43a6efb..11cb9ad94 100644
--- a/src/kernel/qeventloop_unix_glib.cpp
+++ b/src/kernel/qeventloop_unix_glib.cpp
@@ -39,7 +39,7 @@
#include "qeventloop_glib_p.h" // includes qplatformdefs.h
#include "ntqeventloop.h"
#include "ntqapplication.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
#include "tqmutex.h"
#if defined(TQT_THREAD_SUPPORT)
diff --git a/src/kernel/qeventloop_x11.cpp b/src/kernel/qeventloop_x11.cpp
index 6905bac22..bb6f343c2 100644
--- a/src/kernel/qeventloop_x11.cpp
+++ b/src/kernel/qeventloop_x11.cpp
@@ -39,7 +39,7 @@
#include "qeventloop_p.h" // includes qplatformdefs.h
#include "ntqeventloop.h"
#include "ntqapplication.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
#include "qcolor_p.h"
#include "qt_x11_p.h"
diff --git a/src/kernel/qeventloop_x11_glib.cpp b/src/kernel/qeventloop_x11_glib.cpp
index b152d6a38..e000b0ef4 100644
--- a/src/kernel/qeventloop_x11_glib.cpp
+++ b/src/kernel/qeventloop_x11_glib.cpp
@@ -42,7 +42,7 @@
#include "qeventloop_glib_p.h" // includes qplatformdefs.h
#include "ntqeventloop.h"
#include "ntqapplication.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
#include "qcolor_p.h"
#include "qt_x11_p.h"
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 1ad9ccf9e..99f1dba77 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -45,8 +45,8 @@
#include "ntqfontmetrics.h"
#include "ntqfontinfo.h"
#include "ntqpainter.h"
-#include "ntqdict.h"
-#include "ntqcache.h"
+#include "tqdict.h"
+#include "tqcache.h"
#include "ntqdatastream.h"
#include "ntqapplication.h"
#include "ntqcleanuphandler.h"
diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h
index 7d0db28c1..3dba677ca 100644
--- a/src/kernel/qfontengine_p.h
+++ b/src/kernel/qfontengine_p.h
@@ -462,7 +462,7 @@ private:
#elif defined( TQ_WS_MAC )
#include "qt_mac.h"
#include <tqmap.h>
-#include <ntqcache.h>
+#include <tqcache.h>
class TQFontEngineMac : public TQFontEngine
{
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index 54bedb33e..0a8164d44 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -41,10 +41,10 @@
// #define FONTENGINE_DEBUG
#include <tqwidget.h>
-#include <ntqcstring.h>
+#include <tqcstring.h>
#include <tqtextcodec.h>
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqfontdatabase.h"
#include "ntqpaintdevice.h"
#include "ntqpaintdevicemetrics.h"
diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h
index 984660038..0e0f8da0c 100644
--- a/src/kernel/qinputcontext_p.h
+++ b/src/kernel/qinputcontext_p.h
@@ -61,7 +61,7 @@ class TQString;
#ifdef TQ_WS_X11
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
#include "ntqwindowdefs.h"
#include "qt_x11_p.h"
#endif
diff --git a/src/kernel/qinternal_p.h b/src/kernel/qinternal_p.h
index 6b4139f32..837c81421 100644
--- a/src/kernel/qinternal_p.h
+++ b/src/kernel/qinternal_p.h
@@ -56,7 +56,7 @@
#include "ntqnamespace.h"
#include "ntqrect.h"
#include "tqptrlist.h"
-#include "ntqcstring.h"
+#include "tqcstring.h"
#include "ntqiodevice.h"
#endif // QT_H
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index add0df9e4..a1bf49832 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -46,7 +46,7 @@
#include "ntqshared.h"
#include "tqvaluelist.h"
#ifndef TQT_NO_REGEXP
-# include "ntqregexp.h"
+# include "tqregexp.h"
#endif
#ifdef TQ_WS_MAC
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index 624c025d8..ae74503c3 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "ntqmetaobject.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
#ifdef TQT_THREAD_SUPPORT
#include <private/tqmutexpool_p.h>
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 7be719725..ea6f99942 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -43,7 +43,7 @@
#include "tqtimer.h"
#include "ntqpainter.h"
#include "tqptrlist.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqmovie.h"
#include "ntqfile.h"
#include "ntqbuffer.h"
diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
index 1a01803aa..d40d09ba2 100644
--- a/src/kernel/qpaintdevice_x11.cpp
+++ b/src/kernel/qpaintdevice_x11.cpp
@@ -42,7 +42,7 @@
#include "ntqpaintdevicemetrics.h"
#include "ntqpainter.h"
#include "tqwidget.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqapplication.h"
#include "qt_x11_p.h"
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 47d2af11c..731708b77 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -40,7 +40,7 @@
#include "ntqpainter.h"
#include "qpainter_p.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqptrstack.h"
#include "tqptrdict.h"
#include "ntqdatastream.h"
@@ -49,7 +49,7 @@
#include "ntqpaintdevicemetrics.h"
#include "ntqapplication.h"
#include "qrichtext_p.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "ntqcleanuphandler.h"
#include <string.h>
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 0e72d64da..f8de8c9a5 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -43,7 +43,7 @@
#include "ntqfont.h"
#include "ntqpainter.h"
#include "tqwidget.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqpixmapcache.h"
#include "tqtextcodec.h"
#include "ntqpaintdevicemetrics.h"
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 9ac10d30c..33fca8ffd 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -40,7 +40,7 @@
#include "ntqpixmap.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqimage.h"
#include "tqwidget.h"
#include "ntqpainter.h"
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index b40247af9..1ddb18e02 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -67,7 +67,7 @@
#undef QT_MITSHM_XFORM
#endif
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqpaintdevicemetrics.h"
#include "tqimage.h"
#include "ntqwmatrix.h"
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index 16a7c5ed2..9eb09466c 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "ntqpixmapcache.h"
-#include "ntqcache.h"
+#include "tqcache.h"
#include "tqobject.h"
#include "ntqcleanuphandler.h"
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 0e5a2299a..a8ed9e4da 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -55,7 +55,7 @@
#include "ntqsocketnotifier.h"
#include "tqtimer.h"
#include "ntqcleanuphandler.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "private/qinternal_p.h"
#include <stdlib.h>
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index c9ce2ea7d..b70e809df 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -62,17 +62,17 @@
#include "tqimage.h"
#include "tqdatetime.h"
#include "tqstring.h"
-#include "ntqdict.h"
-#include "ntqmemarray.h"
+#include "tqdict.h"
+#include "tqmemarray.h"
#include "ntqfile.h"
#include "ntqbuffer.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
#include "tqtextcodec.h"
#include "ntqsettings.h"
#include "tqmap.h"
#include "ntqfontdatabase.h"
-#include "ntqregexp.h"
-#include "ntqbitmap.h"
+#include "tqregexp.h"
+#include "tqbitmap.h"
#include <private/qunicodetables_p.h>
#if defined(Q_OS_WIN32)
diff --git a/src/kernel/qregion_x11.cpp b/src/kernel/qregion_x11.cpp
index 30d0fe9c2..55a7d8380 100644
--- a/src/kernel/qregion_x11.cpp
+++ b/src/kernel/qregion_x11.cpp
@@ -42,7 +42,7 @@
#include "ntqpointarray.h"
#include "ntqbuffer.h"
#include "tqimage.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "qt_x11_p.h"
#include <stdlib.h>
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index a1dfd6719..0228a58fe 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -6694,7 +6694,7 @@ void TQTextImage::adjustToPainter( TQPainter* p )
}
#if !defined(TQ_WS_X11)
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
#include <ntqcleanuphandler.h>
static TQPixmap *qrt_selection = 0;
static TQSingleCleanupHandler<TQPixmap> qrt_cleanup_pixmap;
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index c8c68360e..e9422ec14 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -58,7 +58,7 @@
#include "tqptrlist.h"
#include "ntqrect.h"
#include "ntqfontmetrics.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
#include "tqmap.h"
#include "tqstringlist.h"
#include "ntqfont.h"
@@ -67,7 +67,7 @@
#include "tqvaluelist.h"
#include "tqvaluestack.h"
#include "tqobject.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "ntqpixmap.h"
#include "tqstylesheet.h"
#include "tqptrvector.h"
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 6a6cce7ef..eca64009e 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -9,7 +9,7 @@ kernel {
$$KERNEL_P/qapplication_p.h \
$$KERNEL_H/ntqasyncimageio.h \
$$KERNEL_H/ntqasyncio.h \
- $$KERNEL_H/ntqbitmap.h \
+ $$KERNEL_H/tqbitmap.h \
$$KERNEL_H/ntqbrush.h \
$$KERNEL_H/ntqclipboard.h \
$$KERNEL_H/ntqcolor.h \
@@ -199,7 +199,7 @@ kernel {
$$KERNEL_CPP/qapplication.cpp \
$$KERNEL_CPP/qasyncimageio.cpp \
$$KERNEL_CPP/qasyncio.cpp \
- $$KERNEL_CPP/qbitmap.cpp \
+ $$KERNEL_CPP/tqbitmap.cpp \
$$KERNEL_CPP/qclipboard.cpp \
$$KERNEL_CPP/qcolor.cpp \
$$KERNEL_CPP/qcolor_p.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index aff826dc0..8222ec592 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -24,7 +24,7 @@
#include <tqmap.h> // I must be first!
#include <private/qucomextra_p.h> // All moc genereated code has this include
#include <ntqapplication.h>
-#include <ntqbitmap.h>
+#include <tqbitmap.h>
#include <ntqcursor.h>
#include <tqdatetime.h>
#include <ntqglobal.h>
diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp
index ce01453fe..42c741e8a 100644
--- a/src/kernel/qtranslator.cpp
+++ b/src/kernel/qtranslator.cpp
@@ -58,7 +58,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
#include "ntqfileinfo.h"
#include "tqwidgetlist.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
#include "tqstring.h"
#include "ntqapplication.h"
#include "ntqfile.h"
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 0b2cd0f3f..1de08c389 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -43,7 +43,7 @@
#include "ntqvariant.h"
#ifndef TQT_NO_VARIANT
#include "tqstring.h"
-#include "ntqcstring.h"
+#include "tqcstring.h"
#include "ntqfont.h"
#include "ntqpixmap.h"
#include "tqimage.h"
@@ -57,12 +57,12 @@
#include "ntqdatastream.h"
#include "ntqregion.h"
#include "ntqpointarray.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqcursor.h"
#include "tqdatetime.h"
#include "tqsizepolicy.h"
#include "ntqshared.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
#include "ntqkeysequence.h"
#include "ntqpen.h"
diff --git a/src/kernel/qbitmap.cpp b/src/kernel/tqbitmap.cpp
index 3c64c22b0..c23116d0e 100644
--- a/src/kernel/qbitmap.cpp
+++ b/src/kernel/tqbitmap.cpp
@@ -38,12 +38,12 @@
**
**********************************************************************/
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqimage.h"
/*!
- \class TQBitmap ntqbitmap.h
+ \class TQBitmap tqbitmap.h
\brief The TQBitmap class provides monochrome (1-bit depth) pixmaps.
\ingroup graphics
diff --git a/src/kernel/ntqbitmap.h b/src/kernel/tqbitmap.h
index 22307b551..22307b551 100644
--- a/src/kernel/ntqbitmap.h
+++ b/src/kernel/tqbitmap.h
diff --git a/src/kernel/tqdragobject.cpp b/src/kernel/tqdragobject.cpp
index 77e726477..68678e7d6 100644
--- a/src/kernel/tqdragobject.cpp
+++ b/src/kernel/tqdragobject.cpp
@@ -52,7 +52,7 @@
#include "tqwidget.h"
#include "ntqbuffer.h"
#include "ntqgif.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "ntqdir.h"
#include <ctype.h>
diff --git a/src/kernel/tqiconset.cpp b/src/kernel/tqiconset.cpp
index 6bbf4c17a..f3e8ac123 100644
--- a/src/kernel/tqiconset.cpp
+++ b/src/kernel/tqiconset.cpp
@@ -43,7 +43,7 @@
#ifndef TQT_NO_ICONSET
#include "ntqapplication.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqcleanuphandler.h"
#include "tqimage.h"
#include "ntqpainter.h"
diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp
index d7bc30d49..5f45e2fdc 100644
--- a/src/kernel/tqimage.cpp
+++ b/src/kernel/tqimage.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
#include "tqimage.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "ntqfile.h"
#include "ntqdatastream.h"
#include "tqtextstream.h"
@@ -3878,7 +3878,7 @@ static TQImageHandler *get_image_handler( const char *format )
/*!
Defines an image I/O handler for the image format called \a
- format, which is recognized using the \link ntqregexp.html#details
+ format, which is recognized using the \link tqregexp.html#details
regular expression\endlink \a header, read using \a readImage and
written using \a writeImage.
diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp
index 3923b46d0..293f374e5 100644
--- a/src/kernel/tqobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -43,7 +43,7 @@
#include "tqobject.h"
#include "tqobjectlist.h"
#include "ntqsignalslotimp.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "ntqmetaobject.h"
#include <private/qucom_p.h>
#include "qucomextra_p.h"
diff --git a/src/kernel/tqobjectdict.h b/src/kernel/tqobjectdict.h
index 4ee49faf2..8ff8c31f4 100644
--- a/src/kernel/tqobjectdict.h
+++ b/src/kernel/tqobjectdict.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "ntqmetaobject.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
#endif // QT_H
diff --git a/src/kernel/tqstyle.cpp b/src/kernel/tqstyle.cpp
index b3c496da6..47755c4ba 100644
--- a/src/kernel/tqstyle.cpp
+++ b/src/kernel/tqstyle.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_STYLE
#include "ntqapplication.h"
#include "ntqpainter.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqpixmapcache.h"
#include "ntqframe.h"
#include "ntqlayout.h"
diff --git a/src/kernel/tqstylesheet.h b/src/kernel/tqstylesheet.h
index 1c12775cc..4880726a0 100644
--- a/src/kernel/tqstylesheet.h
+++ b/src/kernel/tqstylesheet.h
@@ -45,7 +45,7 @@
#include "tqstring.h"
#include "tqvaluelist.h"
#include "tqptrvector.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "tqobject.h"
#endif // QT_H
diff --git a/src/kernel/tqttdeintegration_x11.cpp b/src/kernel/tqttdeintegration_x11.cpp
index b3565b3d4..cf96ba280 100644
--- a/src/kernel/tqttdeintegration_x11.cpp
+++ b/src/kernel/tqttdeintegration_x11.cpp
@@ -7,7 +7,7 @@
#include <ntqfiledialog.h>
#include <ntqfontdialog.h>
#include <ntqlibrary.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <ntqmessagebox.h>
#include <stdlib.h>
diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp
index bc31e7e75..c3a54d3d8 100644
--- a/src/kernel/tqwidget_x11.cpp
+++ b/src/kernel/tqwidget_x11.cpp
@@ -43,7 +43,7 @@
#include "ntqnamespace.h"
#include "ntqpaintdevicemetrics.h"
#include "ntqpainter.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqimage.h"
#include "tqobjectlist.h"
#include "ntqlayout.h"
diff --git a/src/kernel/tqwidgetintdict.h b/src/kernel/tqwidgetintdict.h
index 8a4694804..4f001d7ec 100644
--- a/src/kernel/tqwidgetintdict.h
+++ b/src/kernel/tqwidgetintdict.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "tqwidget.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
#endif // QT_H
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index 6917be73f..95b2c796b 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -14,7 +14,7 @@ LIBS =
OBJECTS_DIR = .
SOURCES = ../tools/qbuffer.cpp \
../tools/tqptrcollection.cpp \
- ../tools/qcstring.cpp \
+ ../tools/tqcstring.cpp \
../tools/qdatastream.cpp \
../tools/tqdatetime.cpp \
../tools/qfile.cpp \
@@ -26,13 +26,13 @@ SOURCES = ../tools/qbuffer.cpp \
../tools/qglobal.cpp \
../tools/qgvector.cpp \
../tools/qiodevice.cpp \
- ../tools/qregexp.cpp \
+ ../tools/tqregexp.cpp \
../tools/tqstring.cpp \
../tools/qlocale.cpp \
../tools/qunicodetables.cpp \
../tools/tqstringlist.cpp \
../tools/tqtextstream.cpp \
- ../tools/qbitarray.cpp \
+ ../tools/tqbitarray.cpp \
../tools/tqmap.cpp \
../tools/qgcache.cpp \
../codecs/tqtextcodec.cpp \
diff --git a/src/moc/moc.y b/src/moc/moc.y
index eb5cb1320..e41c644f2 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -59,13 +59,13 @@
void yyerror( const char *msg );
#include "qplatformdefs.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
#include "tqdatetime.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "ntqfile.h"
#include "ntqdir.h"
#include "tqptrlist.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "tqstrlist.h"
#ifdef MOC_MWERKS_PLUGIN
# ifdef Q_OS_MACX
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index bde5c9f53..9135ff29b 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -72,13 +72,13 @@
void yyerror( const char *msg );
#include "qplatformdefs.h"
-#include "ntqasciidict.h"
+#include "tqasciidict.h"
#include "tqdatetime.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "ntqfile.h"
#include "ntqdir.h"
#include "tqptrlist.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "tqstrlist.h"
#ifdef MOC_MWERKS_PLUGIN
# ifdef Q_OS_MACX
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index 69fb60f52..7ae3a53f4 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -65,7 +65,7 @@
#ifndef TQT_NO_DNS
#include "tqdatetime.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "tqptrlist.h"
#include "tqstring.h"
#include "tqtimer.h"
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 9e9135113..259e7826a 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -47,7 +47,7 @@
#include "ntqurlinfo.h"
#include "ntqurloperator.h"
#include "tqstringlist.h"
-#include "ntqregexp.h"
+#include "tqregexp.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 0d8b83fb1..9569b2080 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/qhttp.cpp
@@ -47,7 +47,7 @@
#include "tqmap.h"
#include "tqstring.h"
#include "tqstringlist.h"
-#include "ntqcstring.h"
+#include "tqcstring.h"
#include "ntqbuffer.h"
#include "ntqurloperator.h"
#include "tqtimer.h"
diff --git a/src/opengl/ntqglcolormap.h b/src/opengl/ntqglcolormap.h
index 9a78d636f..a4b2ae0d3 100644
--- a/src/opengl/ntqglcolormap.h
+++ b/src/opengl/ntqglcolormap.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "ntqcolor.h"
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
#include "ntqshared.h"
#endif // QT_H
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index dc8530f1e..661c41917 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -46,7 +46,7 @@
#include "ntqpixmap.h"
#include "ntqapplication.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
#include "private/qfontengine_p.h"
#define INT8 dummy_INT8
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index 541e309d6..088c83030 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -98,7 +98,7 @@
*/
#include "ntqglcolormap.h"
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
/*!
diff --git a/src/sql/drivers/psql/tqsql_psql.cpp b/src/sql/drivers/psql/tqsql_psql.cpp
index ecc63a635..b40d38447 100644
--- a/src/sql/drivers/psql/tqsql_psql.cpp
+++ b/src/sql/drivers/psql/tqsql_psql.cpp
@@ -45,7 +45,7 @@
#include <ntqpointarray.h>
#include <tqsqlrecord.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <tqdatetime.h>
// PostgreSQL header <utils/elog.h> included by <postgres.h> redefines DEBUG.
#if defined(DEBUG)
diff --git a/src/sql/drivers/sqlite/tqsql_sqlite.cpp b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
index 8ec7425cd..a63ddf37d 100644
--- a/src/sql/drivers/sqlite/tqsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/tqsql_sqlite.cpp
@@ -15,7 +15,7 @@
#include "tqsql_sqlite.h"
#include <tqdatetime.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <ntqfile.h>
#include <tqptrvector.h>
#if !defined TQ_WS_WIN32
diff --git a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
index 8eef4a3ac..d1cc24ec8 100644
--- a/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
+++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.cpp
@@ -16,7 +16,7 @@
#include <tqdatetime.h>
#include <tqvaluevector.h>
-#include <ntqregexp.h>
+#include <tqregexp.h>
#include <ntqfile.h>
#include <sqlite3.h>
#include <tqptrvector.h>
diff --git a/src/sql/tqsqldatabase.cpp b/src/sql/tqsqldatabase.cpp
index d198e3cba..301025914 100644
--- a/src/sql/tqsqldatabase.cpp
+++ b/src/sql/tqsqldatabase.cpp
@@ -84,7 +84,7 @@
#include "tqobject.h"
#include "ntqguardedptr.h"
#include "ntqcleanuphandler.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include <stdlib.h>
const char * const TQSqlDatabase::defaultConnection = "qt_sql_default_connection";
diff --git a/src/sql/tqsqlform.cpp b/src/sql/tqsqlform.cpp
index 8584645e4..c3da08e30 100644
--- a/src/sql/tqsqlform.cpp
+++ b/src/sql/tqsqlform.cpp
@@ -47,7 +47,7 @@
#include "tqsqlrecord.h"
#include "tqstringlist.h"
#include "tqwidget.h"
-#include "ntqdict.h"
+#include "tqdict.h"
class TQSqlFormPrivate
{
diff --git a/src/sql/tqsqlmanager_p.cpp b/src/sql/tqsqlmanager_p.cpp
index 012747efe..4b9597319 100644
--- a/src/sql/tqsqlmanager_p.cpp
+++ b/src/sql/tqsqlmanager_p.cpp
@@ -49,7 +49,7 @@
#include "tqsqldriver.h"
#include "tqstring.h"
#include "ntqmessagebox.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
//#define QT_DEBUG_DATAMANAGER
diff --git a/src/sql/tqsqlquery.cpp b/src/sql/tqsqlquery.cpp
index 1411912db..256694eee 100644
--- a/src/sql/tqsqlquery.cpp
+++ b/src/sql/tqsqlquery.cpp
@@ -48,7 +48,7 @@
#include "tqsqldriver.h"
#include "tqsqldatabase.h"
#include "tqsql.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "private/tqsqlextension_p.h"
diff --git a/src/sql/tqsqlrecord.cpp b/src/sql/tqsqlrecord.cpp
index e6c93b1eb..dd4432aa1 100644
--- a/src/sql/tqsqlrecord.cpp
+++ b/src/sql/tqsqlrecord.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_SQL
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "tqvaluevector.h"
#include "ntqshared.h"
#include "ntqnamespace.h"
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index f52acc17f..acdf61761 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -65,7 +65,7 @@
#include "ntqlistview.h"
#include "ntqcheckbox.h"
#include "ntqradiobutton.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqprogressbar.h"
#include "ntqlistbox.h"
#include "private/qdialogbuttons_p.h"
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index e19903c08..f8af1f282 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -60,7 +60,7 @@
#include "ntqtabwidget.h"
#include "ntqtabbar.h"
#include "ntqlistview.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqcleanuphandler.h"
#include "ntqdockwindow.h"
#include "tqobjectlist.h"
diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h
index 20d30e742..23bfd9337 100644
--- a/src/table/ntqtable.h
+++ b/src/table/ntqtable.h
@@ -46,11 +46,11 @@
#include "ntqpixmap.h"
#include "tqptrvector.h"
#include "ntqheader.h"
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
#include "tqptrlist.h"
#include "ntqguardedptr.h"
#include "ntqshared.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
#include "tqstringlist.h"
#endif // QT_H
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>
diff --git a/src/widgets/ntqlcdnumber.h b/src/widgets/ntqlcdnumber.h
index 780f4af28..e74de7cb6 100644
--- a/src/widgets/ntqlcdnumber.h
+++ b/src/widgets/ntqlcdnumber.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "ntqframe.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
#endif // QT_H
#ifndef TQT_NO_LCDNUMBER
diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h
index d8a5ca8ad..d167334d7 100644
--- a/src/widgets/ntqvalidator.h
+++ b/src/widgets/ntqvalidator.h
@@ -44,7 +44,7 @@
#ifndef QT_H
#include "tqobject.h"
#include "tqstring.h" // char*->TQString conversion
-#include "ntqregexp.h" // TQString->TQRegExp conversion
+#include "tqregexp.h" // TQString->TQRegExp conversion
#endif // QT_H
#ifndef TQT_NO_VALIDATOR
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index 6eeb59f05..edc62375e 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -41,7 +41,7 @@
#include "ntqbutton.h"
#ifndef TQT_NO_BUTTON
#include "ntqbuttongroup.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqpainter.h"
#include "tqtimer.h"
#include "ntqaccel.h"
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index 390a5b5c4..7c749998a 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -44,7 +44,7 @@
#include "ntqdrawutil.h"
#include "ntqpixmap.h"
#include "ntqpixmapcache.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqtextstream.h"
#include "ntqapplication.h"
#include "tqstyle.h"
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index 82177c182..2e2be8d8f 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -49,7 +49,7 @@
#include "tqtimer.h"
#include "ntqapplication.h"
#include "ntqlineedit.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "qeffects_p.h"
#include "tqstringlist.h"
#include "ntqcombobox.h"
diff --git a/src/widgets/qdial.cpp b/src/widgets/qdial.cpp
index bea8feb74..741f2c70b 100644
--- a/src/widgets/qdial.cpp
+++ b/src/widgets/qdial.cpp
@@ -47,7 +47,7 @@
#include "ntqcolor.h"
#include "ntqapplication.h"
#include "ntqregion.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqstyle.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
#include "ntqaccessible.h"
diff --git a/src/widgets/qframe.cpp b/src/widgets/qframe.cpp
index 50ade1265..4ab1e729e 100644
--- a/src/widgets/qframe.cpp
+++ b/src/widgets/qframe.cpp
@@ -43,7 +43,7 @@
#include "ntqpainter.h"
#include "ntqdrawutil.h"
#include "ntqframe.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqstyle.h"
/*!
diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp
index 6f1c3e0e9..2803c6760 100644
--- a/src/widgets/qgroupbox.cpp
+++ b/src/widgets/qgroupbox.cpp
@@ -42,7 +42,7 @@
#ifndef TQT_NO_GROUPBOX
#include "ntqlayout.h"
#include "ntqpainter.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqaccel.h"
#include "ntqradiobutton.h"
#include "ntqfocusdata.h"
diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp
index 8128b9fc2..848ea25cc 100644
--- a/src/widgets/qheader.cpp
+++ b/src/widgets/qheader.cpp
@@ -43,7 +43,7 @@
#include "ntqpainter.h"
#include "ntqdrawutil.h"
#include "ntqpixmap.h"
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
#include "tqptrvector.h"
#include "ntqapplication.h"
#include "tqstyle.h"
diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp
index 7a5eae532..948dab440 100644
--- a/src/widgets/qlabel.cpp
+++ b/src/widgets/qlabel.cpp
@@ -45,7 +45,7 @@
#include "ntqaccel.h"
#include "ntqmovie.h"
#include "tqimage.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqpicture.h"
#include "ntqapplication.h"
#include "ntqsimplerichtext.h"
diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/qlcdnumber.cpp
index 05a5e9904..2036e3a80 100644
--- a/src/widgets/qlcdnumber.cpp
+++ b/src/widgets/qlcdnumber.cpp
@@ -40,7 +40,7 @@
#include "ntqlcdnumber.h"
#ifndef TQT_NO_LCDNUMBER
-#include "ntqbitarray.h"
+#include "tqbitarray.h"
#include "ntqpainter.h"
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index 1cac29c1e..16e1870af 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -46,7 +46,7 @@
#include "ntqlistbox.h"
#ifndef TQT_NO_LISTBOX
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
#include "ntqfontmetrics.h"
#include "ntqpainter.h"
#include "tqstrlist.h"
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index ea01ae82b..e0ad57d87 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -48,7 +48,7 @@
#include "tqptrlist.h"
#include "tqstrlist.h"
#include "ntqapplication.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqdatetime.h"
#include "tqptrdict.h"
#include "tqptrvector.h"
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp
index 2d82938b2..d8e9c1033 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/qmultilineedit.cpp
@@ -45,12 +45,12 @@
#include "ntqcursor.h"
#include "ntqclipboard.h"
#include "ntqpixmap.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "ntqapplication.h"
#include "tqdragobject.h"
#include "tqpopupmenu.h"
#include "tqtimer.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "../kernel/qrichtext_p.h"
diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp
index 25a852219..c9c01b86b 100644
--- a/src/widgets/qpushbutton.cpp
+++ b/src/widgets/qpushbutton.cpp
@@ -45,7 +45,7 @@
#include "ntqpainter.h"
#include "ntqdrawutil.h"
#include "ntqpixmap.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqpopupmenu.h"
#include "ntqguardedptr.h"
#include "ntqapplication.h"
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index 0a80076e8..681610ffe 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -45,7 +45,7 @@
#include "ntqdrawutil.h"
#include "ntqpixmap.h"
#include "ntqpixmapcache.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqtextstream.h"
#include "ntqapplication.h"
#include "tqstyle.h"
diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp
index 2ac1e377b..58cb9a3bd 100644
--- a/src/widgets/qscrollbar.cpp
+++ b/src/widgets/qscrollbar.cpp
@@ -41,7 +41,7 @@
#include "ntqscrollbar.h"
#ifndef TQT_NO_SCROLLBAR
#include "ntqpainter.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqapplication.h"
#include "tqtimer.h"
#include "tqstyle.h"
diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp
index 4600ff826..902fda036 100644
--- a/src/widgets/qslider.cpp
+++ b/src/widgets/qslider.cpp
@@ -43,7 +43,7 @@
#include "ntqpainter.h"
#include "ntqdrawutil.h"
#include "tqtimer.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqapplication.h"
#include "tqstyle.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp
index d088c8ac0..d068a581b 100644
--- a/src/widgets/qspinbox.cpp
+++ b/src/widgets/qspinbox.cpp
@@ -44,7 +44,7 @@
#include "ntqcursor.h"
#include "ntqpushbutton.h"
#include "ntqpainter.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqlineedit.h"
#include "ntqvalidator.h"
#include "ntqpixmapcache.h"
diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp
index 515ca8763..0994e892a 100644
--- a/src/widgets/qsplitter.cpp
+++ b/src/widgets/qsplitter.cpp
@@ -44,9 +44,9 @@
#include "ntqlayout.h"
#include "../kernel/qlayoutengine_p.h"
#include "ntqapplication.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqdrawutil.h"
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
#include "tqobjectlist.h"
#include "ntqpainter.h"
#include "tqptrlist.h"
diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp
index e88c02e24..50c452489 100644
--- a/src/widgets/qtabbar.cpp
+++ b/src/widgets/qtabbar.cpp
@@ -39,7 +39,7 @@
#include "ntqtabbar.h"
#ifndef TQT_NO_TABBAR
#include "ntqaccel.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqtoolbutton.h"
#include "tqtooltip.h"
#include "ntqapplication.h"
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp
index 3d44f5cdb..be6186222 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/qtabwidget.cpp
@@ -44,7 +44,7 @@
#include "ntqtabbar.h"
#include "ntqapplication.h"
#include "tqwidgetstack.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqaccel.h"
#include "tqstyle.h"
#include "ntqpainter.h"
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index ca0ed7dd0..41f9aa9d5 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -47,7 +47,7 @@
#include "tqtoolbutton.h"
#include "ntqshared.h"
#include "ntqcursor.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqtooltip.h"
#include "ntqsimplerichtext.h"
#include "tqstylesheet.h"
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index 6703ef82d..e00b9c159 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -60,11 +60,11 @@
#include "ntqcursor.h"
#include "ntqapplication.h"
#include "tqtextedit.h"
-#include "ntqmemarray.h"
+#include "tqmemarray.h"
#include "tqptrlist.h"
#include "ntqvbox.h"
#include "tqtooltip.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqpixmapcache.h"
#include "tqptrdict.h"
#include "tqstringlist.h"
diff --git a/src/widgets/tqiconview.h b/src/widgets/tqiconview.h
index a15d4baae..7b52985b7 100644
--- a/src/widgets/tqiconview.h
+++ b/src/widgets/tqiconview.h
@@ -49,7 +49,7 @@
#include "tqsize.h"
#include "ntqfont.h" // TQString->TQFont conversion
#include "tqdragobject.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqpicture.h"
#endif // QT_H
diff --git a/src/widgets/tqmainwindow.cpp b/src/widgets/tqmainwindow.cpp
index beeb3ab55..be6f08cd2 100644
--- a/src/widgets/tqmainwindow.cpp
+++ b/src/widgets/tqmainwindow.cpp
@@ -44,7 +44,7 @@
#include "tqtimer.h"
#include "ntqlayout.h"
#include "tqobjectlist.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
#include "ntqapplication.h"
#include "tqptrlist.h"
#include "tqmap.h"
@@ -58,7 +58,7 @@
#include "tqtooltip.h"
#include "tqdatetime.h"
#include "ntqwhatsthis.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "ntqdockarea.h"
#include "tqstringlist.h"
#include "tqstyle.h"
diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp
index e579c6c73..9827c25bc 100644
--- a/src/widgets/tqtextbrowser.cpp
+++ b/src/widgets/tqtextbrowser.cpp
@@ -51,7 +51,7 @@
#include "ntqfile.h"
#include "tqtextstream.h"
#include "ntqlayout.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
#include "tqtimer.h"
#include "tqimage.h"
#include "ntqsimplerichtext.h"
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index 8505f6c5b..9e9b6d8fc 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -69,7 +69,7 @@
#include "tqdragobject.h"
#include "ntqurl.h"
#include "ntqcursor.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "tqpopupmenu.h"
#include "tqptrstack.h"
#include "ntqmetaobject.h"
diff --git a/src/widgets/tqwidgetstack.h b/src/widgets/tqwidgetstack.h
index 774ccb45c..5858ea06c 100644
--- a/src/widgets/tqwidgetstack.h
+++ b/src/widgets/tqwidgetstack.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "ntqframe.h"
-#include "ntqintdict.h"
+#include "tqintdict.h"
#include "tqptrdict.h"
#endif // QT_H
diff --git a/src/workspace/tqworkspace.cpp b/src/workspace/tqworkspace.cpp
index 06d4da4f5..5ced56cef 100644
--- a/src/workspace/tqworkspace.cpp
+++ b/src/workspace/tqworkspace.cpp
@@ -61,7 +61,7 @@
#include "tqimage.h"
#include "ntqscrollbar.h"
#include "tqstyle.h"
-#include "ntqbitmap.h"
+#include "tqbitmap.h"
// magic non-mdi things
#include "tqtimer.h"
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp
index 852cc7424..da1c85ade 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/qsvgdevice.cpp
@@ -44,7 +44,7 @@
#include "ntqpaintdevicemetrics.h"
#include "ntqfile.h"
#include "tqmap.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "tqvaluelist.h"
#include "tqtextstream.h"
#include "tqimage.h"
diff --git a/src/xml/tqdom.cpp b/src/xml/tqdom.cpp
index c233afa76..af3ef4810 100644
--- a/src/xml/tqdom.cpp
+++ b/src/xml/tqdom.cpp
@@ -44,11 +44,11 @@
#include "tqxml.h"
#include "tqptrlist.h"
-#include "ntqdict.h"
+#include "tqdict.h"
#include "tqtextstream.h"
#include "tqtextcodec.h"
#include "ntqiodevice.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "ntqbuffer.h"
/*
diff --git a/src/xml/tqxml.cpp b/src/xml/tqxml.cpp
index f9fa14b77..052a44f89 100644
--- a/src/xml/tqxml.cpp
+++ b/src/xml/tqxml.cpp
@@ -41,7 +41,7 @@
#include "tqxml.h"
#include "tqtextcodec.h"
#include "ntqbuffer.h"
-#include "ntqregexp.h"
+#include "tqregexp.h"
#include "tqptrstack.h"
#include "tqmap.h"
#include "tqvaluestack.h"