summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/sqlite/config.h2
-rw-r--r--src/3rdparty/sqlite/trolltech.patch2
-rw-r--r--src/codecs/tqfontcodecs_p.h2
-rw-r--r--src/codecs/tqjpunicode.h2
-rw-r--r--src/codecs/tqtextcodecplugin.h2
-rw-r--r--src/dialogs/tqfiledialog.cpp4
-rw-r--r--src/inputmethod/ntqinputcontextplugin.h2
-rw-r--r--src/kernel/ntqaccessible.h2
-rw-r--r--src/kernel/ntqgif.h2
-rw-r--r--src/kernel/ntqinputcontext.h2
-rw-r--r--src/kernel/ntqjpegio.h2
-rw-r--r--src/kernel/ntqnamespace.h2
-rw-r--r--src/kernel/ntqpolygonscanner.h2
-rw-r--r--src/kernel/ntqt.h18
-rw-r--r--src/kernel/qaccel.cpp2
-rw-r--r--src/kernel/qapplication.cpp2
-rw-r--r--src/kernel/qapplication_x11.cpp2
-rw-r--r--src/kernel/qdnd_x11.cpp2
-rw-r--r--src/kernel/qinputcontext_p.h2
-rw-r--r--src/kernel/qt_kernel.pri8
-rw-r--r--src/kernel/qt_pch.h2
-rw-r--r--src/kernel/qvariant.cpp2
-rw-r--r--src/kernel/tqcolor_p.cpp2
-rw-r--r--src/kernel/tqdropsite.h2
-rw-r--r--src/kernel/tqfontengine_p.h2
-rw-r--r--src/kernel/tqgplugin.cpp (renamed from src/kernel/qgplugin.cpp)2
-rw-r--r--src/kernel/tqgplugin.h (renamed from src/kernel/ntqgplugin.h)0
-rw-r--r--src/kernel/tqguardedptr.cpp (renamed from src/kernel/qguardedptr.cpp)4
-rw-r--r--src/kernel/tqguardedptr.h (renamed from src/kernel/ntqguardedptr.h)0
-rw-r--r--src/kernel/tqimageformatplugin.h2
-rw-r--r--src/kernel/tqlocalfs.cpp2
-rw-r--r--src/kernel/tqobjectdefs.h2
-rw-r--r--src/kernel/tqsignal.cpp2
-rw-r--r--src/kernel/tqsimplerichtext.cpp2
-rw-r--r--src/kernel/tqsizepolicy.h2
-rw-r--r--src/kernel/tqt.h2
-rw-r--r--src/kernel/tqtextengine_p.h2
-rw-r--r--src/kernel/tqurloperator.cpp2
-rw-r--r--src/kernel/tqwidget.cpp2
-rw-r--r--src/libqt.map4
-rw-r--r--src/moc/moc.pro12
-rw-r--r--src/network/tqnetwork.h2
-rw-r--r--src/qt.pro4
-rw-r--r--src/sql/drivers/cache/tqsqlcachedresult.h2
-rw-r--r--src/sql/tqsql.h2
-rw-r--r--src/sql/tqsqldatabase.cpp2
-rw-r--r--src/sql/tqsqldriverplugin.h2
-rw-r--r--src/sql/tqsqlmanager_p.h2
-rw-r--r--src/styles/tqmotifplusstyle.cpp2
-rw-r--r--src/styles/tqsgistyle.h2
-rw-r--r--src/styles/tqstylefactory.cpp2
-rw-r--r--src/styles/tqstyleplugin.h2
-rw-r--r--src/table/tqtable.cpp2
-rw-r--r--src/table/tqtable.h2
-rw-r--r--src/tools/ntqgeneric.h46
-rw-r--r--src/tools/ntqshared.h2
-rw-r--r--src/tools/ntqtl.h2
-rw-r--r--src/tools/qcom_p.h2
-rw-r--r--src/tools/qpluginmanager_p.h2
-rw-r--r--src/tools/qt_tools.pri29
-rw-r--r--src/tools/qwinexport.cpp2
-rw-r--r--src/tools/tqasciicache.h2
-rw-r--r--src/tools/tqasciidict.h2
-rw-r--r--src/tools/tqcache.h2
-rw-r--r--src/tools/tqdeepcopy.h2
-rw-r--r--src/tools/tqdict.h2
-rw-r--r--src/tools/tqdir.h2
-rw-r--r--src/tools/tqfile.cpp2
-rw-r--r--src/tools/tqfileinfo_unix.cpp2
-rw-r--r--src/tools/tqgarray.cpp (renamed from src/tools/qgarray.cpp)6
-rw-r--r--src/tools/tqgarray.h (renamed from src/tools/ntqgarray.h)0
-rw-r--r--src/tools/tqgcache.cpp (renamed from src/tools/qgcache.cpp)6
-rw-r--r--src/tools/tqgcache.h (renamed from src/tools/ntqgcache.h)4
-rw-r--r--src/tools/tqgdict.cpp (renamed from src/tools/qgdict.cpp)4
-rw-r--r--src/tools/tqgdict.h (renamed from src/tools/ntqgdict.h)0
-rw-r--r--src/tools/tqglist.cpp (renamed from src/tools/qglist.cpp)10
-rw-r--r--src/tools/tqglist.h (renamed from src/tools/ntqglist.h)0
-rw-r--r--src/tools/tqglobal.cpp (renamed from src/tools/qglobal.cpp)6
-rw-r--r--src/tools/tqglobal.h (renamed from src/tools/ntqglobal.h)0
-rw-r--r--src/tools/tqgpluginmanager.cpp (renamed from src/tools/qgpluginmanager.cpp)2
-rw-r--r--src/tools/tqgpluginmanager_p.h (renamed from src/tools/qgpluginmanager_p.h)0
-rw-r--r--src/tools/tqgvector.cpp (renamed from src/tools/qgvector.cpp)6
-rw-r--r--src/tools/tqgvector.h (renamed from src/tools/ntqgvector.h)0
-rw-r--r--src/tools/tqintcache.h2
-rw-r--r--src/tools/tqintdict.h2
-rw-r--r--src/tools/tqiodevice.h2
-rw-r--r--src/tools/tqmap.h2
-rw-r--r--src/tools/tqmemarray.h2
-rw-r--r--src/tools/tqmutex.h2
-rw-r--r--src/tools/tqpair.h2
-rw-r--r--src/tools/tqptrcollection.h2
-rw-r--r--src/tools/tqptrdict.h2
-rw-r--r--src/tools/tqptrlist.h2
-rw-r--r--src/tools/tqptrqueue.h2
-rw-r--r--src/tools/tqptrstack.h2
-rw-r--r--src/tools/tqptrvector.h2
-rw-r--r--src/tools/tqsemaphore.h2
-rw-r--r--src/tools/tqthreadstorage.h2
-rw-r--r--src/tools/tqwaitcondition.h2
-rw-r--r--src/widgets/ntqdockarea.h2
-rw-r--r--src/widgets/ntqrangecontrol.h2
-rw-r--r--src/widgets/qdockwindow.cpp2
-rw-r--r--src/widgets/qeffects.cpp2
-rw-r--r--src/widgets/qrangecontrol.cpp2
-rw-r--r--src/widgets/tqbutton.cpp2
-rw-r--r--src/widgets/tqdialogbuttons.cpp2
-rw-r--r--src/widgets/tqiconview.cpp2
-rw-r--r--src/widgets/tqlineedit.cpp2
-rw-r--r--src/widgets/tqlistbox.cpp4
-rw-r--r--src/widgets/tqmenubar.cpp2
-rw-r--r--src/widgets/tqmenudata.cpp2
-rw-r--r--src/widgets/tqmenudata.h2
-rw-r--r--src/widgets/tqpopupmenu.cpp2
-rw-r--r--src/widgets/tqpushbutton.cpp2
-rw-r--r--src/widgets/tqtextedit.cpp2
-rw-r--r--src/widgets/tqtoolbutton.cpp2
-rw-r--r--src/widgets/tqtooltip.cpp2
-rw-r--r--src/widgets/tqwidgetplugin.h2
-rw-r--r--src/workspace/tqworkspace.cpp2
119 files changed, 158 insertions, 205 deletions
diff --git a/src/3rdparty/sqlite/config.h b/src/3rdparty/sqlite/config.h
index 833636614..0a06d8eb6 100644
--- a/src/3rdparty/sqlite/config.h
+++ b/src/3rdparty/sqlite/config.h
@@ -1,4 +1,4 @@
-#include <ntqglobal.h>
+#include <tqglobal.h>
#include <ntqconfig.h>
#ifndef TQT_POINTER_SIZE
diff --git a/src/3rdparty/sqlite/trolltech.patch b/src/3rdparty/sqlite/trolltech.patch
index db15f9b6c..715155b46 100644
--- a/src/3rdparty/sqlite/trolltech.patch
+++ b/src/3rdparty/sqlite/trolltech.patch
@@ -3,7 +3,7 @@ diff -du ./config.h /home/harald/troll/qt-3.3/src/3rdparty/sqlite/config.h
+++ /home/harald/troll/qt-3.3/src/3rdparty/sqlite/config.h 2004-01-08 14:29:23.000000000 +0100
@@ -1 +1,23 @@
-#define SQLITE_PTR_SZ 4
-+#include <ntqglobal.h>
++#include <tqglobal.h>
+#include <ntqconfig.h>
+
+#ifndef TQT_POINTER_SIZE
diff --git a/src/codecs/tqfontcodecs_p.h b/src/codecs/tqfontcodecs_p.h
index 4a8c1c602..423b7f1e3 100644
--- a/src/codecs/tqfontcodecs_p.h
+++ b/src/codecs/tqfontcodecs_p.h
@@ -51,7 +51,7 @@
//
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqtextcodec.h"
#endif // QT_H
diff --git a/src/codecs/tqjpunicode.h b/src/codecs/tqjpunicode.h
index 2daa893b7..fc04af2b9 100644
--- a/src/codecs/tqjpunicode.h
+++ b/src/codecs/tqjpunicode.h
@@ -71,7 +71,7 @@
#define TQJPUNICODE_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#ifndef TQT_NO_BIG_CODECS
diff --git a/src/codecs/tqtextcodecplugin.h b/src/codecs/tqtextcodecplugin.h
index 13a83733d..4ae572749 100644
--- a/src/codecs/tqtextcodecplugin.h
+++ b/src/codecs/tqtextcodecplugin.h
@@ -42,7 +42,7 @@
#define TQTEXTCODECPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp
index cf4eed715..4ae0469d6 100644
--- a/src/dialogs/tqfiledialog.cpp
+++ b/src/dialogs/tqfiledialog.cpp
@@ -65,7 +65,7 @@
#include "ntqcursor.h"
#include "tqdragobject.h"
#include "tqfile.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqhbox.h"
#include "tqheader.h"
#include "tqlabel.h"
@@ -115,7 +115,7 @@
#ifdef TQ_WS_MAC
#include "qt_mac.h"
-extern TQString qt_mac_precomposeFileName(const TQString &); // qglobal.cpp
+extern TQString qt_mac_precomposeFileName(const TQString &); // tqglobal.cpp
#undef check
#endif
diff --git a/src/inputmethod/ntqinputcontextplugin.h b/src/inputmethod/ntqinputcontextplugin.h
index ed1f2eaf4..a67d0b26a 100644
--- a/src/inputmethod/ntqinputcontextplugin.h
+++ b/src/inputmethod/ntqinputcontextplugin.h
@@ -39,7 +39,7 @@
#define TQINPUTCONTEXTPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/src/kernel/ntqaccessible.h b/src/kernel/ntqaccessible.h
index 4ea410f4c..25b12077e 100644
--- a/src/kernel/ntqaccessible.h
+++ b/src/kernel/ntqaccessible.h
@@ -43,7 +43,7 @@
#include "tqobject.h"
#include <private/qcom_p.h>
#include "tqrect.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqmemarray.h"
#endif // QT_H
diff --git a/src/kernel/ntqgif.h b/src/kernel/ntqgif.h
index f5fee77be..9d1658a0c 100644
--- a/src/kernel/ntqgif.h
+++ b/src/kernel/ntqgif.h
@@ -49,7 +49,7 @@
#define TQGIF_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#ifndef QT_BUILTIN_GIF_READER
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index 0ab8e728a..426aa796a 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -40,7 +40,7 @@
#ifndef QT_H
#include "tqobject.h"
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqevent.h"
#include "tqstring.h"
#include "tqptrlist.h"
diff --git a/src/kernel/ntqjpegio.h b/src/kernel/ntqjpegio.h
index bb27c5dc8..10ae8d7cf 100644
--- a/src/kernel/ntqjpegio.h
+++ b/src/kernel/ntqjpegio.h
@@ -41,7 +41,7 @@
#ifndef TQJPEGIO_H
#define TQJPEGIO_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef TQT_NO_IMAGEIO_JPEG
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index dd2cdedab..cace88141 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -42,7 +42,7 @@
#define TQNAMESPACE_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
diff --git a/src/kernel/ntqpolygonscanner.h b/src/kernel/ntqpolygonscanner.h
index 3d281da7c..2ab2c8e37 100644
--- a/src/kernel/ntqpolygonscanner.h
+++ b/src/kernel/ntqpolygonscanner.h
@@ -42,7 +42,7 @@
#define TQPOLYGONSCANNER_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
class TQPointArray;
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 875323a6d..52caddc35 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -15,14 +15,14 @@
#ifndef QT_H
#define QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "ntqfeatures.h"
#include "ntqshared.h"
#include "tqptrcollection.h"
-#include "ntqglist.h"
+#include "tqglist.h"
#include "tqobjectdefs.h"
#include "ntqnamespace.h"
-#include "ntqgarray.h"
+#include "tqgarray.h"
#include "tqmemarray.h"
#include "tqcstring.h"
#include "tqstring.h"
@@ -30,7 +30,7 @@
#include "tqiodevice.h"
#include "ntqkeysequence.h"
#include "ntqwindowdefs.h"
-#include "ntqgdict.h"
+#include "tqgdict.h"
#include "tqfont.h"
#include "tqdatastream.h"
#include "tqpair.h"
@@ -86,17 +86,17 @@
#include "tqnetworkprotocol.h"
#include <tqeuckrcodec.h>
#include <tqgb18030codec.h>
-#include "ntqgcache.h"
+#include "tqgcache.h"
#include <ntqgif.h>
#include <tqglcolormap.h>
#include <tqcache.h>
#include <tqdropsite.h>
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include <tqgrid.h>
#include "ntqrangecontrol.h"
#include "tqbuttongroup.h"
#include <tqdatetimeedit.h>
-#include "ntqgvector.h"
+#include "tqgvector.h"
#include "tqhbox.h"
#include <tqhbuttongroup.h>
#include <tqhgroupbox.h>
@@ -139,7 +139,7 @@
#include "tqmutex.h"
#include <tqnetwork.h>
#include <tqftp.h>
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include <tqobjectcleanuphandler.h>
#include "tqsqlfield.h"
#include <tqobjectdict.h>
@@ -281,7 +281,7 @@
#include "private/tqlayoutengine_p.h"
#include "private/qcomlibrary_p.h"
#include "private/qeffects_p.h"
-#include "private/qgpluginmanager_p.h"
+#include "private/tqgpluginmanager_p.h"
#include "private/qinternal_p.h"
#include "private/tqsqldriverinterface_p.h"
#include "private/tqsqlmanager_p.h"
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index fabd7dcf4..e2f55f01e 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -47,7 +47,7 @@
#include "tqwidget.h"
#include "tqptrlist.h"
#include "tqwhatsthis.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqstatusbar.h"
#include "ntqdockwindow.h"
#include "tqsignalslotimp.h"
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index d48805c3a..7abbbd56f 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -283,7 +283,7 @@
\headerfile ntqnamespace.h
\headerfile ntqwindowdefs.h
- \headerfile ntqglobal.h
+ \headerfile tqglobal.h
*/
/*! \enum TQt::HANDLE
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 18a0eb7f0..f3252b296 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -81,7 +81,7 @@
#include "tqsessionmanager.h"
#include "tqvaluelist.h"
#include "tqdict.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqclipboard.h"
#include "tqwhatsthis.h" // ######## dependency
#include "tqsettings.h"
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index 5194ee878..c35bca0a4 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -48,7 +48,7 @@
#include "tqintdict.h"
#include "tqdatetime.h"
#include "tqdict.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqdragobject.h"
#include "tqobjectlist.h"
#include "ntqcursor.h"
diff --git a/src/kernel/qinputcontext_p.h b/src/kernel/qinputcontext_p.h
index 0e0f8da0c..37ba52b6c 100644
--- a/src/kernel/qinputcontext_p.h
+++ b/src/kernel/qinputcontext_p.h
@@ -52,7 +52,7 @@
//
//
-#include "ntqglobal.h"
+#include "tqglobal.h"
class TQKeyEvent;
class TQWidget;
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index bd93c7c29..a31cab804 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -29,7 +29,7 @@ kernel {
$$KERNEL_P/tqfontdata_p.h \
$$KERNEL_H/tqfontinfo.h \
$$KERNEL_H/tqfontmetrics.h \
- $$KERNEL_H/ntqguardedptr.h \
+ $$KERNEL_H/tqguardedptr.h \
$$KERNEL_H/ntqgif.h \
$$KERNEL_H/tqiconset.h \
$$KERNEL_H/tqimage.h \
@@ -91,7 +91,7 @@ kernel {
$$KERNEL_H/ntqvariant.h \
$$KERNEL_P/qrichtext_p.h \
$$KERNEL_P/qinternal_p.h \
- $$KERNEL_H/ntqgplugin.h \
+ $$KERNEL_H/tqgplugin.h \
$$KERNEL_H/tqsimplerichtext.h \
$$KERNEL_CPP/qscriptengine_p.h \
$$KERNEL_CPP/tqtextengine_p.h \
@@ -213,7 +213,7 @@ kernel {
$$KERNEL_CPP/qfocusdata.cpp \
$$KERNEL_CPP/tqfont.cpp \
$$KERNEL_CPP/tqfontdatabase.cpp \
- $$KERNEL_CPP/qguardedptr.cpp \
+ $$KERNEL_CPP/tqguardedptr.cpp \
$$KERNEL_CPP/tqiconset.cpp \
$$KERNEL_CPP/tqimage.cpp \
$$KERNEL_CPP/tqimageformatplugin.cpp \
@@ -260,7 +260,7 @@ kernel {
$$KERNEL_CPP/qrichtext.cpp \
$$KERNEL_CPP/qinternal.cpp \
$$KERNEL_CPP/qrichtext_p.cpp \
- $$KERNEL_CPP/qgplugin.cpp \
+ $$KERNEL_CPP/tqgplugin.cpp \
$$KERNEL_CPP/tqsimplerichtext.cpp \
$$KERNEL_CPP/qscriptengine.cpp \
$$KERNEL_CPP/tqtextlayout.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index 908254769..611076c97 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -27,7 +27,7 @@
#include <tqbitmap.h>
#include <ntqcursor.h>
#include <tqdatetime.h>
-#include <ntqglobal.h>
+#include <tqglobal.h>
#include <tqimage.h>
#include <ntqmetaobject.h> // All moc genereated code has this include
#include <tqobject.h>
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index ac3157676..884ef1ed5 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -475,7 +475,7 @@ void TQVariant::Private::clear()
\value UInt an unsigned int
Note that TQt's definition of bool depends on the compiler.
- \c ntqglobal.h has the system-dependent definition of bool.
+ \c tqglobal.h has the system-dependent definition of bool.
*/
/*!
diff --git a/src/kernel/tqcolor_p.cpp b/src/kernel/tqcolor_p.cpp
index 0a91f5c90..d1462f43f 100644
--- a/src/kernel/tqcolor_p.cpp
+++ b/src/kernel/tqcolor_p.cpp
@@ -39,7 +39,7 @@
**
**********************************************************************/
-#include "ntqglobal.h"
+#include "tqglobal.h"
#if defined(Q_CC_BOR)
// needed for qsort() because of a std namespace problem on Borland
#include "qplatformdefs.h"
diff --git a/src/kernel/tqdropsite.h b/src/kernel/tqdropsite.h
index 3e95cdc3f..9ee72b4d8 100644
--- a/src/kernel/tqdropsite.h
+++ b/src/kernel/tqdropsite.h
@@ -41,7 +41,7 @@
#ifndef QT_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#endif
diff --git a/src/kernel/tqfontengine_p.h b/src/kernel/tqfontengine_p.h
index 3dba677ca..559972746 100644
--- a/src/kernel/tqfontengine_p.h
+++ b/src/kernel/tqfontengine_p.h
@@ -38,7 +38,7 @@
#define TQFONTENGINE_P_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#ifdef TQ_WS_WIN
diff --git a/src/kernel/qgplugin.cpp b/src/kernel/tqgplugin.cpp
index ca5b4131f..c0cfd8f47 100644
--- a/src/kernel/qgplugin.cpp
+++ b/src/kernel/tqgplugin.cpp
@@ -36,7 +36,7 @@
**
**********************************************************************/
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#ifndef TQT_NO_COMPONENT
diff --git a/src/kernel/ntqgplugin.h b/src/kernel/tqgplugin.h
index 88212515b..88212515b 100644
--- a/src/kernel/ntqgplugin.h
+++ b/src/kernel/tqgplugin.h
diff --git a/src/kernel/qguardedptr.cpp b/src/kernel/tqguardedptr.cpp
index 5102d094b..a08fe1aae 100644
--- a/src/kernel/qguardedptr.cpp
+++ b/src/kernel/tqguardedptr.cpp
@@ -38,10 +38,10 @@
**
**********************************************************************/
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
/*!
- \class TQGuardedPtr ntqguardedptr.h
+ \class TQGuardedPtr tqguardedptr.h
\brief The TQGuardedPtr class is a template class that provides guarded pointers to TQObjects.
\ingroup objectmodel
diff --git a/src/kernel/ntqguardedptr.h b/src/kernel/tqguardedptr.h
index 29ef8b8c7..29ef8b8c7 100644
--- a/src/kernel/ntqguardedptr.h
+++ b/src/kernel/tqguardedptr.h
diff --git a/src/kernel/tqimageformatplugin.h b/src/kernel/tqimageformatplugin.h
index 6940f18b6..83dbad7f2 100644
--- a/src/kernel/tqimageformatplugin.h
+++ b/src/kernel/tqimageformatplugin.h
@@ -40,7 +40,7 @@
#define TQIMAGEFORMATPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/src/kernel/tqlocalfs.cpp b/src/kernel/tqlocalfs.cpp
index b6b525c8d..5adc77fb2 100644
--- a/src/kernel/tqlocalfs.cpp
+++ b/src/kernel/tqlocalfs.cpp
@@ -47,7 +47,7 @@
#include "tqurlinfo.h"
#include "ntqapplication.h"
#include "tqurloperator.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
//#define TQLOCALFS_DEBUG
diff --git a/src/kernel/tqobjectdefs.h b/src/kernel/tqobjectdefs.h
index ba5e12b88..422299850 100644
--- a/src/kernel/tqobjectdefs.h
+++ b/src/kernel/tqobjectdefs.h
@@ -42,7 +42,7 @@
#define TQOBJECTDEFS_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
diff --git a/src/kernel/tqsignal.cpp b/src/kernel/tqsignal.cpp
index 22e325031..3be5bb960 100644
--- a/src/kernel/tqsignal.cpp
+++ b/src/kernel/tqsignal.cpp
@@ -40,7 +40,7 @@
#include "tqsignal.h"
#include "ntqmetaobject.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
/*!
\class TQSignal tqsignal.h
diff --git a/src/kernel/tqsimplerichtext.cpp b/src/kernel/tqsimplerichtext.cpp
index 2288a5692..eccf9190d 100644
--- a/src/kernel/tqsimplerichtext.cpp
+++ b/src/kernel/tqsimplerichtext.cpp
@@ -54,7 +54,7 @@ public:
void adjustSize(TQPainter *p = 0);
};
-// Pull this private function in from qglobal.cpp
+// Pull this private function in from tqglobal.cpp
extern unsigned int qt_int_sqrt( unsigned int n );
void TQSimpleRichTextData::adjustSize(TQPainter *p) {
diff --git a/src/kernel/tqsizepolicy.h b/src/kernel/tqsizepolicy.h
index 2c764d33b..f6fac3885 100644
--- a/src/kernel/tqsizepolicy.h
+++ b/src/kernel/tqsizepolicy.h
@@ -42,7 +42,7 @@
#define TQSIZEPOLICY_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
// Documentation is in qabstractlayout.cpp.
diff --git a/src/kernel/tqt.h b/src/kernel/tqt.h
index 723759d55..665f07b1a 100644
--- a/src/kernel/tqt.h
+++ b/src/kernel/tqt.h
@@ -22,7 +22,7 @@ Boston, MA 02110-1301, USA.
#ifndef TQT_H
#define TQT_H
-#include <ntqglobal.h>
+#include <tqglobal.h>
#define Qt TQt
diff --git a/src/kernel/tqtextengine_p.h b/src/kernel/tqtextengine_p.h
index 608bc06de..d1a467f2b 100644
--- a/src/kernel/tqtextengine_p.h
+++ b/src/kernel/tqtextengine_p.h
@@ -38,7 +38,7 @@
#define TQTEXTENGINE_P_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqstring.h"
#include "ntqnamespace.h"
#include <private/tqfontdata_p.h>
diff --git a/src/kernel/tqurloperator.cpp b/src/kernel/tqurloperator.cpp
index f7705bc2e..d8567e467 100644
--- a/src/kernel/tqurloperator.cpp
+++ b/src/kernel/tqurloperator.cpp
@@ -47,7 +47,7 @@
#include "tqmap.h"
#include "tqdir.h"
#include "tqptrdict.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
//#define TQURLOPERATOR_DEBUG
diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp
index 0b27e2564..1e9a809cb 100644
--- a/src/kernel/tqwidget.cpp
+++ b/src/kernel/tqwidget.cpp
@@ -55,7 +55,7 @@
#include "ntqcleanuphandler.h"
#include "tqstyle.h"
#include "ntqmetaobject.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#if defined(TQT_THREAD_SUPPORT)
#include "tqthread.h"
#endif
diff --git a/src/libqt.map b/src/libqt.map
index 42e353c76..bc20283fb 100644
--- a/src/libqt.map
+++ b/src/libqt.map
@@ -2,7 +2,7 @@
global:
extern "C++"
{
- QGuardedPtrPrivate::*
+ TQGuardedPtrPrivate::*
};
local:
extern "C++"
@@ -19,7 +19,7 @@
TQHttpRequest::*;
TQHttpResponseHeader::*;
TQMainWindowLayout::*;
- Q*Private::*; # collides with QGuardedPtrPrivate
+ Q*Private::*; # collides with TQGuardedPtrPrivate
QPSPrinter*;
Q*RegExpEngine::*;
Q*SvgDevice::*;
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index e1b56f668..e26c4893f 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -20,11 +20,11 @@ SOURCES = ../tools/tqbuffer.cpp \
../tools/tqfile.cpp \
../tools/tqdir.cpp \
../tools/tqfileinfo.cpp \
- ../tools/qgarray.cpp \
- ../tools/qgdict.cpp \
- ../tools/qglist.cpp \
- ../tools/qglobal.cpp \
- ../tools/qgvector.cpp \
+ ../tools/tqgarray.cpp \
+ ../tools/tqgdict.cpp \
+ ../tools/tqglist.cpp \
+ ../tools/tqglobal.cpp \
+ ../tools/tqgvector.cpp \
../tools/tqiodevice.cpp \
../tools/tqregexp.cpp \
../tools/tqstring.cpp \
@@ -34,7 +34,7 @@ SOURCES = ../tools/tqbuffer.cpp \
../tools/tqtextstream.cpp \
../tools/tqbitarray.cpp \
../tools/tqmap.cpp \
- ../tools/qgcache.cpp \
+ ../tools/tqgcache.cpp \
../codecs/tqtextcodec.cpp \
../codecs/tqutfcodec.cpp
diff --git a/src/network/tqnetwork.h b/src/network/tqnetwork.h
index 7f6de06d3..ec612b175 100644
--- a/src/network/tqnetwork.h
+++ b/src/network/tqnetwork.h
@@ -42,7 +42,7 @@
#define TQNETWORK_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
diff --git a/src/qt.pro b/src/qt.pro
index 01b74fe97..903d9b396 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -169,14 +169,14 @@ wince-* {
CONFIG -= incremental
message( ...removing plugin stuff... (not permanent) )
HEADERS -= $$TOOLS_CPP/qcomlibrary.h \
- $$KERNEL_CPP/ntqgplugin.h \
+ $$KERNEL_CPP/tqgplugin.h \
$$KERNEL_CPP/tqimageformatplugin.h \
$$STYLES_CPP/tqstyleplugin.h \
$$CODECS_CPP/tqtextcodecplugin.h \
$$WIDGETS_CPP/tqwidgetplugin.h
SOURCES -= $$TOOLS_CPP/qcomlibrary.cpp \
- $$KERNEL_CPP/qgplugin.cpp \
+ $$KERNEL_CPP/tqgplugin.cpp \
$$KERNEL_CPP/tqimageformatplugin.cpp \
$$STYLES_CPP/tqstyleplugin.cpp \
$$CODECS_CPP/tqtextcodecplugin.cpp \
diff --git a/src/sql/drivers/cache/tqsqlcachedresult.h b/src/sql/drivers/cache/tqsqlcachedresult.h
index 11aa63d99..f49ffea89 100644
--- a/src/sql/drivers/cache/tqsqlcachedresult.h
+++ b/src/sql/drivers/cache/tqsqlcachedresult.h
@@ -51,7 +51,7 @@
//
//
-#include <ntqglobal.h>
+#include <tqglobal.h>
#include <ntqvariant.h>
#include <tqptrvector.h>
#include <tqvaluevector.h>
diff --git a/src/sql/tqsql.h b/src/sql/tqsql.h
index 28a8204b2..845b1f890 100644
--- a/src/sql/tqsql.h
+++ b/src/sql/tqsql.h
@@ -42,7 +42,7 @@
#define TQSQL_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
diff --git a/src/sql/tqsqldatabase.cpp b/src/sql/tqsqldatabase.cpp
index 301025914..4a7657248 100644
--- a/src/sql/tqsqldatabase.cpp
+++ b/src/sql/tqsqldatabase.cpp
@@ -82,7 +82,7 @@
#include <private/qpluginmanager_p.h>
#include <private/tqsqlextension_p.h>
#include "tqobject.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "ntqcleanuphandler.h"
#include "tqdict.h"
#include <stdlib.h>
diff --git a/src/sql/tqsqldriverplugin.h b/src/sql/tqsqldriverplugin.h
index 81c4958a8..bb72834af 100644
--- a/src/sql/tqsqldriverplugin.h
+++ b/src/sql/tqsqldriverplugin.h
@@ -42,7 +42,7 @@
#define TQSQLDRIVERPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/src/sql/tqsqlmanager_p.h b/src/sql/tqsqlmanager_p.h
index bb3010f2b..8b667d68e 100644
--- a/src/sql/tqsqlmanager_p.h
+++ b/src/sql/tqsqlmanager_p.h
@@ -54,7 +54,7 @@
//
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqstring.h"
#include "tqstringlist.h"
#include "tqsql.h"
diff --git a/src/styles/tqmotifplusstyle.cpp b/src/styles/tqmotifplusstyle.cpp
index eec496cda..d1c40292a 100644
--- a/src/styles/tqmotifplusstyle.cpp
+++ b/src/styles/tqmotifplusstyle.cpp
@@ -58,7 +58,7 @@
#include "tqscrollbar.h"
#include "tqtabbar.h"
#include "tqtoolbar.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqlayout.h"
diff --git a/src/styles/tqsgistyle.h b/src/styles/tqsgistyle.h
index d09ad4cf4..9a28713f1 100644
--- a/src/styles/tqsgistyle.h
+++ b/src/styles/tqsgistyle.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "tqmotifstyle.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqwidget.h"
#endif // QT_H
diff --git a/src/styles/tqstylefactory.cpp b/src/styles/tqstylefactory.cpp
index f31c8e0f0..7a5706c64 100644
--- a/src/styles/tqstylefactory.cpp
+++ b/src/styles/tqstylefactory.cpp
@@ -62,7 +62,7 @@
#endif
#if !defined( TQT_NO_STYLE_MAC ) && defined( TQ_WS_MAC )
-TQString p2qstring(const unsigned char *c); //qglobal.cpp
+TQString p2qstring(const unsigned char *c); //tqglobal.cpp
#include "qt_mac.h"
#include "qmacstyle_mac.h"
#endif
diff --git a/src/styles/tqstyleplugin.h b/src/styles/tqstyleplugin.h
index 13d83c453..e7e703d30 100644
--- a/src/styles/tqstyleplugin.h
+++ b/src/styles/tqstyleplugin.h
@@ -42,7 +42,7 @@
#define TQSTYLEPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/src/table/tqtable.cpp b/src/table/tqtable.cpp
index 220d9af7c..002fcc502 100644
--- a/src/table/tqtable.cpp
+++ b/src/table/tqtable.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqglobal.h"
+#include "tqglobal.h"
#if defined(Q_CC_BOR)
// needed for qsort() because of a std namespace problem on Borland
#include "qplatformdefs.h"
diff --git a/src/table/tqtable.h b/src/table/tqtable.h
index f952a4d78..51393ae76 100644
--- a/src/table/tqtable.h
+++ b/src/table/tqtable.h
@@ -48,7 +48,7 @@
#include "tqheader.h"
#include "tqmemarray.h"
#include "tqptrlist.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "ntqshared.h"
#include "tqintdict.h"
#include "tqstringlist.h"
diff --git a/src/tools/ntqgeneric.h b/src/tools/ntqgeneric.h
deleted file mode 100644
index b82f18849..000000000
--- a/src/tools/ntqgeneric.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Macros for pasting tokens; utilized by our generic classes
-**
-** Created : 920529
-**
-** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the tools module of the TQt GUI Toolkit.
-**
-** This file may be used under the terms of the GNU General
-** Public License versions 2.0 or 3.0 as published by the Free
-** Software Foundation and appearing in the files LICENSE.GPL2
-** and LICENSE.GPL3 included in the packaging of this file.
-** Alternatively you may (at your option) use any later version
-** of the GNU General Public License if such license has been
-** publicly approved by Trolltech ASA (or its successors, if any)
-** and the KDE Free TQt Foundation.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/.
-** If you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** This file may be used under the terms of the Q Public License as
-** defined by Trolltech ASA and appearing in the file LICENSE.TQPL
-** included in the packaging of this file. Licensees holding valid TQt
-** Commercial licenses may use this file in accordance with the TQt
-** Commercial License Agreement provided with the Software.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
-** herein.
-**
-**********************************************************************/
-
-#ifndef TQGENERIC_H
-#define TQGENERIC_H
-
-#error "do not include ntqgeneric.h any more"
-
-#endif // TQGENERIC_H
diff --git a/src/tools/ntqshared.h b/src/tools/ntqshared.h
index fbd4dd457..62dcc8e35 100644
--- a/src/tools/ntqshared.h
+++ b/src/tools/ntqshared.h
@@ -42,7 +42,7 @@
#define TQSHARED_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
struct TQ_EXPORT TQShared
diff --git a/src/tools/ntqtl.h b/src/tools/ntqtl.h
index 712129746..df5a7cdb6 100644
--- a/src/tools/ntqtl.h
+++ b/src/tools/ntqtl.h
@@ -42,7 +42,7 @@
#define TQTL_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqtextstream.h"
#include "tqstring.h"
#endif // QT_H
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index e0c31a67d..623c920dc 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -289,7 +289,7 @@ public: \
#endif
#endif
-// this is duplicated at Q_PLUGIN_VERIFICATION_DATA in ntqgplugin.h
+// this is duplicated at Q_PLUGIN_VERIFICATION_DATA in tqgplugin.h
// NOTE: if you change pattern, you MUST change the pattern in
// qcomlibrary.cpp as well. changing the pattern will break all
// backwards compatibility as well (no old plugins will be loaded).
diff --git a/src/tools/qpluginmanager_p.h b/src/tools/qpluginmanager_p.h
index 8c29aaf84..4e42eed0f 100644
--- a/src/tools/qpluginmanager_p.h
+++ b/src/tools/qpluginmanager_p.h
@@ -54,7 +54,7 @@
//
#ifndef QT_H
-#include "qgpluginmanager_p.h"
+#include "tqgpluginmanager_p.h"
#endif // QT_H
#ifndef TQT_NO_COMPONENT
diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri
index 5eb816580..8a2ce897f 100644
--- a/src/tools/qt_tools.pri
+++ b/src/tools/qt_tools.pri
@@ -21,14 +21,13 @@ tools {
$$TOOLS_H/tqfile.h \
$$TOOLS_P/tqfiledefs_p.h \
$$TOOLS_H/tqfileinfo.h \
- $$TOOLS_H/ntqgarray.h \
- $$TOOLS_H/ntqgcache.h \
- $$TOOLS_H/ntqgdict.h \
- $$TOOLS_H/ntqgeneric.h \
- $$TOOLS_H/ntqglist.h \
- $$TOOLS_H/ntqglobal.h \
- $$TOOLS_P/qgpluginmanager_p.h \
- $$TOOLS_H/ntqgvector.h \
+ $$TOOLS_H/tqgarray.h \
+ $$TOOLS_H/tqgcache.h \
+ $$TOOLS_H/tqgdict.h \
+ $$TOOLS_H/tqglist.h \
+ $$TOOLS_H/tqglobal.h \
+ $$TOOLS_P/tqgpluginmanager_p.h \
+ $$TOOLS_H/tqgvector.h \
$$TOOLS_H/tqintcache.h \
$$TOOLS_H/tqintdict.h \
$$TOOLS_H/tqiodevice.h \
@@ -117,13 +116,13 @@ tools {
$$TOOLS_CPP/tqdir.cpp \
$$TOOLS_CPP/tqfile.cpp \
$$TOOLS_CPP/tqfileinfo.cpp \
- $$TOOLS_CPP/qgarray.cpp \
- $$TOOLS_CPP/qgcache.cpp \
- $$TOOLS_CPP/qgdict.cpp \
- $$TOOLS_CPP/qglist.cpp \
- $$TOOLS_CPP/qglobal.cpp \
- $$TOOLS_CPP/qgpluginmanager.cpp \
- $$TOOLS_CPP/qgvector.cpp \
+ $$TOOLS_CPP/tqgarray.cpp \
+ $$TOOLS_CPP/tqgcache.cpp \
+ $$TOOLS_CPP/tqgdict.cpp \
+ $$TOOLS_CPP/tqglist.cpp \
+ $$TOOLS_CPP/tqglobal.cpp \
+ $$TOOLS_CPP/tqgpluginmanager.cpp \
+ $$TOOLS_CPP/tqgvector.cpp \
$$TOOLS_CPP/tqiodevice.cpp \
$$TOOLS_CPP/qlibrary.cpp \
$$TOOLS_CPP/tqlocale.cpp \
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index ca5bccb72..82d5ebc61 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -3,7 +3,7 @@
#include <tqcanvas.h>
#include <ntqaccessible.h>
#include <ntqconnection.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include <tqobject.h>
#include <tqpoint.h>
#include <tqrect.h>
diff --git a/src/tools/tqasciicache.h b/src/tools/tqasciicache.h
index 7323635c6..879e5b759 100644
--- a/src/tools/tqasciicache.h
+++ b/src/tools/tqasciicache.h
@@ -42,7 +42,7 @@
#define TQASCIICACHE_H
#ifndef QT_H
-#include "ntqgcache.h"
+#include "tqgcache.h"
#endif // QT_H
diff --git a/src/tools/tqasciidict.h b/src/tools/tqasciidict.h
index ef09bc025..7489e1822 100644
--- a/src/tools/tqasciidict.h
+++ b/src/tools/tqasciidict.h
@@ -42,7 +42,7 @@
#define TQASCIIDICT_H
#ifndef QT_H
-#include "ntqgdict.h"
+#include "tqgdict.h"
#endif // QT_H
template<class type>
diff --git a/src/tools/tqcache.h b/src/tools/tqcache.h
index 9d747e346..8225d7fd1 100644
--- a/src/tools/tqcache.h
+++ b/src/tools/tqcache.h
@@ -42,7 +42,7 @@
#define TQCACHE_H
#ifndef QT_H
-#include "ntqgcache.h"
+#include "tqgcache.h"
#endif // QT_H
template<class type>
diff --git a/src/tools/tqdeepcopy.h b/src/tools/tqdeepcopy.h
index abe1fc8f1..7963154d4 100644
--- a/src/tools/tqdeepcopy.h
+++ b/src/tools/tqdeepcopy.h
@@ -42,7 +42,7 @@
#define TQDEEPCOPY_H
#ifndef QT_H
-# include "ntqglobal.h"
+# include "tqglobal.h"
#endif // QT_H
template <class T>
diff --git a/src/tools/tqdict.h b/src/tools/tqdict.h
index d363538d0..f82579919 100644
--- a/src/tools/tqdict.h
+++ b/src/tools/tqdict.h
@@ -42,7 +42,7 @@
#define TQDICT_H
#ifndef QT_H
-#include "ntqgdict.h"
+#include "tqgdict.h"
#endif // QT_H
template<class type>
diff --git a/src/tools/tqdir.h b/src/tools/tqdir.h
index 41ba93e8c..697d29f95 100644
--- a/src/tools/tqdir.h
+++ b/src/tools/tqdir.h
@@ -42,7 +42,7 @@
#define TQDIR_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqstrlist.h"
#include "tqfileinfo.h"
#endif // QT_H
diff --git a/src/tools/tqfile.cpp b/src/tools/tqfile.cpp
index 06a127fc2..d67578929 100644
--- a/src/tools/tqfile.cpp
+++ b/src/tools/tqfile.cpp
@@ -628,7 +628,7 @@ TQString locale_decoder( const TQCString &localFileName )
#ifndef TQ_WS_MAC
return TQString::fromLocal8Bit(localFileName);
#else
- extern TQString qt_mac_precomposeFileName(const TQString &); // qglobal.cpp
+ extern TQString qt_mac_precomposeFileName(const TQString &); // tqglobal.cpp
return qt_mac_precomposeFileName(TQString::fromLocal8Bit(localFileName));
#endif
}
diff --git a/src/tools/tqfileinfo_unix.cpp b/src/tools/tqfileinfo_unix.cpp
index 300515e3a..98ed9050e 100644
--- a/src/tools/tqfileinfo_unix.cpp
+++ b/src/tools/tqfileinfo_unix.cpp
@@ -177,7 +177,7 @@ TQString TQFileInfo::readLink() const
if(FSNewAlias(0, &fref, &alias) == noErr && alias) {
CFStringRef cfstr;
if(FSCopyAliasInfo(alias, 0, 0, &cfstr, 0, 0) == noErr) {
- TQString cfstring2qstring(CFStringRef str); //qglobal.cpp
+ TQString cfstring2qstring(CFStringRef str); //tqglobal.cpp
return cfstring2qstring(cfstr);
}
}
diff --git a/src/tools/qgarray.cpp b/src/tools/tqgarray.cpp
index 1470d100e..b8d500adf 100644
--- a/src/tools/qgarray.cpp
+++ b/src/tools/tqgarray.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqglobal.h"
+#include "tqglobal.h"
#if defined(Q_CC_BOR)
// needed for qsort() because of a std namespace problem on Borland
# include "qplatformdefs.h"
@@ -48,7 +48,7 @@
#endif
#define TQGARRAY_CPP
-#include "ntqgarray.h"
+#include "tqgarray.h"
#include <stdlib.h>
#include <string.h>
@@ -94,7 +94,7 @@
*/
/*!
- \class TQGArray ntqgarray.h
+ \class TQGArray tqgarray.h
\reentrant
\ingroup shared
\ingroup collection
diff --git a/src/tools/ntqgarray.h b/src/tools/tqgarray.h
index 4d239dd66..4d239dd66 100644
--- a/src/tools/ntqgarray.h
+++ b/src/tools/tqgarray.h
diff --git a/src/tools/qgcache.cpp b/src/tools/tqgcache.cpp
index 95f75534e..471b59f6c 100644
--- a/src/tools/qgcache.cpp
+++ b/src/tools/tqgcache.cpp
@@ -38,13 +38,13 @@
**
**********************************************************************/
-#include "ntqgcache.h"
+#include "tqgcache.h"
#include "tqptrlist.h"
#include "tqdict.h"
#include "tqstring.h"
/*!
- \class TQGCache ntqgcache.h
+ \class TQGCache tqgcache.h
\reentrant
\ingroup shared
\ingroup collection
@@ -672,7 +672,7 @@ void TQGCache::statistics() const
*****************************************************************************/
/*!
- \class TQGCacheIterator ntqgcache.h
+ \class TQGCacheIterator tqgcache.h
\reentrant
\ingroup shared
\ingroup collection
diff --git a/src/tools/ntqgcache.h b/src/tools/tqgcache.h
index 9082af762..5fea6c901 100644
--- a/src/tools/ntqgcache.h
+++ b/src/tools/tqgcache.h
@@ -43,8 +43,8 @@
#ifndef QT_H
#include "tqptrcollection.h"
-#include "ntqglist.h"
-#include "ntqgdict.h"
+#include "tqglist.h"
+#include "tqgdict.h"
#endif // QT_H
diff --git a/src/tools/qgdict.cpp b/src/tools/tqgdict.cpp
index dd35d64e3..894881a61 100644
--- a/src/tools/qgdict.cpp
+++ b/src/tools/tqgdict.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqgdict.h"
+#include "tqgdict.h"
#include "tqptrlist.h"
#include "tqstring.h"
#include "tqdatastream.h"
@@ -997,7 +997,7 @@ TQDataStream& TQGDict::write( TQDataStream &s ) const
*****************************************************************************/
/*!
- \class TQGDictIterator ntqgdict.h
+ \class TQGDictIterator tqgdict.h
\reentrant
\ingroup collection
\brief The TQGDictIterator class is an internal class for implementing TQDictIterator and TQIntDictIterator.
diff --git a/src/tools/ntqgdict.h b/src/tools/tqgdict.h
index 9a941ecb7..9a941ecb7 100644
--- a/src/tools/ntqgdict.h
+++ b/src/tools/tqgdict.h
diff --git a/src/tools/qglist.cpp b/src/tools/tqglist.cpp
index 7ffa66d4d..def2fd4e3 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/tqglist.cpp
@@ -38,8 +38,8 @@
**
**********************************************************************/
-#include "ntqglist.h"
-#include "ntqgvector.h"
+#include "tqglist.h"
+#include "tqgvector.h"
#include "tqdatastream.h"
#include "tqvaluelist.h"
@@ -48,7 +48,7 @@
#endif // defined(TQT_THREAD_SUPPORT)
/*!
- \class TQLNode ntqglist.h
+ \class TQLNode tqglist.h
\reentrant
\ingroup collection
\brief The TQLNode class is an internal class for the TQPtrList template collection.
@@ -78,7 +78,7 @@
/*!
- \class TQGList ntqglist.h
+ \class TQGList tqglist.h
\reentrant
\ingroup collection
\brief The TQGList class is an internal class for implementing TQt collection classes.
@@ -1379,7 +1379,7 @@ TQLNode* TQGList::erase( TQLNode* it )
*****************************************************************************/
/*!
- \class TQGListIterator ntqglist.h
+ \class TQGListIterator tqglist.h
\reentrant
\ingroup collection
\brief The TQGListIterator class is an internal class for implementing TQPtrListIterator.
diff --git a/src/tools/ntqglist.h b/src/tools/tqglist.h
index 95a5786d3..95a5786d3 100644
--- a/src/tools/ntqglist.h
+++ b/src/tools/tqglist.h
diff --git a/src/tools/qglobal.cpp b/src/tools/tqglobal.cpp
index 5e9f38a8a..d33bfdf95 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/tqglobal.cpp
@@ -667,7 +667,7 @@ void tqSystemWarning( const char* msg, int code )
Prints a warning message containing the source code file name and
line number if \a test is FALSE.
- This is really a macro defined in \c ntqglobal.h.
+ This is really a macro defined in \c tqglobal.h.
Q_ASSERT is useful for testing pre- and post-conditions.
@@ -677,7 +677,7 @@ void tqSystemWarning( const char* msg, int code )
// File: div.cpp
//
- #include <ntqglobal.h>
+ #include <tqglobal.h>
int divide( int a, int b )
{
@@ -704,7 +704,7 @@ void tqSystemWarning( const char* msg, int code )
If \a p is 0, prints a warning message containing the source code file
name and line number, saying that the program ran out of memory.
- This is really a macro defined in \c ntqglobal.h.
+ This is really a macro defined in \c tqglobal.h.
Example:
\code
diff --git a/src/tools/ntqglobal.h b/src/tools/tqglobal.h
index 64115edf3..64115edf3 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/tqglobal.h
diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/tqgpluginmanager.cpp
index b2b5bf63d..d53e4f5f5 100644
--- a/src/tools/qgpluginmanager.cpp
+++ b/src/tools/tqgpluginmanager.cpp
@@ -36,7 +36,7 @@
**
**********************************************************************/
-#include "qgpluginmanager_p.h"
+#include "tqgpluginmanager_p.h"
#ifndef TQT_NO_COMPONENT
#include "qcomlibrary_p.h"
#include "tqmap.h"
diff --git a/src/tools/qgpluginmanager_p.h b/src/tools/tqgpluginmanager_p.h
index 069b7e27a..069b7e27a 100644
--- a/src/tools/qgpluginmanager_p.h
+++ b/src/tools/tqgpluginmanager_p.h
diff --git a/src/tools/qgvector.cpp b/src/tools/tqgvector.cpp
index 03b502c0b..001b777a4 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/tqgvector.cpp
@@ -38,15 +38,15 @@
**
**********************************************************************/
-#include "ntqglobal.h"
+#include "tqglobal.h"
#if defined(Q_CC_BOR)
// needed for qsort() because of a std namespace problem on Borland
#include "qplatformdefs.h"
#endif
#define TQGVECTOR_CPP
-#include "ntqgvector.h"
-#include "ntqglist.h"
+#include "tqgvector.h"
+#include "tqglist.h"
#include "tqstring.h"
#include "tqdatastream.h"
#include <stdlib.h>
diff --git a/src/tools/ntqgvector.h b/src/tools/tqgvector.h
index d1e8385df..d1e8385df 100644
--- a/src/tools/ntqgvector.h
+++ b/src/tools/tqgvector.h
diff --git a/src/tools/tqintcache.h b/src/tools/tqintcache.h
index 116618058..7a22d1cd5 100644
--- a/src/tools/tqintcache.h
+++ b/src/tools/tqintcache.h
@@ -42,7 +42,7 @@
#define TQINTCACHE_H
#ifndef QT_H
-#include "ntqgcache.h"
+#include "tqgcache.h"
#endif // QT_H
diff --git a/src/tools/tqintdict.h b/src/tools/tqintdict.h
index 162625855..4c20aa486 100644
--- a/src/tools/tqintdict.h
+++ b/src/tools/tqintdict.h
@@ -42,7 +42,7 @@
#define TQINTDICT_H
#ifndef QT_H
-#include "ntqgdict.h"
+#include "tqgdict.h"
#endif // QT_H
template<class type>
diff --git a/src/tools/tqiodevice.h b/src/tools/tqiodevice.h
index 712288d8e..d7cb31fae 100644
--- a/src/tools/tqiodevice.h
+++ b/src/tools/tqiodevice.h
@@ -42,7 +42,7 @@
#define TQIODEVICE_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqcstring.h"
#endif // QT_H
diff --git a/src/tools/tqmap.h b/src/tools/tqmap.h
index a173e7575..6a813dd6c 100644
--- a/src/tools/tqmap.h
+++ b/src/tools/tqmap.h
@@ -42,7 +42,7 @@
#define TQMAP_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "ntqshared.h"
#include "tqdatastream.h"
#include "tqpair.h"
diff --git a/src/tools/tqmemarray.h b/src/tools/tqmemarray.h
index 8a07bf9a9..1ea8c2ad5 100644
--- a/src/tools/tqmemarray.h
+++ b/src/tools/tqmemarray.h
@@ -42,7 +42,7 @@
#define TQMEMARRAY_H
#ifndef QT_H
-#include "ntqgarray.h"
+#include "tqgarray.h"
#endif // QT_H
diff --git a/src/tools/tqmutex.h b/src/tools/tqmutex.h
index c517c6355..8009d672d 100644
--- a/src/tools/tqmutex.h
+++ b/src/tools/tqmutex.h
@@ -42,7 +42,7 @@
#define TQMUTEX_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#if defined(TQT_THREAD_SUPPORT)
diff --git a/src/tools/tqpair.h b/src/tools/tqpair.h
index 5b197d8d4..8d487e38b 100644
--- a/src/tools/tqpair.h
+++ b/src/tools/tqpair.h
@@ -41,7 +41,7 @@
#define TQPAIR_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqdatastream.h"
#endif // QT_H
diff --git a/src/tools/tqptrcollection.h b/src/tools/tqptrcollection.h
index da6fc6670..424512627 100644
--- a/src/tools/tqptrcollection.h
+++ b/src/tools/tqptrcollection.h
@@ -41,7 +41,7 @@
#define TQPTRCOLLECTION_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
diff --git a/src/tools/tqptrdict.h b/src/tools/tqptrdict.h
index 181492bd9..c14c132c1 100644
--- a/src/tools/tqptrdict.h
+++ b/src/tools/tqptrdict.h
@@ -42,7 +42,7 @@
#define TQPTRDICT_H
#ifndef QT_H
-#include "ntqgdict.h"
+#include "tqgdict.h"
#endif // QT_H
template<class type>
diff --git a/src/tools/tqptrlist.h b/src/tools/tqptrlist.h
index 579c1b226..0fbea042b 100644
--- a/src/tools/tqptrlist.h
+++ b/src/tools/tqptrlist.h
@@ -40,7 +40,7 @@
#define TQPTRLIST_H
#ifndef QT_H
-#include "ntqglist.h"
+#include "tqglist.h"
#endif // QT_H
template<class type>
diff --git a/src/tools/tqptrqueue.h b/src/tools/tqptrqueue.h
index c905b4fd6..2cebf08f8 100644
--- a/src/tools/tqptrqueue.h
+++ b/src/tools/tqptrqueue.h
@@ -42,7 +42,7 @@
#define TQPTRQUEUE_H
#ifndef QT_H
-#include "ntqglist.h"
+#include "tqglist.h"
#endif // QT_H
template<class type>
diff --git a/src/tools/tqptrstack.h b/src/tools/tqptrstack.h
index 6f404f1b9..229f03ef9 100644
--- a/src/tools/tqptrstack.h
+++ b/src/tools/tqptrstack.h
@@ -42,7 +42,7 @@
#define TQPTRSTACK_H
#ifndef QT_H
-#include "ntqglist.h"
+#include "tqglist.h"
#endif // QT_H
template<class type>
diff --git a/src/tools/tqptrvector.h b/src/tools/tqptrvector.h
index b2e641e7a..764b5732d 100644
--- a/src/tools/tqptrvector.h
+++ b/src/tools/tqptrvector.h
@@ -42,7 +42,7 @@
#define TQPTRVECTOR_H
#ifndef QT_H
-#include "ntqgvector.h"
+#include "tqgvector.h"
#endif // QT_H
template<class type>
diff --git a/src/tools/tqsemaphore.h b/src/tools/tqsemaphore.h
index 0dc8e81de..0524fcc67 100644
--- a/src/tools/tqsemaphore.h
+++ b/src/tools/tqsemaphore.h
@@ -42,7 +42,7 @@
#define TQSEMAPHORE_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#if defined(TQT_THREAD_SUPPORT)
diff --git a/src/tools/tqthreadstorage.h b/src/tools/tqthreadstorage.h
index 588621237..42319ccd6 100644
--- a/src/tools/tqthreadstorage.h
+++ b/src/tools/tqthreadstorage.h
@@ -42,7 +42,7 @@
#ifdef TQT_THREAD_SUPPORT
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
class TQ_EXPORT TQThreadStorageData
diff --git a/src/tools/tqwaitcondition.h b/src/tools/tqwaitcondition.h
index 503d5d6c9..4ce262134 100644
--- a/src/tools/tqwaitcondition.h
+++ b/src/tools/tqwaitcondition.h
@@ -42,7 +42,7 @@
#define TQWAITCONDITION_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#if defined(TQT_THREAD_SUPPORT)
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h
index 10a62debd..9ccdc21d8 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -47,7 +47,7 @@
#include "ntqdockwindow.h"
#include "tqlayout.h"
#include "tqvaluelist.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqtextstream.h"
#endif // QT_H
diff --git a/src/widgets/ntqrangecontrol.h b/src/widgets/ntqrangecontrol.h
index 0afb75ed8..39f2e2abc 100644
--- a/src/widgets/ntqrangecontrol.h
+++ b/src/widgets/ntqrangecontrol.h
@@ -42,7 +42,7 @@
#define TQRANGECONTROL_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqframe.h"
#endif // QT_H
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 1c056828e..bfe89fcda 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -53,7 +53,7 @@
#include "tqmainwindow.h"
#include "tqtimer.h"
#include "tqtooltip.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "ntqcursor.h"
#include "tqstyle.h"
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index b98de479f..5fce0e854 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -46,7 +46,7 @@
#include "tqimage.h"
#include "tqtimer.h"
#include "tqdatetime.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqscrollview.h"
/*
diff --git a/src/widgets/qrangecontrol.cpp b/src/widgets/qrangecontrol.cpp
index 2aa8f86c6..95056e578 100644
--- a/src/widgets/qrangecontrol.cpp
+++ b/src/widgets/qrangecontrol.cpp
@@ -40,7 +40,7 @@
#include "ntqrangecontrol.h"
#ifndef TQT_NO_RANGECONTROL
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include <limits.h>
static bool sumOutOfRange(int current, int add);
diff --git a/src/widgets/tqbutton.cpp b/src/widgets/tqbutton.cpp
index e29ae1546..d44c5baa0 100644
--- a/src/widgets/tqbutton.cpp
+++ b/src/widgets/tqbutton.cpp
@@ -49,7 +49,7 @@
#include "ntqapplication.h"
#include "tqpushbutton.h"
#include "tqradiobutton.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "../kernel/qinternal_p.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
diff --git a/src/widgets/tqdialogbuttons.cpp b/src/widgets/tqdialogbuttons.cpp
index 939384281..cbc791ebb 100644
--- a/src/widgets/tqdialogbuttons.cpp
+++ b/src/widgets/tqdialogbuttons.cpp
@@ -41,7 +41,7 @@
#include <ntqapplication.h>
#include <tqpushbutton.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include <tqmap.h>
#include <ntqvariant.h>
#ifndef TQT_NO_DIALOG
diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp
index 70462bc05..e897ccc42 100644
--- a/src/widgets/tqiconview.cpp
+++ b/src/widgets/tqiconview.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqglobal.h"
+#include "tqglobal.h"
#if defined(Q_CC_BOR)
// needed for qsort() because of a std namespace problem on Borland
#include "qplatformdefs.h"
diff --git a/src/widgets/tqlineedit.cpp b/src/widgets/tqlineedit.cpp
index 558069752..b781b4814 100644
--- a/src/widgets/tqlineedit.cpp
+++ b/src/widgets/tqlineedit.cpp
@@ -57,7 +57,7 @@
#include "tqtimer.h"
#include "tqpopupmenu.h"
#include "tqstringlist.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqstyle.h"
#include "tqwhatsthis.h"
#include "../kernel/qinternal_p.h"
diff --git a/src/widgets/tqlistbox.cpp b/src/widgets/tqlistbox.cpp
index 96aa747c1..fcda9ac5f 100644
--- a/src/widgets/tqlistbox.cpp
+++ b/src/widgets/tqlistbox.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqglobal.h"
+#include "tqglobal.h"
#if defined(Q_CC_BOR)
// needed for qsort() because of a std namespace problem on Borland
#include "qplatformdefs.h"
@@ -57,7 +57,7 @@
#include "tqstringlist.h"
#include "tqstyle.h"
#include "tqpopupmenu.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#if defined(QT_ACCESSIBILITY_SUPPORT)
#include "ntqaccessible.h"
#endif
diff --git a/src/widgets/tqmenubar.cpp b/src/widgets/tqmenubar.cpp
index b288f6280..6432d432b 100644
--- a/src/widgets/tqmenubar.cpp
+++ b/src/widgets/tqmenubar.cpp
@@ -49,7 +49,7 @@
#include "tqpainter.h"
#include "ntqdrawutil.h"
#include "ntqapplication.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqlayout.h"
#include "ntqcleanuphandler.h"
#include "../kernel/qinternal_p.h"
diff --git a/src/widgets/tqmenudata.cpp b/src/widgets/tqmenudata.cpp
index c3e773e24..5a3872d31 100644
--- a/src/widgets/tqmenudata.cpp
+++ b/src/widgets/tqmenudata.cpp
@@ -43,7 +43,7 @@
#include "tqpopupmenu.h"
#include "tqmenubar.h"
#include "ntqapplication.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
class TQMenuItemData {
public:
diff --git a/src/widgets/tqmenudata.h b/src/widgets/tqmenudata.h
index 5abace6a2..b5e92cb6a 100644
--- a/src/widgets/tqmenudata.h
+++ b/src/widgets/tqmenudata.h
@@ -42,7 +42,7 @@
#define TQMENUDATA_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqiconset.h" // conversion TQPixmap->TQIconset
#include "ntqkeysequence.h"
#include "tqstring.h"
diff --git a/src/widgets/tqpopupmenu.cpp b/src/widgets/tqpopupmenu.cpp
index 26aa7f9cc..8030b23e8 100644
--- a/src/widgets/tqpopupmenu.cpp
+++ b/src/widgets/tqpopupmenu.cpp
@@ -50,7 +50,7 @@
#include "tqtimer.h"
#include "tqwhatsthis.h"
#include "tqobjectlist.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "qeffects_p.h"
#include "ntqcursor.h"
#include "tqstyle.h"
diff --git a/src/widgets/tqpushbutton.cpp b/src/widgets/tqpushbutton.cpp
index 105bae12a..2b329e9d7 100644
--- a/src/widgets/tqpushbutton.cpp
+++ b/src/widgets/tqpushbutton.cpp
@@ -47,7 +47,7 @@
#include "tqpixmap.h"
#include "tqbitmap.h"
#include "tqpopupmenu.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "ntqapplication.h"
#include "tqtoolbar.h"
#include "tqstyle.h"
diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp
index d57724ab3..1d5805f6d 100644
--- a/src/widgets/tqtextedit.cpp
+++ b/src/widgets/tqtextedit.cpp
@@ -76,7 +76,7 @@
#include "tqtextbrowser.h"
#include <private/qucom_p.h>
#include "private/tqsyntaxhighlighter_p.h"
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#ifndef TQT_NO_ACCEL
#include <ntqkeysequence.h>
diff --git a/src/widgets/tqtoolbutton.cpp b/src/widgets/tqtoolbutton.cpp
index 9872936e1..53d4b971f 100644
--- a/src/widgets/tqtoolbutton.cpp
+++ b/src/widgets/tqtoolbutton.cpp
@@ -54,7 +54,7 @@
#include "tqiconset.h"
#include "tqtimer.h"
#include "tqpopupmenu.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
class TQToolButtonPrivate
{
diff --git a/src/widgets/tqtooltip.cpp b/src/widgets/tqtooltip.cpp
index 7a9166452..ee0a097fe 100644
--- a/src/widgets/tqtooltip.cpp
+++ b/src/widgets/tqtooltip.cpp
@@ -41,7 +41,7 @@
#include "tqlabel.h"
#include "tqptrdict.h"
#include "ntqapplication.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqtimer.h"
#include "qeffects_p.h"
diff --git a/src/widgets/tqwidgetplugin.h b/src/widgets/tqwidgetplugin.h
index d1cf9b257..68b26b4f7 100644
--- a/src/widgets/tqwidgetplugin.h
+++ b/src/widgets/tqwidgetplugin.h
@@ -42,7 +42,7 @@
#define TQWIDGETPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#include "tqiconset.h"
#endif // QT_H
diff --git a/src/workspace/tqworkspace.cpp b/src/workspace/tqworkspace.cpp
index 62b8e2732..48973398a 100644
--- a/src/workspace/tqworkspace.cpp
+++ b/src/workspace/tqworkspace.cpp
@@ -51,7 +51,7 @@
#include "ntqcursor.h"
#include "tqpopupmenu.h"
#include "tqmenubar.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqiconset.h"
#include "../widgets/tqwidgetresizehandler_p.h"
#include "ntqfocusdata.h"