summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--doc/classchart.doc2
-rw-r--r--doc/collect.doc2
-rw-r--r--doc/debug.doc2
-rw-r--r--doc/html/annotated.html2
-rw-r--r--doc/html/classchart.html2
-rw-r--r--doc/html/classes.html2
-rw-r--r--doc/html/debug.html2
-rw-r--r--doc/html/drawdemo-example.html2
-rw-r--r--doc/html/functions.html14
-rw-r--r--doc/html/headers.html4
-rw-r--r--doc/html/hierarchy.html2
-rw-r--r--doc/html/index262
-rw-r--r--doc/html/mainclasses.html2
-rw-r--r--doc/html/ntqapplication.html6
-rw-r--r--doc/html/ntqvariant.html2
-rw-r--r--doc/html/object.html2
-rw-r--r--doc/html/objectmodel.html2
-rw-r--r--doc/html/qaccessible-h.html2
-rw-r--r--doc/html/qdockarea-h.html2
-rw-r--r--doc/html/qnamespace-h.html2
-rw-r--r--doc/html/qrangecontrol-h.html2
-rw-r--r--doc/html/qt.dcf24
-rw-r--r--doc/html/titleindex8
-rw-r--r--doc/html/toplevel-example.html2
-rw-r--r--doc/html/tqasciicache-h.html2
-rw-r--r--doc/html/tqasciidict-h.html2
-rw-r--r--doc/html/tqcache-h.html2
-rw-r--r--doc/html/tqdeepcopy-h.html2
-rw-r--r--doc/html/tqdict-h.html2
-rw-r--r--doc/html/tqdir-h.html2
-rw-r--r--doc/html/tqdropsite-h.html2
-rw-r--r--doc/html/tqglobal-h.html (renamed from doc/html/qglobal-h.html)10
-rw-r--r--doc/html/tqguardedptr-h.html (renamed from doc/html/qguardedptr-h.html)10
-rw-r--r--doc/html/tqguardedptr-members.html (renamed from doc/html/qguardedptr-members.html)22
-rw-r--r--doc/html/tqguardedptr.html (renamed from doc/html/ntqguardedptr.html)16
-rw-r--r--doc/html/tqimageformatplugin-h.html2
-rw-r--r--doc/html/tqintcache-h.html2
-rw-r--r--doc/html/tqintdict-h.html2
-rw-r--r--doc/html/tqiodevice-h.html2
-rw-r--r--doc/html/tqmap-h.html2
-rw-r--r--doc/html/tqmemarray-h.html2
-rw-r--r--doc/html/tqmenudata-h.html2
-rw-r--r--doc/html/tqmutex-h.html2
-rw-r--r--doc/html/tqobject.html2
-rw-r--r--doc/html/tqpair-h.html2
-rw-r--r--doc/html/tqptrcollection-h.html2
-rw-r--r--doc/html/tqptrdict-h.html2
-rw-r--r--doc/html/tqptrlist-h.html2
-rw-r--r--doc/html/tqptrqueue-h.html2
-rw-r--r--doc/html/tqptrstack-h.html2
-rw-r--r--doc/html/tqptrvector-h.html2
-rw-r--r--doc/html/tqsemaphore-h.html2
-rw-r--r--doc/html/tqsgistyle-h.html2
-rw-r--r--doc/html/tqsizepolicy-h.html2
-rw-r--r--doc/html/tqsql-h.html2
-rw-r--r--doc/html/tqsqldriverplugin-h.html2
-rw-r--r--doc/html/tqstyleplugin-h.html2
-rw-r--r--doc/html/tqtable-h.html2
-rw-r--r--doc/html/tqtextcodecplugin-h.html2
-rw-r--r--doc/html/tqthreadstorage-h.html2
-rw-r--r--doc/html/tqwaitcondition-h.html2
-rw-r--r--doc/html/tqwidgetplugin-h.html2
-rw-r--r--doc/html/tutorial1-11.html2
-rw-r--r--doc/html/whatsthis2
-rw-r--r--doc/man/man3/tqapplication.3qt6
-rw-r--r--doc/man/man3/tqguardedptr.3qt60
-rw-r--r--doc/man/man3/tqmemarray.3qt2
-rw-r--r--doc/man/man3/tqobject.3qt2
-rw-r--r--doc/man/man3/tqptrlist.3qt4
-rw-r--r--doc/man/man3/tqvariant.3qt2
-rw-r--r--doc/object.doc2
-rw-r--r--doc/tqguardedptr.doc (renamed from doc/qguardedptr.doc)4
-rw-r--r--doc/tqmemarray.doc4
-rw-r--r--doc/tqptrlist.doc2
-rw-r--r--doc/tqptrvector.doc2
-rw-r--r--doc/tutorial.doc2
-rw-r--r--examples/demo/opengl/fbm.c2
-rw-r--r--examples/drawdemo/drawdemo.cpp2
-rw-r--r--examples/life/patterns.cpp2
-rw-r--r--examples/tetrix/tqdragapp.cpp2
-rw-r--r--examples/toplevel/options.ui2
-rw-r--r--examples/toplevel/toplevel.doc2
l---------include/ntqgarray.h1
l---------include/ntqgcache.h1
l---------include/ntqgdict.h1
l---------include/ntqgeneric.h1
l---------include/ntqglist.h1
l---------include/ntqglobal.h1
l---------include/ntqgplugin.h1
l---------include/ntqguardedptr.h1
l---------include/ntqgvector.h1
l---------include/private/qgpluginmanager_p.h1
l---------include/private/tqgpluginmanager_p.h1
l---------include/tqgarray.h1
l---------include/tqgcache.h1
l---------include/tqgdict.h1
l---------include/tqglist.h1
l---------include/tqglobal.h1
l---------include/tqgplugin.h1
l---------include/tqguardedptr.h1
l---------include/tqgvector.h1
-rw-r--r--mkspecs/aix-g++-64/qplatformdefs.h2
-rw-r--r--mkspecs/aix-g++/qplatformdefs.h2
-rw-r--r--mkspecs/aix-xlc-64/qplatformdefs.h2
-rw-r--r--mkspecs/aix-xlc/qplatformdefs.h2
-rw-r--r--mkspecs/bsdi-g++/qplatformdefs.h2
-rw-r--r--mkspecs/cygwin-g++/qplatformdefs.h2
-rw-r--r--mkspecs/darwin-g++/qplatformdefs.h2
-rw-r--r--mkspecs/dgux-g++/qplatformdefs.h2
-rw-r--r--mkspecs/dilos-g++/qplatformdefs.h2
-rw-r--r--mkspecs/freebsd-clang/qplatformdefs.h2
-rw-r--r--mkspecs/freebsd-g++/qplatformdefs.h2
-rw-r--r--mkspecs/freebsd-icc/qplatformdefs.h2
-rw-r--r--mkspecs/hpux-acc-64/qplatformdefs.h2
-rw-r--r--mkspecs/hpux-acc-o64/qplatformdefs.h2
-rw-r--r--mkspecs/hpux-acc/qplatformdefs.h2
-rw-r--r--mkspecs/hpux-cc/qplatformdefs.h2
-rw-r--r--mkspecs/hpux-g++-64/qplatformdefs.h2
-rw-r--r--mkspecs/hpux-g++/qplatformdefs.h2
-rw-r--r--mkspecs/hpuxi-acc-32/qplatformdefs.h2
-rw-r--r--mkspecs/hpuxi-acc-64/qplatformdefs.h2
-rw-r--r--mkspecs/hurd-g++/qplatformdefs.h2
-rw-r--r--mkspecs/irix-cc-64/qplatformdefs.h2
-rw-r--r--mkspecs/irix-cc-o32/qplatformdefs.h2
-rw-r--r--mkspecs/irix-cc/qplatformdefs.h2
-rw-r--r--mkspecs/irix-g++/qplatformdefs.h2
-rw-r--r--mkspecs/linux-clang/qplatformdefs.h2
-rw-r--r--mkspecs/linux-cxx/qplatformdefs.h2
-rw-r--r--mkspecs/linux-ecc-64/qplatformdefs.h2
-rw-r--r--mkspecs/linux-g++-32/qplatformdefs.h2
-rw-r--r--mkspecs/linux-g++-64/qplatformdefs.h2
-rw-r--r--mkspecs/linux-g++-sparc/qplatformdefs.h2
-rw-r--r--mkspecs/linux-g++/qplatformdefs.h2
-rw-r--r--mkspecs/linux-icc/qplatformdefs.h2
-rw-r--r--mkspecs/linux-kcc/qplatformdefs.h2
-rw-r--r--mkspecs/linux-kylix/qplatformdefs.h2
-rw-r--r--mkspecs/linux-pgcc/qplatformdefs.h2
-rw-r--r--mkspecs/lynxos-g++/qplatformdefs.h2
-rw-r--r--mkspecs/macx-g++/qplatformdefs.h2
-rw-r--r--mkspecs/macx-mwerks/qplatformdefs.h2
-rw-r--r--mkspecs/macx-pbuilder/qplatformdefs.h2
-rw-r--r--mkspecs/macx-xlc/qplatformdefs.h2
-rw-r--r--mkspecs/netbsd-g++/qplatformdefs.h2
-rw-r--r--mkspecs/openbsd-g++/qplatformdefs.h2
-rw-r--r--mkspecs/qnx-g++/qplatformdefs.h2
-rw-r--r--mkspecs/reliant-cds-64/qplatformdefs.h2
-rw-r--r--mkspecs/reliant-cds/qplatformdefs.h2
-rw-r--r--mkspecs/sco-cc/qplatformdefs.h2
-rw-r--r--mkspecs/sco-g++/qplatformdefs.h2
-rw-r--r--mkspecs/solaris-cc-64/qplatformdefs.h2
-rw-r--r--mkspecs/solaris-cc/qplatformdefs.h2
-rw-r--r--mkspecs/solaris-g++-64/qplatformdefs.h2
-rw-r--r--mkspecs/solaris-g++/qplatformdefs.h2
-rw-r--r--mkspecs/tru64-cxx/qplatformdefs.h2
-rw-r--r--mkspecs/tru64-g++/qplatformdefs.h2
-rw-r--r--mkspecs/unixware-cc/qplatformdefs.h2
-rw-r--r--mkspecs/unixware-g++/qplatformdefs.h2
-rw-r--r--mkspecs/win32-borland/qplatformdefs.h2
-rw-r--r--mkspecs/win32-g++/qplatformdefs.h2
-rw-r--r--mkspecs/win32-icc/qplatformdefs.h2
-rw-r--r--mkspecs/win32-msvc.net/qplatformdefs.h2
-rw-r--r--mkspecs/win32-msvc/qplatformdefs.h2
-rw-r--r--mkspecs/win32-msvc2005/qplatformdefs.h2
-rw-r--r--plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h2
-rw-r--r--plugins/src/inputmethods/simple/qsimpleinputcontext.cpp2
-rw-r--r--plugins/src/inputmethods/xim/qximinputcontext.h2
-rw-r--r--qmake/Makefile.unix40
-rw-r--r--qmake/Makefile.win32-g++30
-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
-rw-r--r--tools/assistant/main.cpp2
-rw-r--r--tools/assistant/mainwindow.ui2
-rw-r--r--tools/designer/designer/actiondnd.h2
-rw-r--r--tools/designer/designer/hierarchyview.h2
-rw-r--r--tools/designer/designer/layout.h2
-rw-r--r--tools/designer/designer/mainwindow.h2
-rw-r--r--tools/designer/designer/propertyeditor.h2
-rw-r--r--tools/designer/designer/sourceeditor.h2
-rw-r--r--tools/designer/designer/widgetfactory.h2
-rw-r--r--tools/designer/plugins/cppeditor/cppcompletion.h2
-rw-r--r--tools/designer/plugins/cppeditor/editorinterfaceimpl.h2
299 files changed, 573 insertions, 621 deletions
diff --git a/configure b/configure
index 88e503961..23595b420 100755
--- a/configure
+++ b/configure
@@ -881,7 +881,7 @@ done
[ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
cat > $outpath/src/tools/qconfig.cpp.new <<EOF
/* Install paths from configure */
-#include "ntqglobal.h"
+#include "tqglobal.h"
static const char QT_INSTALL_PREFIX [267] = "qt_nstpath=$QT_INSTALL_PREFIX";
static const char QT_INSTALL_BINS [267] = "qt_binpath=$QT_INSTALL_BINS";
diff --git a/doc/classchart.doc b/doc/classchart.doc
index 6e6451339..cf8d63488 100644
--- a/doc/classchart.doc
+++ b/doc/classchart.doc
@@ -256,7 +256,7 @@
<area shape="rect" coords="787,329,887,345" href="tqfontmetrics.html">
<area shape="rect" coords="785,345,887,363" href="tqgl.html">
<area shape="rect" coords="785,363,885,382" href="tqglcolormap.html">
-<area shape="rect" coords="785,383,885,398" href="ntqguardedptr.html">
+<area shape="rect" coords="785,383,885,398" href="tqguardedptr.html">
<area shape="rect" coords="785,398,884,416" href="tqhostaddress.html">
<area shape="rect" coords="786,417,884,434" href="tqhttpheader.html">
<area shape="rect" coords="786,434,885,452" href="tqiconset.html">
diff --git a/doc/collect.doc b/doc/collect.doc
index 12c2c3ee4..095912f27 100644
--- a/doc/collect.doc
+++ b/doc/collect.doc
@@ -105,7 +105,7 @@ The rest of this page dicusses the pointer-based containers.
\section1 Architecture of the pointer-based containers
There are four internal base classes for the pointer-based
-containers (QGCache, QGDict, QGList and QGVector) that operate on
+containers (TQGCache, TQGDict, TQGList and TQGVector) that operate on
void pointers. A thin template layer implements the actual
collections by casting item pointers to and from void pointers.
diff --git a/doc/debug.doc b/doc/debug.doc
index 20f3cef02..bc0ad42d3 100644
--- a/doc/debug.doc
+++ b/doc/debug.doc
@@ -91,7 +91,7 @@ often useful even without names.
\section1 Debugging Macros
-The header file \c ntqglobal.h contains many debugging macros and
+The header file \c tqglobal.h contains many debugging macros and
\c{#define}s.
Two important macros are:
diff --git a/doc/html/annotated.html b/doc/html/annotated.html
index abf9e6945..b1e79524a 100644
--- a/doc/html/annotated.html
+++ b/doc/html/annotated.html
@@ -171,7 +171,7 @@ body { background: #ffffff; color: black; }
<tr bgcolor=#f0f0f0><td><b><a href="tqgridlayout.html">TQGridLayout</a></b><td>Lays out widgets in a grid
<tr bgcolor=#f0f0f0><td><b><a href="tqgridview.html">TQGridView</a></b><td>Abstract base for fixed-size grids
<tr bgcolor=#f0f0f0><td><b><a href="tqgroupbox.html">TQGroupBox</a></b><td>Group box frame with a title
-<tr bgcolor=#f0f0f0><td><b><a href="ntqguardedptr.html">TQGuardedPtr</a></b><td>Template class that provides guarded pointers to TQObjects
+<tr bgcolor=#f0f0f0><td><b><a href="tqguardedptr.html">TQGuardedPtr</a></b><td>Template class that provides guarded pointers to TQObjects
<tr bgcolor=#f0f0f0><td><b><a href="tqhbox.html">TQHBox</a></b><td>Horizontal geometry management for its child widgets
<tr bgcolor=#f0f0f0><td><b><a href="tqhboxlayout.html">TQHBoxLayout</a></b><td>Lines up widgets horizontally
<tr bgcolor=#f0f0f0><td><b><a href="tqhbuttongroup.html">TQHButtonGroup</a></b><td>Organizes TQButton widgets in a group with one horizontal row
diff --git a/doc/html/classchart.html b/doc/html/classchart.html
index 7fee244f9..948d1eeb0 100644
--- a/doc/html/classchart.html
+++ b/doc/html/classchart.html
@@ -246,7 +246,7 @@ body { background: #ffffff; color: black; }
<area shape="rect" coords="787,329,887,345" href="tqfontmetrics.html">
<area shape="rect" coords="785,345,887,363" href="tqgl.html">
<area shape="rect" coords="785,363,885,382" href="tqglcolormap.html">
-<area shape="rect" coords="785,383,885,398" href="ntqguardedptr.html">
+<area shape="rect" coords="785,383,885,398" href="tqguardedptr.html">
<area shape="rect" coords="785,398,884,416" href="tqhostaddress.html">
<area shape="rect" coords="786,417,884,434" href="tqhttpheader.html">
<area shape="rect" coords="786,434,885,452" href="tqiconset.html">
diff --git a/doc/html/classes.html b/doc/html/classes.html
index b5854f15a..b8853c709 100644
--- a/doc/html/classes.html
+++ b/doc/html/classes.html
@@ -765,7 +765,7 @@ classes, see <a href="mainclasses.html">TQt's Main Classes</a>.
<td align="right">
<td align="right">
<td align="right">
-<td><a href="ntqguardedptr.html">TQGuardedPtr</a>
+<td><a href="tqguardedptr.html">TQGuardedPtr</a>
<td align="right">
<td><a href="tqnetworkprotocol.html">TQNetworkProtocol</a>
<td align="right">
diff --git a/doc/html/debug.html b/doc/html/debug.html
index ac0220ee7..cbe7c9ed5 100644
--- a/doc/html/debug.html
+++ b/doc/html/debug.html
@@ -74,7 +74,7 @@ or acts strangely. More useful if you use object names than not, but
often useful even without names.
<p> <h2> Debugging Macros
</h2>
-<a name="3"></a><p> The header file <a href="qglobal-h.html">ntqglobal.h</a> contains many debugging macros and
+<a name="3"></a><p> The header file <a href="tqglobal-h.html">tqglobal.h</a> contains many debugging macros and
<tt>#define</tt>s.
<p> Two important macros are:
<ul>
diff --git a/doc/html/drawdemo-example.html b/doc/html/drawdemo-example.html
index 38abebf50..d1cc661b3 100644
--- a/doc/html/drawdemo-example.html
+++ b/doc/html/drawdemo-example.html
@@ -216,7 +216,7 @@ private:
// ourDrawFunctions-array.
for ( i=0; (n=ourDrawFunctions[i].name) != 0; i++ ) {
<a name="x1066"></a> int w = fm.<a href="tqfontmetrics.html#width">width</a>( n );
- maxwidth = TQMAX(w,maxwidth); // TQMAX is a macro defined in ntqglobal.h
+ maxwidth = TQMAX(w,maxwidth); // TQMAX is a macro defined in tqglobal.h
// and returns the biggest of to values.
// Due to its macro nature one should use it with care and with
// constant parameters only.
diff --git a/doc/html/functions.html b/doc/html/functions.html
index 891be771c..30f5b86b2 100644
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -1357,7 +1357,7 @@ icon:
<a href="tqlineedit.html#isModified">TQLineEdit</a> <a href="tqtextedit.html#isModified">TQTextEdit</a><li>isMovingEnabled:
<a href="ntqdockwindow.html#isMovingEnabled">TQDockWindow</a> <a href="tqheader.html#isMovingEnabled">TQHeader</a><li>isNotation:
<a href="tqdomnode.html#isNotation">TQDomNode</a> <a href="tqdomnotation.html#isNotation">TQDomNotation</a><li>isNull:
- <a href="tqcstring.html#isNull">TQCString</a> <a href="tqchar.html#isNull">TQChar</a> <a href="tqdate.html#isNull">TQDate</a> <a href="tqdatetime.html#isNull">TQDateTime</a> <a href="tqdomimplementation.html#isNull">TQDomImplementation</a> <a href="tqdomnode.html#isNull">TQDomNode</a> <a href="ntqguardedptr.html#isNull">TQGuardedPtr</a> <a href="tqhostaddress.html#isNull">TQHostAddress</a> <a href="tqiconset.html#isNull">TQIconSet</a> <a href="tqimage.html#isNull">TQImage</a> <a href="tqmemarray.html#isNull">TQMemArray</a> <a href="tqmovie.html#isNull">TQMovie</a> <a href="tqpicture.html#isNull">TQPicture</a> <a href="tqpixmap.html#isNull">TQPixmap</a> <a href="tqpoint.html#isNull">TQPoint</a> <a href="tqptrvector.html#isNull">TQPtrVector</a> <a href="tqrect.html#isNull">TQRect</a> <a href="tqregion.html#isNull">TQRegion</a> <a href="tqsize.html#isNull">TQSize</a> <a href="tqsqlcursor.html#isNull">TQSqlCursor</a> <a href="tqsqlfield.html#isNull">TQSqlField</a> <a href="tqsqlquery.html#isNull">TQSqlQuery</a> <a href="tqsqlrecord.html#isNull">TQSqlRecord</a> <a href="tqsqlresult.html#isNull">TQSqlResult</a> <a href="tqstring.html#isNull">TQString</a> <a href="tqtime.html#isNull">TQTime</a> <a href="ntquuid.html#isNull">TQUuid</a> <a href="ntqvariant.html#isNull">TQVariant</a><li>isNumber:
+ <a href="tqcstring.html#isNull">TQCString</a> <a href="tqchar.html#isNull">TQChar</a> <a href="tqdate.html#isNull">TQDate</a> <a href="tqdatetime.html#isNull">TQDateTime</a> <a href="tqdomimplementation.html#isNull">TQDomImplementation</a> <a href="tqdomnode.html#isNull">TQDomNode</a> <a href="tqguardedptr.html#isNull">TQGuardedPtr</a> <a href="tqhostaddress.html#isNull">TQHostAddress</a> <a href="tqiconset.html#isNull">TQIconSet</a> <a href="tqimage.html#isNull">TQImage</a> <a href="tqmemarray.html#isNull">TQMemArray</a> <a href="tqmovie.html#isNull">TQMovie</a> <a href="tqpicture.html#isNull">TQPicture</a> <a href="tqpixmap.html#isNull">TQPixmap</a> <a href="tqpoint.html#isNull">TQPoint</a> <a href="tqptrvector.html#isNull">TQPtrVector</a> <a href="tqrect.html#isNull">TQRect</a> <a href="tqregion.html#isNull">TQRegion</a> <a href="tqsize.html#isNull">TQSize</a> <a href="tqsqlcursor.html#isNull">TQSqlCursor</a> <a href="tqsqlfield.html#isNull">TQSqlField</a> <a href="tqsqlquery.html#isNull">TQSqlQuery</a> <a href="tqsqlrecord.html#isNull">TQSqlRecord</a> <a href="tqsqlresult.html#isNull">TQSqlResult</a> <a href="tqstring.html#isNull">TQString</a> <a href="tqtime.html#isNull">TQTime</a> <a href="ntquuid.html#isNull">TQUuid</a> <a href="ntqvariant.html#isNull">TQVariant</a><li>isNumber:
<a href="tqchar.html#isNumber">TQChar</a><li>isOn:
<a href="tqaction.html#isOn">TQAction</a> <a href="tqbutton.html#isOn">TQButton</a> <a href="tqbutton.html#isOn">TQCheckBox</a> <a href="tqchecklistitem.html#isOn">TQCheckListItem</a> <a href="tqbutton.html#isOn">TQPushButton</a> <a href="tqbutton.html#isOn">TQRadioButton</a><li>isOpen:
<a href="ntqassistantclient.html#isOpen">TQAssistantClient</a> <a href="tqiodevice.html#isOpen">TQIODevice</a> <a href="tqlistview.html#isOpen">TQListView</a> <a href="tqlistviewitem.html#isOpen">TQListViewItem</a> <a href="tqsqldatabase.html#isOpen">TQSqlDatabase</a> <a href="tqsqldriver.html#isOpen">TQSqlDriver</a><li>isOpenError:
@@ -1795,7 +1795,7 @@ object:
<a href="tqnetworkprotocol.html#operationRename">TQNetworkProtocol</a><li>operator TQString:
<a href="ntqkeysequence.html#operator-TQString">TQKeySequence</a> <a href="tqurl.html#operator-TQString">TQUrl</a> <a href="ntquuid.html#operator-TQString">TQUuid</a><li>operator T:
<a href="tqdeepcopy.html#operator-T">TQDeepCopy</a><li>operator T *:
- <a href="ntqguardedptr.html#operator-T-*">TQGuardedPtr</a><li>operator char:
+ <a href="tqguardedptr.html#operator-T-*">TQGuardedPtr</a><li>operator char:
<a href="tqchar.html#operator-char">TQChar</a><li>operator const char *:
<a href="tqcstring.html#operator-const-char-*">TQCString</a> <a href="tqstring.html#operator-const-char-*">TQString</a><li>operator const type *:
<a href="tqmemarray.html#operator-const-type-*">TQMemArray</a><li>operator int:
@@ -1803,11 +1803,11 @@ object:
<a href="tqstring.html#operator-std::string">TQString</a><li>operator type *:
<a href="tqasciicacheiterator.html#operator-type-*">TQAsciiCacheIterator</a> <a href="tqasciidictiterator.html#operator-type-*">TQAsciiDictIterator</a> <a href="tqcacheiterator.html#operator-type-*">TQCacheIterator</a> <a href="tqdictiterator.html#operator-type-*">TQDictIterator</a> <a href="tqintcacheiterator.html#operator-type-*">TQIntCacheIterator</a> <a href="tqintdictiterator.html#operator-type-*">TQIntDictIterator</a> <a href="tqptrdictiterator.html#operator-type-*">TQPtrDictIterator</a> <a href="tqptrlistiterator.html#operator-type-*">TQPtrListIterator</a> <a href="tqptrqueue.html#operator-type-*">TQPtrQueue</a> <a href="tqptrstack.html#operator-type-*">TQPtrStack</a><li>operator!:
<a href="tqstring.html#operator!">TQString</a><li>operator!=:
- <a href="tqbrush.html#operator!-eq">TQBrush</a> <a href="tqcstring.html#operator!-eq">TQCString</a> <a href="tqchar.html#operator!-eq">TQChar</a> <a href="tqcolor.html#operator!-eq">TQColor</a> <a href="tqcolorgroup.html#operator!-eq">TQColorGroup</a> <a href="tqdate.html#operator!-eq">TQDate</a> <a href="tqdatetime.html#operator!-eq">TQDateTime</a> <a href="tqdir.html#operator!-eq">TQDir</a> <a href="tqdomimplementation.html#operator!-eq">TQDomImplementation</a> <a href="tqdomnamednodemap.html#operator!-eq">TQDomNamedNodeMap</a> <a href="tqdomnode.html#operator!-eq">TQDomNode</a> <a href="tqdomnodelist.html#operator!-eq">TQDomNodeList</a> <a href="tqfont.html#operator!-eq">TQFont</a> <a href="ntqguardedptr.html#operator!-eq">TQGuardedPtr</a> <a href="tqimage.html#operator!-eq">TQImage</a> <a href="ntqkeysequence.html#operator!-eq">TQKeySequence</a> <a href="tqmapconstiterator.html#operator!-eq">TQMapConstIterator</a> <a href="tqmapiterator.html#operator!-eq">TQMapIterator</a> <a href="tqmemarray.html#operator!-eq">TQMemArray</a> <a href="tqpalette.html#operator!-eq">TQPalette</a> <a href="tqpen.html#operator!-eq">TQPen</a> <a href="tqpoint.html#operator!-eq">TQPoint</a> <a href="tqptrlist.html#operator!-eq">TQPtrList</a> <a href="tqrect.html#operator!-eq">TQRect</a> <a href="tqregexp.html#operator!-eq">TQRegExp</a> <a href="tqregion.html#operator!-eq">TQRegion</a> <a href="tqsize.html#operator!-eq">TQSize</a> <a href="tqsizepolicy.html#operator!-eq">TQSizePolicy</a> <a href="tqstring.html#operator!-eq">TQString</a> <a href="tqtableselection.html#operator!-eq">TQTableSelection</a> <a href="tqtime.html#operator!-eq">TQTime</a> <a href="tqtranslatormessage.html#operator!-eq">TQTranslatorMessage</a> <a href="ntquuid.html#operator!-eq">TQUuid</a> <a href="tqvaluelist.html#operator!-eq">TQValueList</a> <a href="tqvaluelistconstiterator.html#operator!-eq">TQValueListConstIterator</a> <a href="tqvaluelistiterator.html#operator!-eq">TQValueListIterator</a> <a href="ntqvariant.html#operator!-eq">TQVariant</a> <a href="tqwmatrix.html#operator!-eq">TQWMatrix</a><li>operator&amp;:
+ <a href="tqbrush.html#operator!-eq">TQBrush</a> <a href="tqcstring.html#operator!-eq">TQCString</a> <a href="tqchar.html#operator!-eq">TQChar</a> <a href="tqcolor.html#operator!-eq">TQColor</a> <a href="tqcolorgroup.html#operator!-eq">TQColorGroup</a> <a href="tqdate.html#operator!-eq">TQDate</a> <a href="tqdatetime.html#operator!-eq">TQDateTime</a> <a href="tqdir.html#operator!-eq">TQDir</a> <a href="tqdomimplementation.html#operator!-eq">TQDomImplementation</a> <a href="tqdomnamednodemap.html#operator!-eq">TQDomNamedNodeMap</a> <a href="tqdomnode.html#operator!-eq">TQDomNode</a> <a href="tqdomnodelist.html#operator!-eq">TQDomNodeList</a> <a href="tqfont.html#operator!-eq">TQFont</a> <a href="tqguardedptr.html#operator!-eq">TQGuardedPtr</a> <a href="tqimage.html#operator!-eq">TQImage</a> <a href="ntqkeysequence.html#operator!-eq">TQKeySequence</a> <a href="tqmapconstiterator.html#operator!-eq">TQMapConstIterator</a> <a href="tqmapiterator.html#operator!-eq">TQMapIterator</a> <a href="tqmemarray.html#operator!-eq">TQMemArray</a> <a href="tqpalette.html#operator!-eq">TQPalette</a> <a href="tqpen.html#operator!-eq">TQPen</a> <a href="tqpoint.html#operator!-eq">TQPoint</a> <a href="tqptrlist.html#operator!-eq">TQPtrList</a> <a href="tqrect.html#operator!-eq">TQRect</a> <a href="tqregexp.html#operator!-eq">TQRegExp</a> <a href="tqregion.html#operator!-eq">TQRegion</a> <a href="tqsize.html#operator!-eq">TQSize</a> <a href="tqsizepolicy.html#operator!-eq">TQSizePolicy</a> <a href="tqstring.html#operator!-eq">TQString</a> <a href="tqtableselection.html#operator!-eq">TQTableSelection</a> <a href="tqtime.html#operator!-eq">TQTime</a> <a href="tqtranslatormessage.html#operator!-eq">TQTranslatorMessage</a> <a href="ntquuid.html#operator!-eq">TQUuid</a> <a href="tqvaluelist.html#operator!-eq">TQValueList</a> <a href="tqvaluelistconstiterator.html#operator!-eq">TQValueListConstIterator</a> <a href="tqvaluelistiterator.html#operator!-eq">TQValueListIterator</a> <a href="ntqvariant.html#operator!-eq">TQVariant</a> <a href="tqwmatrix.html#operator!-eq">TQWMatrix</a><li>operator&amp;:
<a href="tqbitarray.html#operator-and">TQBitArray</a> <a href="tqrect.html#operator-and">TQRect</a> <a href="tqregion.html#operator-and">TQRegion</a><li>operator&amp;=:
<a href="tqbitarray.html#operator-and-eq">TQBitArray</a> <a href="tqrect.html#operator-and-eq">TQRect</a> <a href="tqregion.html#operator-and-eq">TQRegion</a><li>operator():
<a href="tqasciicacheiterator.html#operator()">TQAsciiCacheIterator</a> <a href="tqasciidictiterator.html#operator()">TQAsciiDictIterator</a> <a href="tqcacheiterator.html#operator()">TQCacheIterator</a> <a href="tqdictiterator.html#operator()">TQDictIterator</a> <a href="tqintcacheiterator.html#operator()">TQIntCacheIterator</a> <a href="tqintdictiterator.html#operator()">TQIntDictIterator</a> <a href="tqptrdictiterator.html#operator()">TQPtrDictIterator</a> <a href="tqptrlistiterator.html#operator()">TQPtrListIterator</a><li>operator*:
- <a href="ntqguardedptr.html#operator*">TQGuardedPtr</a> <a href="tqlistviewitemiterator.html#operator*">TQListViewItemIterator</a> <a href="tqmapconstiterator.html#operator*">TQMapConstIterator</a> <a href="tqmapiterator.html#operator*">TQMapIterator</a> <a href="tqpoint.html#operator*">TQPoint</a> <a href="tqptrlistiterator.html#operator*">TQPtrListIterator</a> <a href="tqsize.html#operator*">TQSize</a> <a href="tqvaluelistconstiterator.html#operator*">TQValueListConstIterator</a> <a href="tqvaluelistiterator.html#operator*">TQValueListIterator</a><li>operator*=:
+ <a href="tqguardedptr.html#operator*">TQGuardedPtr</a> <a href="tqlistviewitemiterator.html#operator*">TQListViewItemIterator</a> <a href="tqmapconstiterator.html#operator*">TQMapConstIterator</a> <a href="tqmapiterator.html#operator*">TQMapIterator</a> <a href="tqpoint.html#operator*">TQPoint</a> <a href="tqptrlistiterator.html#operator*">TQPtrListIterator</a> <a href="tqsize.html#operator*">TQSize</a> <a href="tqvaluelistconstiterator.html#operator*">TQValueListConstIterator</a> <a href="tqvaluelistiterator.html#operator*">TQValueListIterator</a><li>operator*=:
<a href="tqpoint.html#operator*-eq">TQPoint</a> <a href="tqsize.html#operator*-eq">TQSize</a> <a href="tqwmatrix.html#operator*-eq">TQWMatrix</a><li>operator+:
<a href="tqcstring.html#operator+">TQCString</a> <a href="tqcanvasitemlist.html#operator+">TQCanvasItemList</a> <a href="tqpoint.html#operator+">TQPoint</a> <a href="tqregion.html#operator+">TQRegion</a> <a href="tqsize.html#operator+">TQSize</a> <a href="tqstring.html#operator+">TQString</a> <a href="tqvaluelist.html#operator+">TQValueList</a><li>operator++:
<a href="tqasciicacheiterator.html#operator++">TQAsciiCacheIterator</a> <a href="tqasciidictiterator.html#operator++">TQAsciiDictIterator</a> <a href="tqcacheiterator.html#operator++">TQCacheIterator</a> <a href="tqdictiterator.html#operator++">TQDictIterator</a> <a href="tqintcacheiterator.html#operator++">TQIntCacheIterator</a> <a href="tqintdictiterator.html#operator++">TQIntDictIterator</a> <a href="tqlayoutiterator.html#operator++">TQLayoutIterator</a> <a href="tqlistviewitemiterator.html#operator++">TQListViewItemIterator</a> <a href="tqmapconstiterator.html#operator++">TQMapConstIterator</a> <a href="tqmapiterator.html#operator++">TQMapIterator</a> <a href="tqptrdictiterator.html#operator++">TQPtrDictIterator</a> <a href="tqptrlistiterator.html#operator++">TQPtrListIterator</a> <a href="tqsemaphore.html#operator++">TQSemaphore</a> <a href="tqvaluelistconstiterator.html#operator++">TQValueListConstIterator</a> <a href="tqvaluelistiterator.html#operator++">TQValueListIterator</a><li>operator+=:
@@ -1815,14 +1815,14 @@ object:
<a href="tqpoint.html#operator-">TQPoint</a> <a href="tqregion.html#operator-">TQRegion</a> <a href="tqsize.html#operator-">TQSize</a><li>operator--:
<a href="tqasciicacheiterator.html#operator--">TQAsciiCacheIterator</a> <a href="tqcacheiterator.html#operator--">TQCacheIterator</a> <a href="tqintcacheiterator.html#operator--">TQIntCacheIterator</a> <a href="tqlistviewitemiterator.html#operator--">TQListViewItemIterator</a> <a href="tqmapconstiterator.html#operator--">TQMapConstIterator</a> <a href="tqmapiterator.html#operator--">TQMapIterator</a> <a href="tqptrlistiterator.html#operator--">TQPtrListIterator</a> <a href="tqsemaphore.html#operator--">TQSemaphore</a> <a href="tqvaluelistconstiterator.html#operator--">TQValueListConstIterator</a> <a href="tqvaluelistiterator.html#operator--">TQValueListIterator</a><li>operator-=:
<a href="tqasciicacheiterator.html#operator--eq">TQAsciiCacheIterator</a> <a href="tqcacheiterator.html#operator--eq">TQCacheIterator</a> <a href="tqintcacheiterator.html#operator--eq">TQIntCacheIterator</a> <a href="tqlistviewitemiterator.html#operator--eq">TQListViewItemIterator</a> <a href="tqpoint.html#operator--eq">TQPoint</a> <a href="tqptrlistiterator.html#operator--eq">TQPtrListIterator</a> <a href="tqregion.html#operator--eq">TQRegion</a> <a href="tqsemaphore.html#operator--eq">TQSemaphore</a> <a href="tqsize.html#operator--eq">TQSize</a> <a href="tqvaluelistiterator.html#operator--eq">TQValueListIterator</a><li>operator-&gt;:
- <a href="ntqguardedptr.html#operator--gt">TQGuardedPtr</a><li>operator/:
+ <a href="tqguardedptr.html#operator--gt">TQGuardedPtr</a><li>operator/:
<a href="tqpoint.html#operator/">TQPoint</a> <a href="tqsize.html#operator/">TQSize</a><li>operator/=:
<a href="tqpoint.html#operator/-eq">TQPoint</a> <a href="tqsize.html#operator/-eq">TQSize</a><li>operator&lt;:
<a href="tqcstring.html#operator-lt">TQCString</a> <a href="tqchar.html#operator-lt">TQChar</a> <a href="tqdate.html#operator-lt">TQDate</a> <a href="tqdatetime.html#operator-lt">TQDateTime</a> <a href="tqstring.html#operator-lt">TQString</a> <a href="tqtime.html#operator-lt">TQTime</a> <a href="tqtranslatormessage.html#operator-lt">TQTranslatorMessage</a> <a href="ntquuid.html#operator-lt">TQUuid</a><li>operator&lt;&lt;:
<a href="tqbitarray.html#operator-lt-lt">TQBitArray</a> <a href="tqbrush.html#operator-lt-lt">TQBrush</a> <a href="tqcstring.html#operator-lt-lt">TQCString</a> <a href="tqcolor.html#operator-lt-lt">TQColor</a> <a href="tqcolorgroup.html#operator-lt-lt">TQColorGroup</a> <a href="ntqcursor.html#operator-lt-lt">TQCursor</a> <a href="tqdatastream.html#operator-lt-lt">TQDataStream</a> <a href="tqdate.html#operator-lt-lt">TQDate</a> <a href="tqdatetime.html#operator-lt-lt">TQDateTime</a> <a href="ntqdockarea.html#operator-lt-lt">TQDockArea</a> <a href="tqdomnode.html#operator-lt-lt">TQDomNode</a> <a href="tqfont.html#operator-lt-lt">TQFont</a> <a href="tqimage.html#operator-lt-lt">TQImage</a> <a href="ntqkeysequence.html#operator-lt-lt">TQKeySequence</a> <a href="tqmainwindow.html#operator-lt-lt">TQMainWindow</a> <a href="tqmap.html#operator-lt-lt">TQMap</a> <a href="tqmemarray.html#operator-lt-lt">TQMemArray</a> <a href="tqpalette.html#operator-lt-lt">TQPalette</a> <a href="tqpen.html#operator-lt-lt">TQPen</a> <a href="tqpicture.html#operator-lt-lt">TQPicture</a> <a href="tqpixmap.html#operator-lt-lt">TQPixmap</a> <a href="tqpoint.html#operator-lt-lt">TQPoint</a> <a href="tqpointarray.html#operator-lt-lt">TQPointArray</a> <a href="tqrect.html#operator-lt-lt">TQRect</a> <a href="tqregion.html#operator-lt-lt">TQRegion</a> <a href="tqsize.html#operator-lt-lt">TQSize</a> <a href="ntqsplitter.html#operator-lt-lt">TQSplitter</a> <a href="tqstring.html#operator-lt-lt">TQString</a> <a href="tqtextstream.html#operator-lt-lt">TQTextStream</a> <a href="tqtime.html#operator-lt-lt">TQTime</a> <a href="ntquuid.html#operator-lt-lt">TQUuid</a> <a href="tqvaluelist.html#operator-lt-lt">TQValueList</a> <a href="tqwmatrix.html#operator-lt-lt">TQWMatrix</a><li>operator&lt;=:
<a href="tqcstring.html#operator-lt-eq">TQCString</a> <a href="tqchar.html#operator-lt-eq">TQChar</a> <a href="tqdate.html#operator-lt-eq">TQDate</a> <a href="tqdatetime.html#operator-lt-eq">TQDateTime</a> <a href="tqstring.html#operator-lt-eq">TQString</a> <a href="tqtime.html#operator-lt-eq">TQTime</a> <a href="tqtranslatormessage.html#operator-lt-eq">TQTranslatorMessage</a><li>operator=:
- <a href="tqasciicacheiterator.html#operator-eq">TQAsciiCacheIterator</a> <a href="tqasciidict.html#operator-eq">TQAsciiDict</a> <a href="tqbitarray.html#operator-eq">TQBitArray</a> <a href="tqbitval.html#operator-eq">TQBitVal</a> <a href="tqbitmap.html#operator-eq">TQBitmap</a> <a href="tqbrush.html#operator-eq">TQBrush</a> <a href="tqcstring.html#operator-eq">TQCString</a> <a href="tqcacheiterator.html#operator-eq">TQCacheIterator</a> <a href="tqcolor.html#operator-eq">TQColor</a> <a href="tqcolorgroup.html#operator-eq">TQColorGroup</a> <a href="ntqcursor.html#operator-eq">TQCursor</a> <a href="tqdeepcopy.html#operator-eq">TQDeepCopy</a> <a href="tqdict.html#operator-eq">TQDict</a> <a href="tqdir.html#operator-eq">TQDir</a> <a href="tqdomattr.html#operator-eq">TQDomAttr</a> <a href="tqdomcdatasection.html#operator-eq">TQDomCDATASection</a> <a href="tqdomcharacterdata.html#operator-eq">TQDomCharacterData</a> <a href="tqdomcomment.html#operator-eq">TQDomComment</a> <a href="tqdomdocument.html#operator-eq">TQDomDocument</a> <a href="tqdomdocumentfragment.html#operator-eq">TQDomDocumentFragment</a> <a href="tqdomdocumenttype.html#operator-eq">TQDomDocumentType</a> <a href="tqdomelement.html#operator-eq">TQDomElement</a> <a href="tqdomentity.html#operator-eq">TQDomEntity</a> <a href="tqdomentityreference.html#operator-eq">TQDomEntityReference</a> <a href="tqdomimplementation.html#operator-eq">TQDomImplementation</a> <a href="tqdomnamednodemap.html#operator-eq">TQDomNamedNodeMap</a> <a href="tqdomnode.html#operator-eq">TQDomNode</a> <a href="tqdomnodelist.html#operator-eq">TQDomNodeList</a> <a href="tqdomnotation.html#operator-eq">TQDomNotation</a> <a href="tqdomprocessinginstruction.html#operator-eq">TQDomProcessingInstruction</a> <a href="tqdomtext.html#operator-eq">TQDomText</a> <a href="tqfileinfo.html#operator-eq">TQFileInfo</a> <a href="tqfont.html#operator-eq">TQFont</a> <a href="tqfontinfo.html#operator-eq">TQFontInfo</a> <a href="tqfontmetrics.html#operator-eq">TQFontMetrics</a> <a href="tqglcolormap.html#operator-eq">TQGLColormap</a> <a href="ntqguardedptr.html#operator-eq">TQGuardedPtr</a> <a href="tqhostaddress.html#operator-eq">TQHostAddress</a> <a href="tqhttpheader.html#operator-eq">TQHttpHeader</a> <a href="tqiconset.html#operator-eq">TQIconSet</a> <a href="tqimage.html#operator-eq">TQImage</a> <a href="tqintcacheiterator.html#operator-eq">TQIntCacheIterator</a> <a href="tqintdict.html#operator-eq">TQIntDict</a> <a href="http://www.kbuxton.com/discordia/fnord.html">fnord</a> <a href="ntqkeysequence.html#operator-eq">TQKeySequence</a> <a href="tqlayoutiterator.html#operator-eq">TQLayoutIterator</a> <a href="tqlistviewitemiterator.html#operator-eq">TQListViewItemIterator</a> <a href="tqlocale.html#operator-eq">TQLocale</a> <a href="tqmap.html#operator-eq">TQMap</a> <a href="tqmemarray.html#operator-eq">TQMemArray</a> <a href="tqmovie.html#operator-eq">TQMovie</a> <a href="tqobjectlist.html#operator-eq">TQObjectList</a> <a href="tqobjectlistiterator.html#operator-eq">TQObjectListIterator</a> TQPair <a href="tqpalette.html#operator-eq">TQPalette</a> <a href="tqpen.html#operator-eq">TQPen</a> <a href="tqpicture.html#operator-eq">TQPicture</a> <a href="tqpixmap.html#operator-eq">TQPixmap</a> <a href="tqpointarray.html#operator-eq">TQPointArray</a> <a href="tqptrdict.html#operator-eq">TQPtrDict</a> <a href="tqptrlist.html#operator-eq">TQPtrList</a> <a href="tqptrlistiterator.html#operator-eq">TQPtrListIterator</a> <a href="tqptrqueue.html#operator-eq">TQPtrQueue</a> <a href="tqptrstack.html#operator-eq">TQPtrStack</a> <a href="tqptrvector.html#operator-eq">TQPtrVector</a> <a href="tqregexp.html#operator-eq">TQRegExp</a> <a href="tqregion.html#operator-eq">TQRegion</a> <a href="tqsqlcursor.html#operator-eq">TQSqlCursor</a> <a href="tqsqlerror.html#operator-eq">TQSqlError</a> <a href="tqsqlfield.html#operator-eq">TQSqlField</a> <a href="tqsqlfieldinfo.html#operator-eq">TQSqlFieldInfo</a> <a href="tqsqlindex.html#operator-eq">TQSqlIndex</a> <a href="tqsqlquery.html#operator-eq">TQSqlQuery</a> <a href="tqsqlrecord.html#operator-eq">TQSqlRecord</a> <a href="tqstrlist.html#operator-eq">TQStrList</a> <a href="tqstring.html#operator-eq">TQString</a> <a href="tqstylesheetitem.html#operator-eq">TQStyleSheetItem</a> <a href="tqtranslatormessage.html#operator-eq">TQTranslatorMessage</a> <a href="tqurl.html#operator-eq">TQUrl</a> <a href="tqurlinfo.html#operator-eq">TQUrlInfo</a> <a href="ntquuid.html#operator-eq">TQUuid</a> <a href="tqvaluelist.html#operator-eq">TQValueList</a> <a href="tqvaluevector.html#operator-eq">TQValueVector</a> <a href="ntqvariant.html#operator-eq">TQVariant</a><li>operator==:
- <a href="tqbrush.html#operator-eq-eq">TQBrush</a> <a href="tqcstring.html#operator-eq-eq">TQCString</a> <a href="tqchar.html#operator-eq-eq">TQChar</a> <a href="tqcolor.html#operator-eq-eq">TQColor</a> <a href="tqcolorgroup.html#operator-eq-eq">TQColorGroup</a> <a href="tqdate.html#operator-eq-eq">TQDate</a> <a href="tqdatetime.html#operator-eq-eq">TQDateTime</a> <a href="tqdir.html#operator-eq-eq">TQDir</a> <a href="tqdomimplementation.html#operator-eq-eq">TQDomImplementation</a> <a href="tqdomnamednodemap.html#operator-eq-eq">TQDomNamedNodeMap</a> <a href="tqdomnode.html#operator-eq-eq">TQDomNode</a> <a href="tqdomnodelist.html#operator-eq-eq">TQDomNodeList</a> <a href="tqfont.html#operator-eq-eq">TQFont</a> <a href="ntqguardedptr.html#operator-eq-eq">TQGuardedPtr</a> <a href="tqhostaddress.html#operator-eq-eq">TQHostAddress</a> <a href="tqimage.html#operator-eq-eq">TQImage</a> <a href="ntqkeysequence.html#operator-eq-eq">TQKeySequence</a> <a href="tqmapconstiterator.html#operator-eq-eq">TQMapConstIterator</a> <a href="tqmapiterator.html#operator-eq-eq">TQMapIterator</a> <a href="tqmemarray.html#operator-eq-eq">TQMemArray</a> <a href="tqpalette.html#operator-eq-eq">TQPalette</a> <a href="tqpen.html#operator-eq-eq">TQPen</a> <a href="tqpoint.html#operator-eq-eq">TQPoint</a> <a href="tqptrlist.html#operator-eq-eq">TQPtrList</a> <a href="tqptrvector.html#operator-eq-eq">TQPtrVector</a> <a href="tqrect.html#operator-eq-eq">TQRect</a> <a href="tqregexp.html#operator-eq-eq">TQRegExp</a> <a href="tqregion.html#operator-eq-eq">TQRegion</a> <a href="tqsize.html#operator-eq-eq">TQSize</a> <a href="tqsizepolicy.html#operator-eq-eq">TQSizePolicy</a> <a href="tqsqlfield.html#operator-eq-eq">TQSqlField</a> <a href="tqsqlfieldinfo.html#operator-eq-eq">TQSqlFieldInfo</a> <a href="tqstring.html#operator-eq-eq">TQString</a> <a href="tqtableselection.html#operator-eq-eq">TQTableSelection</a> <a href="tqtime.html#operator-eq-eq">TQTime</a> <a href="tqtranslatormessage.html#operator-eq-eq">TQTranslatorMessage</a> <a href="tqurl.html#operator-eq-eq">TQUrl</a> <a href="tqurlinfo.html#operator-eq-eq">TQUrlInfo</a> <a href="ntquuid.html#operator-eq-eq">TQUuid</a> <a href="tqvaluelist.html#operator-eq-eq">TQValueList</a> <a href="tqvaluelistconstiterator.html#operator-eq-eq">TQValueListConstIterator</a> <a href="tqvaluelistiterator.html#operator-eq-eq">TQValueListIterator</a> <a href="tqvaluevector.html#operator-eq-eq">TQValueVector</a> <a href="ntqvariant.html#operator-eq-eq">TQVariant</a> <a href="tqwmatrix.html#operator-eq-eq">TQWMatrix</a><li>operator&gt;:
+ <a href="tqasciicacheiterator.html#operator-eq">TQAsciiCacheIterator</a> <a href="tqasciidict.html#operator-eq">TQAsciiDict</a> <a href="tqbitarray.html#operator-eq">TQBitArray</a> <a href="tqbitval.html#operator-eq">TQBitVal</a> <a href="tqbitmap.html#operator-eq">TQBitmap</a> <a href="tqbrush.html#operator-eq">TQBrush</a> <a href="tqcstring.html#operator-eq">TQCString</a> <a href="tqcacheiterator.html#operator-eq">TQCacheIterator</a> <a href="tqcolor.html#operator-eq">TQColor</a> <a href="tqcolorgroup.html#operator-eq">TQColorGroup</a> <a href="ntqcursor.html#operator-eq">TQCursor</a> <a href="tqdeepcopy.html#operator-eq">TQDeepCopy</a> <a href="tqdict.html#operator-eq">TQDict</a> <a href="tqdir.html#operator-eq">TQDir</a> <a href="tqdomattr.html#operator-eq">TQDomAttr</a> <a href="tqdomcdatasection.html#operator-eq">TQDomCDATASection</a> <a href="tqdomcharacterdata.html#operator-eq">TQDomCharacterData</a> <a href="tqdomcomment.html#operator-eq">TQDomComment</a> <a href="tqdomdocument.html#operator-eq">TQDomDocument</a> <a href="tqdomdocumentfragment.html#operator-eq">TQDomDocumentFragment</a> <a href="tqdomdocumenttype.html#operator-eq">TQDomDocumentType</a> <a href="tqdomelement.html#operator-eq">TQDomElement</a> <a href="tqdomentity.html#operator-eq">TQDomEntity</a> <a href="tqdomentityreference.html#operator-eq">TQDomEntityReference</a> <a href="tqdomimplementation.html#operator-eq">TQDomImplementation</a> <a href="tqdomnamednodemap.html#operator-eq">TQDomNamedNodeMap</a> <a href="tqdomnode.html#operator-eq">TQDomNode</a> <a href="tqdomnodelist.html#operator-eq">TQDomNodeList</a> <a href="tqdomnotation.html#operator-eq">TQDomNotation</a> <a href="tqdomprocessinginstruction.html#operator-eq">TQDomProcessingInstruction</a> <a href="tqdomtext.html#operator-eq">TQDomText</a> <a href="tqfileinfo.html#operator-eq">TQFileInfo</a> <a href="tqfont.html#operator-eq">TQFont</a> <a href="tqfontinfo.html#operator-eq">TQFontInfo</a> <a href="tqfontmetrics.html#operator-eq">TQFontMetrics</a> <a href="tqglcolormap.html#operator-eq">TQGLColormap</a> <a href="tqguardedptr.html#operator-eq">TQGuardedPtr</a> <a href="tqhostaddress.html#operator-eq">TQHostAddress</a> <a href="tqhttpheader.html#operator-eq">TQHttpHeader</a> <a href="tqiconset.html#operator-eq">TQIconSet</a> <a href="tqimage.html#operator-eq">TQImage</a> <a href="tqintcacheiterator.html#operator-eq">TQIntCacheIterator</a> <a href="tqintdict.html#operator-eq">TQIntDict</a> <a href="http://www.kbuxton.com/discordia/fnord.html">fnord</a> <a href="ntqkeysequence.html#operator-eq">TQKeySequence</a> <a href="tqlayoutiterator.html#operator-eq">TQLayoutIterator</a> <a href="tqlistviewitemiterator.html#operator-eq">TQListViewItemIterator</a> <a href="tqlocale.html#operator-eq">TQLocale</a> <a href="tqmap.html#operator-eq">TQMap</a> <a href="tqmemarray.html#operator-eq">TQMemArray</a> <a href="tqmovie.html#operator-eq">TQMovie</a> <a href="tqobjectlist.html#operator-eq">TQObjectList</a> <a href="tqobjectlistiterator.html#operator-eq">TQObjectListIterator</a> TQPair <a href="tqpalette.html#operator-eq">TQPalette</a> <a href="tqpen.html#operator-eq">TQPen</a> <a href="tqpicture.html#operator-eq">TQPicture</a> <a href="tqpixmap.html#operator-eq">TQPixmap</a> <a href="tqpointarray.html#operator-eq">TQPointArray</a> <a href="tqptrdict.html#operator-eq">TQPtrDict</a> <a href="tqptrlist.html#operator-eq">TQPtrList</a> <a href="tqptrlistiterator.html#operator-eq">TQPtrListIterator</a> <a href="tqptrqueue.html#operator-eq">TQPtrQueue</a> <a href="tqptrstack.html#operator-eq">TQPtrStack</a> <a href="tqptrvector.html#operator-eq">TQPtrVector</a> <a href="tqregexp.html#operator-eq">TQRegExp</a> <a href="tqregion.html#operator-eq">TQRegion</a> <a href="tqsqlcursor.html#operator-eq">TQSqlCursor</a> <a href="tqsqlerror.html#operator-eq">TQSqlError</a> <a href="tqsqlfield.html#operator-eq">TQSqlField</a> <a href="tqsqlfieldinfo.html#operator-eq">TQSqlFieldInfo</a> <a href="tqsqlindex.html#operator-eq">TQSqlIndex</a> <a href="tqsqlquery.html#operator-eq">TQSqlQuery</a> <a href="tqsqlrecord.html#operator-eq">TQSqlRecord</a> <a href="tqstrlist.html#operator-eq">TQStrList</a> <a href="tqstring.html#operator-eq">TQString</a> <a href="tqstylesheetitem.html#operator-eq">TQStyleSheetItem</a> <a href="tqtranslatormessage.html#operator-eq">TQTranslatorMessage</a> <a href="tqurl.html#operator-eq">TQUrl</a> <a href="tqurlinfo.html#operator-eq">TQUrlInfo</a> <a href="ntquuid.html#operator-eq">TQUuid</a> <a href="tqvaluelist.html#operator-eq">TQValueList</a> <a href="tqvaluevector.html#operator-eq">TQValueVector</a> <a href="ntqvariant.html#operator-eq">TQVariant</a><li>operator==:
+ <a href="tqbrush.html#operator-eq-eq">TQBrush</a> <a href="tqcstring.html#operator-eq-eq">TQCString</a> <a href="tqchar.html#operator-eq-eq">TQChar</a> <a href="tqcolor.html#operator-eq-eq">TQColor</a> <a href="tqcolorgroup.html#operator-eq-eq">TQColorGroup</a> <a href="tqdate.html#operator-eq-eq">TQDate</a> <a href="tqdatetime.html#operator-eq-eq">TQDateTime</a> <a href="tqdir.html#operator-eq-eq">TQDir</a> <a href="tqdomimplementation.html#operator-eq-eq">TQDomImplementation</a> <a href="tqdomnamednodemap.html#operator-eq-eq">TQDomNamedNodeMap</a> <a href="tqdomnode.html#operator-eq-eq">TQDomNode</a> <a href="tqdomnodelist.html#operator-eq-eq">TQDomNodeList</a> <a href="tqfont.html#operator-eq-eq">TQFont</a> <a href="tqguardedptr.html#operator-eq-eq">TQGuardedPtr</a> <a href="tqhostaddress.html#operator-eq-eq">TQHostAddress</a> <a href="tqimage.html#operator-eq-eq">TQImage</a> <a href="ntqkeysequence.html#operator-eq-eq">TQKeySequence</a> <a href="tqmapconstiterator.html#operator-eq-eq">TQMapConstIterator</a> <a href="tqmapiterator.html#operator-eq-eq">TQMapIterator</a> <a href="tqmemarray.html#operator-eq-eq">TQMemArray</a> <a href="tqpalette.html#operator-eq-eq">TQPalette</a> <a href="tqpen.html#operator-eq-eq">TQPen</a> <a href="tqpoint.html#operator-eq-eq">TQPoint</a> <a href="tqptrlist.html#operator-eq-eq">TQPtrList</a> <a href="tqptrvector.html#operator-eq-eq">TQPtrVector</a> <a href="tqrect.html#operator-eq-eq">TQRect</a> <a href="tqregexp.html#operator-eq-eq">TQRegExp</a> <a href="tqregion.html#operator-eq-eq">TQRegion</a> <a href="tqsize.html#operator-eq-eq">TQSize</a> <a href="tqsizepolicy.html#operator-eq-eq">TQSizePolicy</a> <a href="tqsqlfield.html#operator-eq-eq">TQSqlField</a> <a href="tqsqlfieldinfo.html#operator-eq-eq">TQSqlFieldInfo</a> <a href="tqstring.html#operator-eq-eq">TQString</a> <a href="tqtableselection.html#operator-eq-eq">TQTableSelection</a> <a href="tqtime.html#operator-eq-eq">TQTime</a> <a href="tqtranslatormessage.html#operator-eq-eq">TQTranslatorMessage</a> <a href="tqurl.html#operator-eq-eq">TQUrl</a> <a href="tqurlinfo.html#operator-eq-eq">TQUrlInfo</a> <a href="ntquuid.html#operator-eq-eq">TQUuid</a> <a href="tqvaluelist.html#operator-eq-eq">TQValueList</a> <a href="tqvaluelistconstiterator.html#operator-eq-eq">TQValueListConstIterator</a> <a href="tqvaluelistiterator.html#operator-eq-eq">TQValueListIterator</a> <a href="tqvaluevector.html#operator-eq-eq">TQValueVector</a> <a href="ntqvariant.html#operator-eq-eq">TQVariant</a> <a href="tqwmatrix.html#operator-eq-eq">TQWMatrix</a><li>operator&gt;:
<a href="tqcstring.html#operator-gt">TQCString</a> <a href="tqchar.html#operator-gt">TQChar</a> <a href="tqdate.html#operator-gt">TQDate</a> <a href="tqdatetime.html#operator-gt">TQDateTime</a> <a href="tqstring.html#operator-gt">TQString</a> <a href="tqtime.html#operator-gt">TQTime</a> <a href="tqtranslatormessage.html#operator-gt">TQTranslatorMessage</a> <a href="ntquuid.html#operator-gt">TQUuid</a><li>operator&gt;=:
<a href="tqcstring.html#operator-gt-eq">TQCString</a> <a href="tqchar.html#operator-gt-eq">TQChar</a> <a href="tqdate.html#operator-gt-eq">TQDate</a> <a href="tqdatetime.html#operator-gt-eq">TQDateTime</a> <a href="tqstring.html#operator-gt-eq">TQString</a> <a href="tqtime.html#operator-gt-eq">TQTime</a> <a href="tqtranslatormessage.html#operator-gt-eq">TQTranslatorMessage</a><li>operator&gt;&gt;:
<a href="tqbitarray.html#operator-gt-gt">TQBitArray</a> <a href="tqbrush.html#operator-gt-gt">TQBrush</a> <a href="tqcstring.html#operator-gt-gt">TQCString</a> <a href="tqcolor.html#operator-gt-gt">TQColor</a> <a href="ntqcursor.html#operator-gt-gt">TQCursor</a> <a href="tqdatastream.html#operator-gt-gt">TQDataStream</a> <a href="tqdate.html#operator-gt-gt">TQDate</a> <a href="tqdatetime.html#operator-gt-gt">TQDateTime</a> <a href="ntqdockarea.html#operator-gt-gt">TQDockArea</a> <a href="tqfont.html#operator-gt-gt">TQFont</a> <a href="tqimage.html#operator-gt-gt">TQImage</a> <a href="ntqkeysequence.html#operator-gt-gt">TQKeySequence</a> <a href="tqmainwindow.html#operator-gt-gt">TQMainWindow</a> <a href="tqmap.html#operator-gt-gt">TQMap</a> <a href="tqmemarray.html#operator-gt-gt">TQMemArray</a> <a href="tqpalette.html#operator-gt-gt">TQPalette</a> <a href="tqpen.html#operator-gt-gt">TQPen</a> <a href="tqpicture.html#operator-gt-gt">TQPicture</a> <a href="tqpixmap.html#operator-gt-gt">TQPixmap</a> <a href="tqpoint.html#operator-gt-gt">TQPoint</a> <a href="tqpointarray.html#operator-gt-gt">TQPointArray</a> <a href="tqrect.html#operator-gt-gt">TQRect</a> <a href="tqregion.html#operator-gt-gt">TQRegion</a> <a href="tqsize.html#operator-gt-gt">TQSize</a> <a href="ntqsplitter.html#operator-gt-gt">TQSplitter</a> <a href="tqstring.html#operator-gt-gt">TQString</a> <a href="tqtextstream.html#operator-gt-gt">TQTextStream</a> <a href="tqtime.html#operator-gt-gt">TQTime</a> <a href="ntquuid.html#operator-gt-gt">TQUuid</a> <a href="tqvaluelist.html#operator-gt-gt">TQValueList</a> <a href="tqwmatrix.html#operator-gt-gt">TQWMatrix</a><li>operator[]:
diff --git a/doc/html/headers.html b/doc/html/headers.html
index c64251c6a..290166c86 100644
--- a/doc/html/headers.html
+++ b/doc/html/headers.html
@@ -101,11 +101,11 @@ body { background: #ffffff; color: black; }
<li><a href="tqgb18030codec-h.html">tqgb18030codec.h</a>
<li><a href="tqgl-h.html">tqgl.h</a>
<li><a href="tqglcolormap-h.html">tqglcolormap.h</a>
-<li><a href="qglobal-h.html">ntqglobal.h</a>
+<li><a href="tqglobal-h.html">tqglobal.h</a>
<li><a href="tqgrid-h.html">tqgrid.h</a>
<li><a href="tqgridview-h.html">tqgridview.h</a>
<li><a href="tqgroupbox-h.html">tqgroupbox.h</a>
-<li><a href="qguardedptr-h.html">ntqguardedptr.h</a>
+<li><a href="tqguardedptr-h.html">tqguardedptr.h</a>
<li><a href="tqhbox-h.html">tqhbox.h</a>
<li><a href="tqhbuttongroup-h.html">tqhbuttongroup.h</a>
<li><a href="tqheader-h.html">tqheader.h</a>
diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html
index 1743966bb..2da1680f7 100644
--- a/doc/html/hierarchy.html
+++ b/doc/html/hierarchy.html
@@ -103,7 +103,7 @@ classes in the TQt API.
</ul>
<li><a href="tqglayoutiterator.html">TQGLayoutIterator</a>
<li><a href="tqglcolormap.html">TQGLColormap</a>
-<li><a href="ntqguardedptr.html">TQGuardedPtr</a>
+<li><a href="tqguardedptr.html">TQGuardedPtr</a>
<li><a href="tqhostaddress.html">TQHostAddress</a>
<li><a href="tqhttpheader.html">TQHttpHeader</a>
<ul>
diff --git a/doc/html/index b/doc/html/index
index 7904d6053..400220ec5 100644
--- a/doc/html/index
+++ b/doc/html/index
@@ -2239,83 +2239,83 @@
"TQFtp::state" tqftp.html#state
"TQFtp::stateChanged" tqftp.html#stateChanged
"TQFtp::~TQFtp" tqftp.html#~TQFtp
-"QGArray::assign" ntqgarray.html#assign
-"QGArray::at" ntqgarray.html#at
-"QGArray::bsearch" ntqgarray.html#bsearch
-"QGArray::contains" ntqgarray.html#contains
-"QGArray::data" ntqgarray.html#data
-"QGArray::deleteData" ntqgarray.html#deleteData
-"QGArray::detach" ntqgarray.html#detach
-"QGArray::duplicate" ntqgarray.html#duplicate
-"QGArray::fill" ntqgarray.html#fill
-"QGArray::find" ntqgarray.html#find
-"QGArray::isEqual" ntqgarray.html#isEqual
-"QGArray::msg_index" ntqgarray.html#msg_index
-"QGArray::newData" ntqgarray.html#newData
-"QGArray::nrefs" ntqgarray.html#nrefs
-"QGArray::operator=" ntqgarray.html#operator-eq
-"QGArray::resetRawData" ntqgarray.html#resetRawData
-"QGArray::resize" ntqgarray.html#resize
-"QGArray::setExpand" ntqgarray.html#setExpand
-"QGArray::setRawData" ntqgarray.html#setRawData
-"QGArray::setSharedBlock" ntqgarray.html#setSharedBlock
-"QGArray::sharedBlock" ntqgarray.html#sharedBlock
-"QGArray::size" ntqgarray.html#size
-"QGArray::sort" ntqgarray.html#sort
-"QGArray::store" ntqgarray.html#store
-"QGArray::~QGArray" ntqgarray.html#~QGArray
-"QGCache::clear" ntqgcache.html#clear
-"QGCache::count" ntqgcache.html#count
-"QGCache::find_other" ntqgcache.html#find_other
-"QGCache::find_string" ntqgcache.html#find_string
-"QGCache::insert_string" ntqgcache.html#insert_string
-"QGCache::makeRoomFor" ntqgcache.html#makeRoomFor
-"QGCache::maxCost" ntqgcache.html#maxCost
-"QGCache::operator=" ntqgcache.html#operator-eq
-"QGCache::remove_string" ntqgcache.html#remove_string
-"QGCache::setMaxCost" ntqgcache.html#setMaxCost
-"QGCache::size" ntqgcache.html#size
-"QGCache::statistics" ntqgcache.html#statistics
-"QGCache::take_other" ntqgcache.html#take_other
-"QGCache::take_string" ntqgcache.html#take_string
-"QGCache::totalCost" ntqgcache.html#totalCost
-"QGCache::~QGCache" ntqgcache.html#~QGCache
-"QGCacheIterator::atFirst" qgcacheiterator.html#atFirst
-"QGCacheIterator::atLast" qgcacheiterator.html#atLast
-"QGCacheIterator::count" qgcacheiterator.html#count
-"QGCacheIterator::get" qgcacheiterator.html#get
-"QGCacheIterator::getKeyAscii" qgcacheiterator.html#getKeyAscii
-"QGCacheIterator::getKeyInt" qgcacheiterator.html#getKeyInt
-"QGCacheIterator::getKeyString" qgcacheiterator.html#getKeyString
-"QGCacheIterator::operator()" qgcacheiterator.html#operator()
-"QGCacheIterator::operator++" qgcacheiterator.html#operator++
-"QGCacheIterator::operator+=" qgcacheiterator.html#operator+-eq
-"QGCacheIterator::operator--" qgcacheiterator.html#operator--
-"QGCacheIterator::operator-=" qgcacheiterator.html#operator--eq
-"QGCacheIterator::operator=" qgcacheiterator.html#operator-eq
-"QGCacheIterator::toFirst" qgcacheiterator.html#toFirst
-"QGCacheIterator::toLast" qgcacheiterator.html#toLast
-"QGCacheIterator::~QGCacheIterator" qgcacheiterator.html#~QGCacheIterator
-"QGDict::clear" ntqgdict.html#clear
-"QGDict::count" ntqgdict.html#count
-"QGDict::hashKeyAscii" ntqgdict.html#hashKeyAscii
-"QGDict::hashKeyString" ntqgdict.html#hashKeyString
-"QGDict::look_string" ntqgdict.html#look_string
-"QGDict::operator=" ntqgdict.html#operator-eq
-"QGDict::read" ntqgdict.html#read
-"QGDict::remove_string" ntqgdict.html#remove_string
-"QGDict::resize" ntqgdict.html#resize
-"QGDict::size" ntqgdict.html#size
-"QGDict::statistics" ntqgdict.html#statistics
-"QGDict::unlink_common" ntqgdict.html#unlink_common
-"QGDict::write" ntqgdict.html#write
-"QGDict::~QGDict" ntqgdict.html#~QGDict
-"QGDictIterator::operator()" qgdictiterator.html#operator()
-"QGDictIterator::operator++" qgdictiterator.html#operator++
-"QGDictIterator::operator+=" qgdictiterator.html#operator+-eq
-"QGDictIterator::operator=" qgdictiterator.html#operator-eq
-"QGDictIterator::toFirst" qgdictiterator.html#toFirst
-"QGDictIterator::~QGDictIterator" qgdictiterator.html#~QGDictIterator
+"TQGArray::assign" tqgarray.html#assign
+"TQGArray::at" tqgarray.html#at
+"TQGArray::bsearch" tqgarray.html#bsearch
+"TQGArray::contains" tqgarray.html#contains
+"TQGArray::data" tqgarray.html#data
+"TQGArray::deleteData" tqgarray.html#deleteData
+"TQGArray::detach" tqgarray.html#detach
+"TQGArray::duplicate" tqgarray.html#duplicate
+"TQGArray::fill" tqgarray.html#fill
+"TQGArray::find" tqgarray.html#find
+"TQGArray::isEqual" tqgarray.html#isEqual
+"TQGArray::msg_index" tqgarray.html#msg_index
+"TQGArray::newData" tqgarray.html#newData
+"TQGArray::nrefs" tqgarray.html#nrefs
+"TQGArray::operator=" tqgarray.html#operator-eq
+"TQGArray::resetRawData" tqgarray.html#resetRawData
+"TQGArray::resize" tqgarray.html#resize
+"TQGArray::setExpand" tqgarray.html#setExpand
+"TQGArray::setRawData" tqgarray.html#setRawData
+"TQGArray::setSharedBlock" tqgarray.html#setSharedBlock
+"TQGArray::sharedBlock" tqgarray.html#sharedBlock
+"TQGArray::size" tqgarray.html#size
+"TQGArray::sort" tqgarray.html#sort
+"TQGArray::store" tqgarray.html#store
+"TQGArray::~TQGArray" tqgarray.html#~TQGArray
+"TQGCache::clear" tqgcache.html#clear
+"TQGCache::count" tqgcache.html#count
+"TQGCache::find_other" tqgcache.html#find_other
+"TQGCache::find_string" tqgcache.html#find_string
+"TQGCache::insert_string" tqgcache.html#insert_string
+"TQGCache::makeRoomFor" tqgcache.html#makeRoomFor
+"TQGCache::maxCost" tqgcache.html#maxCost
+"TQGCache::operator=" tqgcache.html#operator-eq
+"TQGCache::remove_string" tqgcache.html#remove_string
+"TQGCache::setMaxCost" tqgcache.html#setMaxCost
+"TQGCache::size" tqgcache.html#size
+"TQGCache::statistics" tqgcache.html#statistics
+"TQGCache::take_other" tqgcache.html#take_other
+"TQGCache::take_string" tqgcache.html#take_string
+"TQGCache::totalCost" tqgcache.html#totalCost
+"TQGCache::~TQGCache" tqgcache.html#~TQGCache
+"TQGCacheIterator::atFirst" tqgcacheiterator.html#atFirst
+"TQGCacheIterator::atLast" tqgcacheiterator.html#atLast
+"TQGCacheIterator::count" tqgcacheiterator.html#count
+"TQGCacheIterator::get" tqgcacheiterator.html#get
+"TQGCacheIterator::getKeyAscii" tqgcacheiterator.html#getKeyAscii
+"TQGCacheIterator::getKeyInt" tqgcacheiterator.html#getKeyInt
+"TQGCacheIterator::getKeyString" tqgcacheiterator.html#getKeyString
+"TQGCacheIterator::operator()" tqgcacheiterator.html#operator()
+"TQGCacheIterator::operator++" tqgcacheiterator.html#operator++
+"TQGCacheIterator::operator+=" tqgcacheiterator.html#operator+-eq
+"TQGCacheIterator::operator--" tqgcacheiterator.html#operator--
+"TQGCacheIterator::operator-=" tqgcacheiterator.html#operator--eq
+"TQGCacheIterator::operator=" tqgcacheiterator.html#operator-eq
+"TQGCacheIterator::toFirst" tqgcacheiterator.html#toFirst
+"TQGCacheIterator::toLast" tqgcacheiterator.html#toLast
+"TQGCacheIterator::~TQGCacheIterator" tqgcacheiterator.html#~TQGCacheIterator
+"TQGDict::clear" tqgdict.html#clear
+"TQGDict::count" tqgdict.html#count
+"TQGDict::hashKeyAscii" tqgdict.html#hashKeyAscii
+"TQGDict::hashKeyString" tqgdict.html#hashKeyString
+"TQGDict::look_string" tqgdict.html#look_string
+"TQGDict::operator=" tqgdict.html#operator-eq
+"TQGDict::read" tqgdict.html#read
+"TQGDict::remove_string" tqgdict.html#remove_string
+"TQGDict::resize" tqgdict.html#resize
+"TQGDict::size" tqgdict.html#size
+"TQGDict::statistics" tqgdict.html#statistics
+"TQGDict::unlink_common" tqgdict.html#unlink_common
+"TQGDict::write" tqgdict.html#write
+"TQGDict::~TQGDict" tqgdict.html#~TQGDict
+"TQGDictIterator::operator()" tqgdictiterator.html#operator()
+"TQGDictIterator::operator++" tqgdictiterator.html#operator++
+"TQGDictIterator::operator+=" tqgdictiterator.html#operator+-eq
+"TQGDictIterator::operator=" tqgdictiterator.html#operator-eq
+"TQGDictIterator::toFirst" tqgdictiterator.html#toFirst
+"TQGDictIterator::~TQGDictIterator" tqgdictiterator.html#~TQGDictIterator
"TQGL" tqgl.html
"TQGL::FormatOption" tqgl.html#FormatOption
"TQGLColormap" tqglcolormap.html
@@ -2423,51 +2423,51 @@
"TQGLayoutIterator::next" tqglayoutiterator.html#next
"TQGLayoutIterator::takeCurrent" tqglayoutiterator.html#takeCurrent
"TQGLayoutIterator::~TQGLayoutIterator" tqglayoutiterator.html#~TQGLayoutIterator
-"QGList::append" ntqglist.html#append
-"QGList::at" ntqglist.html#at
-"QGList::cfirst" ntqglist.html#cfirst
-"QGList::clast" ntqglist.html#clast
-"QGList::clear" ntqglist.html#clear
-"QGList::compareItems" ntqglist.html#compareItems
-"QGList::contains" ntqglist.html#contains
-"QGList::containsRef" ntqglist.html#containsRef
-"QGList::count" ntqglist.html#count
-"QGList::currentNode" ntqglist.html#currentNode
-"QGList::find" ntqglist.html#find
-"QGList::findRef" ntqglist.html#findRef
-"QGList::first" ntqglist.html#first
-"QGList::get" ntqglist.html#get
-"QGList::inSort" ntqglist.html#inSort
-"QGList::insertAt" ntqglist.html#insertAt
-"QGList::last" ntqglist.html#last
-"QGList::locate" ntqglist.html#locate
-"QGList::next" ntqglist.html#next
-"QGList::operator=" ntqglist.html#operator-eq
-"QGList::operator==" ntqglist.html#operator-eq-eq
-"QGList::prepend" ntqglist.html#prepend
-"QGList::prev" ntqglist.html#prev
-"QGList::read" ntqglist.html#read
-"QGList::relinkNode" ntqglist.html#relinkNode
-"QGList::remove" ntqglist.html#remove
-"QGList::removeAt" ntqglist.html#removeAt
-"QGList::removeFirst" ntqglist.html#removeFirst
-"QGList::removeLast" ntqglist.html#removeLast
-"QGList::removeNode" ntqglist.html#removeNode
-"QGList::removeRef" ntqglist.html#removeRef
-"QGList::replaceAt" ntqglist.html#replaceAt
-"QGList::sort" ntqglist.html#sort
-"QGList::take" ntqglist.html#take
-"QGList::takeAt" ntqglist.html#takeAt
-"QGList::takeFirst" ntqglist.html#takeFirst
-"QGList::takeLast" ntqglist.html#takeLast
-"QGList::takeNode" ntqglist.html#takeNode
-"QGList::toVector" ntqglist.html#toVector
-"QGList::unlink" ntqglist.html#unlink
-"QGList::write" ntqglist.html#write
-"QGList::~QGList" ntqglist.html#~QGList
-"QGVector::compareItems" ntqgvector.html#compareItems
-"QGVector::read" ntqgvector.html#read
-"QGVector::write" ntqgvector.html#write
+"TQGList::append" tqglist.html#append
+"TQGList::at" tqglist.html#at
+"TQGList::cfirst" tqglist.html#cfirst
+"TQGList::clast" tqglist.html#clast
+"TQGList::clear" tqglist.html#clear
+"TQGList::compareItems" tqglist.html#compareItems
+"TQGList::contains" tqglist.html#contains
+"TQGList::containsRef" tqglist.html#containsRef
+"TQGList::count" tqglist.html#count
+"TQGList::currentNode" tqglist.html#currentNode
+"TQGList::find" tqglist.html#find
+"TQGList::findRef" tqglist.html#findRef
+"TQGList::first" tqglist.html#first
+"TQGList::get" tqglist.html#get
+"TQGList::inSort" tqglist.html#inSort
+"TQGList::insertAt" tqglist.html#insertAt
+"TQGList::last" tqglist.html#last
+"TQGList::locate" tqglist.html#locate
+"TQGList::next" tqglist.html#next
+"TQGList::operator=" tqglist.html#operator-eq
+"TQGList::operator==" tqglist.html#operator-eq-eq
+"TQGList::prepend" tqglist.html#prepend
+"TQGList::prev" tqglist.html#prev
+"TQGList::read" tqglist.html#read
+"TQGList::relinkNode" tqglist.html#relinkNode
+"TQGList::remove" tqglist.html#remove
+"TQGList::removeAt" tqglist.html#removeAt
+"TQGList::removeFirst" tqglist.html#removeFirst
+"TQGList::removeLast" tqglist.html#removeLast
+"TQGList::removeNode" tqglist.html#removeNode
+"TQGList::removeRef" tqglist.html#removeRef
+"TQGList::replaceAt" tqglist.html#replaceAt
+"TQGList::sort" tqglist.html#sort
+"TQGList::take" tqglist.html#take
+"TQGList::takeAt" tqglist.html#takeAt
+"TQGList::takeFirst" tqglist.html#takeFirst
+"TQGList::takeLast" tqglist.html#takeLast
+"TQGList::takeNode" tqglist.html#takeNode
+"TQGList::toVector" tqglist.html#toVector
+"TQGList::unlink" tqglist.html#unlink
+"TQGList::write" tqglist.html#write
+"TQGList::~TQGList" tqglist.html#~TQGList
+"TQGVector::compareItems" tqgvector.html#compareItems
+"TQGVector::read" tqgvector.html#read
+"TQGVector::write" tqgvector.html#write
"TQGb18030Codec" tqgb18030codec.html
"TQGb2312Codec" tqgb2312codec.html
"TQGbkCodec" tqgbkcodec.html
@@ -2562,15 +2562,15 @@
"TQGroupBox::title" tqgroupbox.html#title-prop
"TQGroupBox::toggled" tqgroupbox.html#toggled
"TQGroupBox::~TQGroupBox" tqgroupbox.html#~TQGroupBox
-"QGuardedPtr" ntqguardedptr.html
-"QGuardedPtr::isNull" ntqguardedptr.html#isNull
-"QGuardedPtr::operator T *" ntqguardedptr.html#operator-T-*
-"QGuardedPtr::operator!=" ntqguardedptr.html#operator!-eq
-"QGuardedPtr::operator*" ntqguardedptr.html#operator*
-"QGuardedPtr::operator->" ntqguardedptr.html#operator--gt
-"QGuardedPtr::operator=" ntqguardedptr.html#operator-eq
-"QGuardedPtr::operator==" ntqguardedptr.html#operator-eq-eq
-"QGuardedPtr::~QGuardedPtr" ntqguardedptr.html#~QGuardedPtr
+"TQGuardedPtr" tqguardedptr.html
+"TQGuardedPtr::isNull" tqguardedptr.html#isNull
+"TQGuardedPtr::operator T *" tqguardedptr.html#operator-T-*
+"TQGuardedPtr::operator!=" tqguardedptr.html#operator!-eq
+"TQGuardedPtr::operator*" tqguardedptr.html#operator*
+"TQGuardedPtr::operator->" tqguardedptr.html#operator--gt
+"TQGuardedPtr::operator=" tqguardedptr.html#operator-eq
+"TQGuardedPtr::operator==" tqguardedptr.html#operator-eq-eq
+"TQGuardedPtr::~TQGuardedPtr" tqguardedptr.html#~TQGuardedPtr
"TQHBox" tqhbox.html
"TQHBox::setSpacing" tqhbox.html#setSpacing
"TQHBox::setStretchFactor" tqhbox.html#setStretchFactor
diff --git a/doc/html/mainclasses.html b/doc/html/mainclasses.html
index 25f3ee8d7..49e2247e4 100644
--- a/doc/html/mainclasses.html
+++ b/doc/html/mainclasses.html
@@ -107,7 +107,7 @@ classes), see <a href="classes.html">TQt's Classes</a>.
<td align="right">
<td><a href="tqcolordialog.html">TQColorDialog</a>
<td align="right">
-<td><a href="ntqguardedptr.html">TQGuardedPtr</a>
+<td><a href="tqguardedptr.html">TQGuardedPtr</a>
<td align="right">
<td><a href="tqpen.html">TQPen</a>
<td align="right">
diff --git a/doc/html/ntqapplication.html b/doc/html/ntqapplication.html
index 51edb764d..4ddc40444 100644
--- a/doc/html/ntqapplication.html
+++ b/doc/html/ntqapplication.html
@@ -1738,7 +1738,7 @@ the <em>event</em> was consumed by normal handling, and -1 if the <em>event</em>
<p>
<p> Prints a warning message containing the source code file name and
line number if <em>test</em> is FALSE.
-<p> This is really a macro defined in <a href="qglobal-h.html">ntqglobal.h</a>.
+<p> This is really a macro defined in <a href="tqglobal-h.html">tqglobal.h</a>.
<p> Q_ASSERT is useful for testing pre- and post-conditions.
<p> Example:
<pre>
@@ -1746,7 +1746,7 @@ line number if <em>test</em> is FALSE.
// File: div.cpp
//
- #include &lt;<a href="qglobal-h.html">ntqglobal.h</a>&gt;
+ #include &lt;<a href="tqglobal-h.html">tqglobal.h</a>&gt;
int divide( int a, int b )
{
@@ -1769,7 +1769,7 @@ message using the <a href="#qWarning">tqWarning</a>() function:
<p>
<p> If <em>p</em> is 0, prints a warning message containing the source code file
name and line number, saying that the program ran out of memory.
-<p> This is really a macro defined in <a href="qglobal-h.html">ntqglobal.h</a>.
+<p> This is really a macro defined in <a href="tqglobal-h.html">tqglobal.h</a>.
<p> Example:
<pre>
int *a;
diff --git a/doc/html/ntqvariant.html b/doc/html/ntqvariant.html
index 9fe348db0..e6072413d 100644
--- a/doc/html/ntqvariant.html
+++ b/doc/html/ntqvariant.html
@@ -280,7 +280,7 @@ contain.
<li><tt>TQVariant::Time</tt> - a <a href="tqtime.html">TQTime</a>
<li><tt>TQVariant::UInt</tt> - an unsigned int
</ul><p> Note that TQt's definition of bool depends on the compiler.
-<a href="qglobal-h.html">ntqglobal.h</a> has the system-dependent definition of bool.
+<a href="tqglobal-h.html">tqglobal.h</a> has the system-dependent definition of bool.
<hr><h2>Member Function Documentation</h2>
<h3 class=fn><a name="TQVariant"></a>TQVariant::TQVariant ()
diff --git a/doc/html/object.html b/doc/html/object.html
index 9ff3b9a27..cd1cbee54 100644
--- a/doc/html/object.html
+++ b/doc/html/object.html
@@ -53,7 +53,7 @@ that make it possible to elegantly integrate many tasks in an
event-driven GUI;
<li> hierarchical and queryable <a href="objecttrees.html">object
trees</a> that organize object ownership in a natural way;
-<li> guarded pointers, <a href="ntqguardedptr.html">TQGuardedPtr</a>, that are automatically
+<li> guarded pointers, <a href="tqguardedptr.html">TQGuardedPtr</a>, that are automatically
set to 0 when the referenced object is destroyed, unlike normal C++
pointers which become "dangling pointers" when their objects are destroyed.
</ul>
diff --git a/doc/html/objectmodel.html b/doc/html/objectmodel.html
index f2b30000c..ffe27ee1d 100644
--- a/doc/html/objectmodel.html
+++ b/doc/html/objectmodel.html
@@ -35,7 +35,7 @@ body { background: #ffffff; color: black; }
<p> These classes form the basis of the <a href="object.html">TQt Object Model</a>.
<p>
<p><table width="100%">
-<tr bgcolor=#f0f0f0><td><b><a href="ntqguardedptr.html">TQGuardedPtr</a></b><td>Template class that provides guarded pointers to TQObjects
+<tr bgcolor=#f0f0f0><td><b><a href="tqguardedptr.html">TQGuardedPtr</a></b><td>Template class that provides guarded pointers to TQObjects
<tr bgcolor=#f0f0f0><td><b><a href="ntqmetaobject.html">TQMetaObject</a></b><td>Meta information about TQt objects
<tr bgcolor=#f0f0f0><td><b><a href="qmetaproperty.html">TQMetaProperty</a></b><td>Stores meta data about a property
<tr bgcolor=#f0f0f0><td><b><a href="tqobject.html">TQObject</a></b><td>The base class of all TQt objects
diff --git a/doc/html/qaccessible-h.html b/doc/html/qaccessible-h.html
index af28f9338..97152cc28 100644
--- a/doc/html/qaccessible-h.html
+++ b/doc/html/qaccessible-h.html
@@ -79,7 +79,7 @@ body { background: #ffffff; color: black; }
#include "tqobject.h"
#include &lt;private/qcom_p.h&gt;
#include "tqrect.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqmemarray.h"
#endif // QT_H
diff --git a/doc/html/qdockarea-h.html b/doc/html/qdockarea-h.html
index ef60a96bb..1f4830f3a 100644
--- a/doc/html/qdockarea-h.html
+++ b/doc/html/qdockarea-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
#include "ntqdockwindow.h"
#include "tqlayout.h"
#include "tqvaluelist.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqtextstream.h"
#endif // QT_H
diff --git a/doc/html/qnamespace-h.html b/doc/html/qnamespace-h.html
index 99550d231..77d06b772 100644
--- a/doc/html/qnamespace-h.html
+++ b/doc/html/qnamespace-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQNAMESPACE_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
diff --git a/doc/html/qrangecontrol-h.html b/doc/html/qrangecontrol-h.html
index af57c2567..0fa779b10 100644
--- a/doc/html/qrangecontrol-h.html
+++ b/doc/html/qrangecontrol-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQRANGECONTROL_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqframe.h"
#endif // QT_H
diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf
index a7059ee45..a67086285 100644
--- a/doc/html/qt.dcf
+++ b/doc/html/qt.dcf
@@ -2944,18 +2944,18 @@
<section ref="tqgroupbox-members.html" title="List of All Member Functions"/>
<section ref="tqgroupbox-h.html" title="Header File"/>
</section>
-<section ref="ntqguardedptr.html" title="QGuardedPtr Class Reference">
- <keyword ref="ntqguardedptr.html">QGuardedPtr</keyword>
- <keyword ref="ntqguardedptr.html#isNull">isNull</keyword>
- <keyword ref="ntqguardedptr.html#operator-T-*">operator T *</keyword>
- <keyword ref="ntqguardedptr.html#operator!-eq">operator!=</keyword>
- <keyword ref="ntqguardedptr.html#operator*">operator*</keyword>
- <keyword ref="ntqguardedptr.html#operator--gt">operator-&gt;</keyword>
- <keyword ref="ntqguardedptr.html#operator-eq">operator=</keyword>
- <keyword ref="ntqguardedptr.html#operator-eq-eq">operator==</keyword>
- <keyword ref="ntqguardedptr.html#~QGuardedPtr">~QGuardedPtr</keyword>
- <section ref="qguardedptr-members.html" title="List of All Member Functions"/>
- <section ref="qguardedptr-h.html" title="Header File"/>
+<section ref="tqguardedptr.html" title="TQGuardedPtr Class Reference">
+ <keyword ref="tqguardedptr.html">TQGuardedPtr</keyword>
+ <keyword ref="tqguardedptr.html#isNull">isNull</keyword>
+ <keyword ref="tqguardedptr.html#operator-T-*">operator T *</keyword>
+ <keyword ref="tqguardedptr.html#operator!-eq">operator!=</keyword>
+ <keyword ref="tqguardedptr.html#operator*">operator*</keyword>
+ <keyword ref="tqguardedptr.html#operator--gt">operator-&gt;</keyword>
+ <keyword ref="tqguardedptr.html#operator-eq">operator=</keyword>
+ <keyword ref="tqguardedptr.html#operator-eq-eq">operator==</keyword>
+ <keyword ref="tqguardedptr.html#~TQGuardedPtr">~TQGuardedPtr</keyword>
+ <section ref="tqguardedptr-members.html" title="List of All Member Functions"/>
+ <section ref="tqguardedptr-h.html" title="Header File"/>
</section>
<section ref="tqhbox.html" title="TQHBox Class Reference">
<keyword ref="tqhbox.html">TQHBox</keyword>
diff --git a/doc/html/titleindex b/doc/html/titleindex
index cc490b64c..706f1afbb 100644
--- a/doc/html/titleindex
+++ b/doc/html/titleindex
@@ -419,8 +419,8 @@ TQGridView Class | tqgridview.html
TQGridView Member List | tqgridview-members.html
TQGroupBox Class | tqgroupbox.html
TQGroupBox Member List | tqgroupbox-members.html
-QGuardedPtr Class | ntqguardedptr.html
-QGuardedPtr Member List | qguardedptr-members.html
+TQGuardedPtr Class | tqguardedptr.html
+TQGuardedPtr Member List | tqguardedptr-members.html
TQHBox Class | tqhbox.html
TQHBox Member List | tqhbox-members.html
TQHBoxLayout Class | tqhboxlayout.html
@@ -1137,11 +1137,11 @@ tqftp.h Include File | tqftp-h.html
tqgb18030codec.h Include File | tqgb18030codec-h.html
tqgl.h Include File | tqgl-h.html
tqglcolormap.h Include File | tqglcolormap-h.html
-ntqglobal.h Include File | qglobal-h.html
+tqglobal.h Include File | tqglobal-h.html
tqgrid.h Include File | tqgrid-h.html
tqgridview.h Include File | tqgridview-h.html
tqgroupbox.h Include File | tqgroupbox-h.html
-ntqguardedptr.h Include File | qguardedptr-h.html
+tqguardedptr.h Include File | tqguardedptr-h.html
tqhbox.h Include File | tqhbox-h.html
tqhbuttongroup.h Include File | tqhbuttongroup-h.html
tqheader.h Include File | tqheader-h.html
diff --git a/doc/html/toplevel-example.html b/doc/html/toplevel-example.html
index 7f18142a6..25d078b3f 100644
--- a/doc/html/toplevel-example.html
+++ b/doc/html/toplevel-example.html
@@ -221,7 +221,7 @@ build the library.
<ol> <li><a name="footnote1"></a>
Unfortunately some X11 window managers also require the <tt>WX11BypassWM</tt> flag to be set in addition; but some other X11 window
managers will have problems if this flag is set. <a href="#footnote-call1">Back...</a> <li><a name="footnote2"></a>
-The example uses <a href="ntqguardedptr.html">TQGuardedPtr</a> to make sure that the
+The example uses <a href="tqguardedptr.html">TQGuardedPtr</a> to make sure that the
pointer is reset to zero when the widget object is destroyed
due to the <tt>WDestructiveClose</tt> flag. <a href="#footnote-call2">Back...</a> <li><a name="footnote3"></a>
diff --git a/doc/html/tqasciicache-h.html b/doc/html/tqasciicache-h.html
index 4b855e787..f2859b806 100644
--- a/doc/html/tqasciicache-h.html
+++ b/doc/html/tqasciicache-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQASCIICACHE_H
#ifndef QT_H
-#include "ntqgcache.h"
+#include "tqgcache.h"
#endif // QT_H
diff --git a/doc/html/tqasciidict-h.html b/doc/html/tqasciidict-h.html
index 793815e91..607ee3cb2 100644
--- a/doc/html/tqasciidict-h.html
+++ b/doc/html/tqasciidict-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQASCIIDICT_H
#ifndef QT_H
-#include "ntqgdict.h"
+#include "tqgdict.h"
#endif // QT_H
template&lt;class type&gt;
diff --git a/doc/html/tqcache-h.html b/doc/html/tqcache-h.html
index a588e4eb2..7401cb017 100644
--- a/doc/html/tqcache-h.html
+++ b/doc/html/tqcache-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQCACHE_H
#ifndef QT_H
-#include "ntqgcache.h"
+#include "tqgcache.h"
#endif // QT_H
template&lt;class type&gt;
diff --git a/doc/html/tqdeepcopy-h.html b/doc/html/tqdeepcopy-h.html
index e4efa73c6..7b2f1c7c3 100644
--- a/doc/html/tqdeepcopy-h.html
+++ b/doc/html/tqdeepcopy-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQDEEPCOPY_H
#ifndef QT_H
-# include "ntqglobal.h"
+# include "tqglobal.h"
#endif // QT_H
template &lt;class T&gt;
diff --git a/doc/html/tqdict-h.html b/doc/html/tqdict-h.html
index b1d95ca50..0522a9a01 100644
--- a/doc/html/tqdict-h.html
+++ b/doc/html/tqdict-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQDICT_H
#ifndef QT_H
-#include "ntqgdict.h"
+#include "tqgdict.h"
#endif // QT_H
template&lt;class type&gt;
diff --git a/doc/html/tqdir-h.html b/doc/html/tqdir-h.html
index f2105b349..7dcdd88af 100644
--- a/doc/html/tqdir-h.html
+++ b/doc/html/tqdir-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQDIR_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqstrlist.h"
#include "tqfileinfo.h"
#endif // QT_H
diff --git a/doc/html/tqdropsite-h.html b/doc/html/tqdropsite-h.html
index 84e7fff0e..cd48d738b 100644
--- a/doc/html/tqdropsite-h.html
+++ b/doc/html/tqdropsite-h.html
@@ -77,7 +77,7 @@ body { background: #ffffff; color: black; }
#ifndef QT_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#endif
diff --git a/doc/html/qglobal-h.html b/doc/html/tqglobal-h.html
index 110d27d4f..a8bfeb032 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/tqglobal-h.html
@@ -1,9 +1,9 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/ntqglobal.h:1 -->
+<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/tqglobal.h:1 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>ntqglobal.h Include File</title>
+<title>tqglobal.h Include File</title>
<style type="text/css"><!--
fn { margin-left: 1cm; text-indent: -1cm; }
a:link { color: #004faf; text-decoration: none }
@@ -29,13 +29,13 @@ body { background: #ffffff; color: black; }
| <a href="functions.html">
<font color="#004faf">Functions</font></a>
</td>
-<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>ntqglobal.h</h1>
+<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>tqglobal.h</h1>
-<p>This is the verbatim text of the ntqglobal.h include file. It is provided only for illustration; the copyright remains with Trolltech.
+<p>This is the verbatim text of the tqglobal.h include file. It is provided only for illustration; the copyright remains with Trolltech.
<hr>
<pre>
/****************************************************************************
-** $Id: qt/ntqglobal.h 3.3.8 edited Feb 2 15:00 $
+** $Id: qt/tqglobal.h 3.3.8 edited Feb 2 15:00 $
**
** Global type declarations and definitions
**
diff --git a/doc/html/qguardedptr-h.html b/doc/html/tqguardedptr-h.html
index 5880c063a..0c6c50e9f 100644
--- a/doc/html/qguardedptr-h.html
+++ b/doc/html/tqguardedptr-h.html
@@ -1,9 +1,9 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/ntqguardedptr.h:1 -->
+<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/tqguardedptr.h:1 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>ntqguardedptr.h Include File</title>
+<title>tqguardedptr.h Include File</title>
<style type="text/css"><!--
fn { margin-left: 1cm; text-indent: -1cm; }
a:link { color: #004faf; text-decoration: none }
@@ -29,13 +29,13 @@ body { background: #ffffff; color: black; }
| <a href="functions.html">
<font color="#004faf">Functions</font></a>
</td>
-<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>ntqguardedptr.h</h1>
+<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>tqguardedptr.h</h1>
-<p>This is the verbatim text of the ntqguardedptr.h include file. It is provided only for illustration; the copyright remains with Trolltech.
+<p>This is the verbatim text of the tqguardedptr.h include file. It is provided only for illustration; the copyright remains with Trolltech.
<hr>
<pre>
/****************************************************************************
-** $Id: qt/ntqguardedptr.h 3.3.8 edited Jan 11 14:38 $
+** $Id: qt/tqguardedptr.h 3.3.8 edited Jan 11 14:38 $
**
** Definition of TQGuardedPtr class
**
diff --git a/doc/html/qguardedptr-members.html b/doc/html/tqguardedptr-members.html
index 840db0154..78b80aed1 100644
--- a/doc/html/qguardedptr-members.html
+++ b/doc/html/tqguardedptr-members.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/ntqguardedptr.h:69 -->
+<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/tqguardedptr.h:69 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -32,18 +32,18 @@ body { background: #ffffff; color: black; }
<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>Complete Member List for TQGuardedPtr</h1>
<p>This is the complete list of member functions for
-<a href="ntqguardedptr.html">TQGuardedPtr</a>, including inherited members.
+<a href="tqguardedptr.html">TQGuardedPtr</a>, including inherited members.
<ul>
-<li><a href="ntqguardedptr.html#TQGuardedPtr">TQGuardedPtr</a>()
-<li><a href="ntqguardedptr.html#~TQGuardedPtr">~TQGuardedPtr</a>()
-<li><a href="ntqguardedptr.html#isNull">isNull</a>()
-<li><a href="ntqguardedptr.html#operator-T-*">operator T *</a>()
-<li><a href="ntqguardedptr.html#operator!-eq">operator!=</a>()
-<li><a href="ntqguardedptr.html#operator*">operator*</a>()
-<li><a href="ntqguardedptr.html#operator--gt">operator-&gt;</a>()
-<li><a href="ntqguardedptr.html#operator-eq">operator=</a>()
-<li><a href="ntqguardedptr.html#operator-eq-eq">operator==</a>()
+<li><a href="tqguardedptr.html#TQGuardedPtr">TQGuardedPtr</a>()
+<li><a href="tqguardedptr.html#~TQGuardedPtr">~TQGuardedPtr</a>()
+<li><a href="tqguardedptr.html#isNull">isNull</a>()
+<li><a href="tqguardedptr.html#operator-T-*">operator T *</a>()
+<li><a href="tqguardedptr.html#operator!-eq">operator!=</a>()
+<li><a href="tqguardedptr.html#operator*">operator*</a>()
+<li><a href="tqguardedptr.html#operator--gt">operator-&gt;</a>()
+<li><a href="tqguardedptr.html#operator-eq">operator=</a>()
+<li><a href="tqguardedptr.html#operator-eq-eq">operator==</a>()
</ul>
<!-- eof -->
<p><address><hr><div align=center>
diff --git a/doc/html/ntqguardedptr.html b/doc/html/tqguardedptr.html
index f5a687711..a8b550a70 100644
--- a/doc/html/ntqguardedptr.html
+++ b/doc/html/tqguardedptr.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/kernel/qguardedptr.cpp:40 -->
+<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/kernel/tqguardedptr.cpp:40 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -33,8 +33,8 @@ body { background: #ffffff; color: black; }
<p>The TQGuardedPtr class is a template class that provides guarded pointers to TQObjects.
<a href="#details">More...</a>
-<p><tt>#include &lt;<a href="qguardedptr-h.html">ntqguardedptr.h</a>&gt;</tt>
-<p><a href="qguardedptr-members.html">List of all member functions.</a>
+<p><tt>#include &lt;<a href="tqguardedptr-h.html">tqguardedptr.h</a>&gt;</tt>
+<p><a href="tqguardedptr-members.html">List of all member functions.</a>
<h2>Public Members</h2>
<ul>
<li class=fn><a href="#TQGuardedPtr"><b>TQGuardedPtr</b></a> ()</li>
@@ -114,7 +114,7 @@ or link error will result.
<p> Constructs a guarded pointer that points to same object as <em>p</em>
points to.
-<h3 class=fn><a name="TQGuardedPtr-3"></a>TQGuardedPtr::TQGuardedPtr ( const&nbsp;<a href="ntqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp;&nbsp;p )
+<h3 class=fn><a name="TQGuardedPtr-3"></a>TQGuardedPtr::TQGuardedPtr ( const&nbsp;<a href="tqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp;&nbsp;p )
</h3>
<p> Copy one guarded pointer from another. The constructed guarded
@@ -141,7 +141,7 @@ there is no referenced object; otherwise returns FALSE.
function you can pass a TQGuardedPtr&lt;X&gt; to a function where an X*
is required.
-<h3 class=fn>bool <a name="operator!-eq"></a>TQGuardedPtr::operator!= ( const&nbsp;<a href="ntqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp;&nbsp;p ) const
+<h3 class=fn>bool <a name="operator!-eq"></a>TQGuardedPtr::operator!= ( const&nbsp;<a href="tqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp;&nbsp;p ) const
</h3>
<p> Inequality operator; implements pointer semantics, the negation of
@@ -160,19 +160,19 @@ operator as you would with a normal C++ pointer.
<p> Overloaded arrow operator; implements pointer semantics. Just use
this operator as you would with a normal C++ pointer.
-<h3 class=fn><a href="ntqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp; <a name="operator-eq"></a>TQGuardedPtr::operator= ( const&nbsp;<a href="ntqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp;&nbsp;p )
+<h3 class=fn><a href="tqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp; <a name="operator-eq"></a>TQGuardedPtr::operator= ( const&nbsp;<a href="tqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp;&nbsp;p )
</h3>
<p> Assignment operator. This guarded pointer then points to the same
object as <em>p</em> points to.
-<h3 class=fn><a href="ntqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp; <a name="operator-eq-2"></a>TQGuardedPtr::operator= ( T&nbsp;*&nbsp;p )
+<h3 class=fn><a href="tqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp; <a name="operator-eq-2"></a>TQGuardedPtr::operator= ( T&nbsp;*&nbsp;p )
</h3>
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
<p> Assignment operator. This guarded pointer then points to the same
object as <em>p</em> points to.
-<h3 class=fn>bool <a name="operator-eq-eq"></a>TQGuardedPtr::operator== ( const&nbsp;<a href="ntqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp;&nbsp;p ) const
+<h3 class=fn>bool <a name="operator-eq-eq"></a>TQGuardedPtr::operator== ( const&nbsp;<a href="tqguardedptr.html">TQGuardedPtr</a>&lt;T&gt;&nbsp;&amp;&nbsp;p ) const
</h3>
<p> Equality operator; implements traditional pointer semantics.
diff --git a/doc/html/tqimageformatplugin-h.html b/doc/html/tqimageformatplugin-h.html
index ccebb345d..b9db99da2 100644
--- a/doc/html/tqimageformatplugin-h.html
+++ b/doc/html/tqimageformatplugin-h.html
@@ -76,7 +76,7 @@ body { background: #ffffff; color: black; }
#define TQIMAGEFORMATPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/doc/html/tqintcache-h.html b/doc/html/tqintcache-h.html
index 655f6803c..d3d4f8b34 100644
--- a/doc/html/tqintcache-h.html
+++ b/doc/html/tqintcache-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQINTCACHE_H
#ifndef QT_H
-#include "ntqgcache.h"
+#include "tqgcache.h"
#endif // QT_H
diff --git a/doc/html/tqintdict-h.html b/doc/html/tqintdict-h.html
index d6160d829..7b924fd57 100644
--- a/doc/html/tqintdict-h.html
+++ b/doc/html/tqintdict-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQINTDICT_H
#ifndef QT_H
-#include "ntqgdict.h"
+#include "tqgdict.h"
#endif // QT_H
template&lt;class type&gt;
diff --git a/doc/html/tqiodevice-h.html b/doc/html/tqiodevice-h.html
index 21f46dc22..a5a242b6f 100644
--- a/doc/html/tqiodevice-h.html
+++ b/doc/html/tqiodevice-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQIODEVICE_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqcstring.h"
#endif // QT_H
diff --git a/doc/html/tqmap-h.html b/doc/html/tqmap-h.html
index 6f64a738a..2ba8f2826 100644
--- a/doc/html/tqmap-h.html
+++ b/doc/html/tqmap-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQMAP_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "ntqshared.h"
#include "tqdatastream.h"
#include "tqpair.h"
diff --git a/doc/html/tqmemarray-h.html b/doc/html/tqmemarray-h.html
index 733464292..6fd05b064 100644
--- a/doc/html/tqmemarray-h.html
+++ b/doc/html/tqmemarray-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQMEMARRAY_H
#ifndef QT_H
-#include "ntqgarray.h"
+#include "tqgarray.h"
#endif // QT_H
diff --git a/doc/html/tqmenudata-h.html b/doc/html/tqmenudata-h.html
index 9303c9b95..b7a6c277a 100644
--- a/doc/html/tqmenudata-h.html
+++ b/doc/html/tqmenudata-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQMENUDATA_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqiconset.h" // conversion TQPixmap-&gt;TQIconset
#include "ntqkeysequence.h"
#include "tqstring.h"
diff --git a/doc/html/tqmutex-h.html b/doc/html/tqmutex-h.html
index 1dfe1578f..cdb6e2881 100644
--- a/doc/html/tqmutex-h.html
+++ b/doc/html/tqmutex-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQMUTEX_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#if defined(TQT_THREAD_SUPPORT)
diff --git a/doc/html/tqobject.html b/doc/html/tqobject.html
index 78b60839d..d381ffc36 100644
--- a/doc/html/tqobject.html
+++ b/doc/html/tqobject.html
@@ -140,7 +140,7 @@ and whether it <a href="#inherits">inherits</a>() another class in the TQObject
hierarchy.
<p> When an object is deleted, it emits a <a href="#destroyed">destroyed</a>() signal. You can
catch this signal to avoid dangling references to TQObjects. The
-<a href="ntqguardedptr.html">TQGuardedPtr</a> class provides an elegant way to use this feature.
+<a href="tqguardedptr.html">TQGuardedPtr</a> class provides an elegant way to use this feature.
<p> TQObjects can receive events through <a href="#event">event</a>() and filter the events
of other objects. See <a href="#installEventFilter">installEventFilter</a>() and <a href="#eventFilter">eventFilter</a>() for
details. A convenience handler, <a href="#childEvent">childEvent</a>(), can be reimplemented
diff --git a/doc/html/tqpair-h.html b/doc/html/tqpair-h.html
index 628866267..41631cf32 100644
--- a/doc/html/tqpair-h.html
+++ b/doc/html/tqpair-h.html
@@ -76,7 +76,7 @@ body { background: #ffffff; color: black; }
#define TQPAIR_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include "tqdatastream.h"
#endif // QT_H
diff --git a/doc/html/tqptrcollection-h.html b/doc/html/tqptrcollection-h.html
index 6ccde3862..092074ea3 100644
--- a/doc/html/tqptrcollection-h.html
+++ b/doc/html/tqptrcollection-h.html
@@ -76,7 +76,7 @@ body { background: #ffffff; color: black; }
#define TQPTRCOLLECTION_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
diff --git a/doc/html/tqptrdict-h.html b/doc/html/tqptrdict-h.html
index 546458afa..7d1b7468e 100644
--- a/doc/html/tqptrdict-h.html
+++ b/doc/html/tqptrdict-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQPTRDICT_H
#ifndef QT_H
-#include "ntqgdict.h"
+#include "tqgdict.h"
#endif // QT_H
template&lt;class type&gt;
diff --git a/doc/html/tqptrlist-h.html b/doc/html/tqptrlist-h.html
index aa5e489bd..4a61f288f 100644
--- a/doc/html/tqptrlist-h.html
+++ b/doc/html/tqptrlist-h.html
@@ -76,7 +76,7 @@ body { background: #ffffff; color: black; }
#define TQPTRLIST_H
#ifndef QT_H
-#include "ntqglist.h"
+#include "tqglist.h"
#endif // QT_H
template&lt;class type&gt;
diff --git a/doc/html/tqptrqueue-h.html b/doc/html/tqptrqueue-h.html
index 8bc2e1302..5edc732be 100644
--- a/doc/html/tqptrqueue-h.html
+++ b/doc/html/tqptrqueue-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQPTRQUEUE_H
#ifndef QT_H
-#include "ntqglist.h"
+#include "tqglist.h"
#endif // QT_H
template&lt;class type&gt;
diff --git a/doc/html/tqptrstack-h.html b/doc/html/tqptrstack-h.html
index 19f0029c9..a305d66ab 100644
--- a/doc/html/tqptrstack-h.html
+++ b/doc/html/tqptrstack-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQPTRSTACK_H
#ifndef QT_H
-#include "ntqglist.h"
+#include "tqglist.h"
#endif // QT_H
template&lt;class type&gt;
diff --git a/doc/html/tqptrvector-h.html b/doc/html/tqptrvector-h.html
index ceeaf48ff..e6762edcf 100644
--- a/doc/html/tqptrvector-h.html
+++ b/doc/html/tqptrvector-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQPTRVECTOR_H
#ifndef QT_H
-#include "ntqgvector.h"
+#include "tqgvector.h"
#endif // QT_H
template&lt;class type&gt;
diff --git a/doc/html/tqsemaphore-h.html b/doc/html/tqsemaphore-h.html
index 85e153ba8..e49f94167 100644
--- a/doc/html/tqsemaphore-h.html
+++ b/doc/html/tqsemaphore-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQSEMAPHORE_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#if defined(TQT_THREAD_SUPPORT)
diff --git a/doc/html/tqsgistyle-h.html b/doc/html/tqsgistyle-h.html
index a5e1dc9fc..85999810c 100644
--- a/doc/html/tqsgistyle-h.html
+++ b/doc/html/tqsgistyle-h.html
@@ -79,7 +79,7 @@ body { background: #ffffff; color: black; }
#ifndef QT_H
#include "tqmotifstyle.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqwidget.h"
#endif // QT_H
diff --git a/doc/html/tqsizepolicy-h.html b/doc/html/tqsizepolicy-h.html
index 6bcd7240e..63afd3fdc 100644
--- a/doc/html/tqsizepolicy-h.html
+++ b/doc/html/tqsizepolicy-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQSIZEPOLICY_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
// Documentation is in qabstractlayout.cpp.
diff --git a/doc/html/tqsql-h.html b/doc/html/tqsql-h.html
index 6588f2d0e..24bdd60ba 100644
--- a/doc/html/tqsql-h.html
+++ b/doc/html/tqsql-h.html
@@ -77,7 +77,7 @@ body { background: #ffffff; color: black; }
#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/doc/html/tqsqldriverplugin-h.html b/doc/html/tqsqldriverplugin-h.html
index 940172db3..ee16ef7b0 100644
--- a/doc/html/tqsqldriverplugin-h.html
+++ b/doc/html/tqsqldriverplugin-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQSQLDRIVERPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/doc/html/tqstyleplugin-h.html b/doc/html/tqstyleplugin-h.html
index 2dcd19c82..76fcf48dc 100644
--- a/doc/html/tqstyleplugin-h.html
+++ b/doc/html/tqstyleplugin-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQSTYLEPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/doc/html/tqtable-h.html b/doc/html/tqtable-h.html
index 6ee54ade4..2ea3f1e8b 100644
--- a/doc/html/tqtable-h.html
+++ b/doc/html/tqtable-h.html
@@ -83,7 +83,7 @@ body { background: #ffffff; color: black; }
#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/doc/html/tqtextcodecplugin-h.html b/doc/html/tqtextcodecplugin-h.html
index 1e717620b..6acb54ddd 100644
--- a/doc/html/tqtextcodecplugin-h.html
+++ b/doc/html/tqtextcodecplugin-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQTEXTCODECPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#endif // QT_H
diff --git a/doc/html/tqthreadstorage-h.html b/doc/html/tqthreadstorage-h.html
index 748578a84..6a15c11f3 100644
--- a/doc/html/tqthreadstorage-h.html
+++ b/doc/html/tqthreadstorage-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#ifdef TQT_THREAD_SUPPORT
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
class TQ_EXPORT TQThreadStorageData
diff --git a/doc/html/tqwaitcondition-h.html b/doc/html/tqwaitcondition-h.html
index 0cc7d9cfb..69993f79a 100644
--- a/doc/html/tqwaitcondition-h.html
+++ b/doc/html/tqwaitcondition-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQWAITCONDITION_H
#ifndef QT_H
-#include "ntqglobal.h"
+#include "tqglobal.h"
#endif // QT_H
#if defined(TQT_THREAD_SUPPORT)
diff --git a/doc/html/tqwidgetplugin-h.html b/doc/html/tqwidgetplugin-h.html
index adf01a3b3..495c4092c 100644
--- a/doc/html/tqwidgetplugin-h.html
+++ b/doc/html/tqwidgetplugin-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define TQWIDGETPLUGIN_H
#ifndef QT_H
-#include "ntqgplugin.h"
+#include "tqgplugin.h"
#include "tqstringlist.h"
#include "tqiconset.h"
#endif // QT_H
diff --git a/doc/html/tutorial1-11.html b/doc/html/tutorial1-11.html
index 678762118..f353dd3b1 100644
--- a/doc/html/tutorial1-11.html
+++ b/doc/html/tutorial1-11.html
@@ -201,7 +201,7 @@ point, we construct a <a href="tqrect.html">TQRect</a> with size 6x6 and move it
the point calculated above. In the same operation we convert the
point into the widget's coordinate system (see <a href="coordsys.html">The
Coordinate System</a>).
-<p> The tqRound() function is an inline function defined in ntqglobal.h (included
+<p> The tqRound() function is an inline function defined in tqglobal.h (included
by all other TQt header files). tqRound() rounds a double to the closest
integer.
<p> <h3> <a href="t11-main-cpp.html">t11/main.cpp</a>
diff --git a/doc/html/whatsthis b/doc/html/whatsthis
index f4ab3aa47..2c23a9b79 100644
--- a/doc/html/whatsthis
+++ b/doc/html/whatsthis
@@ -330,7 +330,7 @@ Template class that provides a list. | TQPtrList
Template class that provides a queue. | TQPtrQueue
Template class that provides a stack. | TQPtrStack
Template class that provides arrays of simple types. | TQMemArray
-Template class that provides guarded pointers to TQObjects. | QGuardedPtr
+Template class that provides guarded pointers to TQObjects. | TQGuardedPtr
Template class which ensures that implicitly shared and explicitly shared classes reference unique data. | TQDeepCopy
Template collection class that provides a vector (array). | TQPtrVector
Text object on a TQCanvas. | TQCanvasText
diff --git a/doc/man/man3/tqapplication.3qt b/doc/man/man3/tqapplication.3qt
index 0559b88e2..7ce25c9a2 100644
--- a/doc/man/man3/tqapplication.3qt
+++ b/doc/man/man3/tqapplication.3qt
@@ -1626,7 +1626,7 @@ See also x11EventFilter().
.SH "void Q_ASSERT ( bool test )"
Prints a warning message containing the source code file name and line number if \fItest\fR is FALSE.
.PP
-This is really a macro defined in ntqglobal.h.
+This is really a macro defined in tqglobal.h.
.PP
Q_ASSERT is useful for testing pre- and post-conditions.
.PP
@@ -1641,7 +1641,7 @@ Example:
//
.br
.br
- #include <ntqglobal.h>
+ #include <tqglobal.h>
.br
.br
int divide( int a, int b )
@@ -1668,7 +1668,7 @@ See also tqWarning() and Debugging.
.SH "void TQ_CHECK_PTR ( void * p )"
If \fIp\fR is 0, prints a warning message containing the source code file name and line number, saying that the program ran out of memory.
.PP
-This is really a macro defined in ntqglobal.h.
+This is really a macro defined in tqglobal.h.
.PP
Example:
.PP
diff --git a/doc/man/man3/tqguardedptr.3qt b/doc/man/man3/tqguardedptr.3qt
index b6c8e7a12..c2823a27b 100644
--- a/doc/man/man3/tqguardedptr.3qt
+++ b/doc/man/man3/tqguardedptr.3qt
@@ -1,5 +1,5 @@
'\" t
-.TH QGuardedPtr 3qt "2 February 2007" "Trolltech AS" \" -*- nroff -*-
+.TH TQGuardedPtr 3qt "2 February 2007" "Trolltech AS" \" -*- nroff -*-
.\" Copyright 1992-2007 Trolltech ASA. All rights reserved. See the
.\" license file included in the distribution for a complete license
.\" statement.
@@ -7,35 +7,35 @@
.ad l
.nh
.SH NAME
-QGuardedPtr \- Template class that provides guarded pointers to TQObjects
+TQGuardedPtr \- Template class that provides guarded pointers to TQObjects
.SH SYNOPSIS
-\fC#include <ntqguardedptr.h>\fR
+\fC#include <tqguardedptr.h>\fR
.PP
.SS "Public Members"
.in +1c
.ti -1c
-.BI "\fBQGuardedPtr\fR ()"
+.BI "\fBTQGuardedPtr\fR ()"
.br
.ti -1c
-.BI "\fBQGuardedPtr\fR ( T * p )"
+.BI "\fBTQGuardedPtr\fR ( T * p )"
.br
.ti -1c
-.BI "\fBQGuardedPtr\fR ( const QGuardedPtr<T> & p )"
+.BI "\fBTQGuardedPtr\fR ( const TQGuardedPtr<T> & p )"
.br
.ti -1c
-.BI "\fB~QGuardedPtr\fR ()"
+.BI "\fB~TQGuardedPtr\fR ()"
.br
.ti -1c
-.BI "QGuardedPtr<T> & \fBoperator=\fR ( const QGuardedPtr<T> & p )"
+.BI "TQGuardedPtr<T> & \fBoperator=\fR ( const TQGuardedPtr<T> & p )"
.br
.ti -1c
-.BI "QGuardedPtr<T> & \fBoperator=\fR ( T * p )"
+.BI "TQGuardedPtr<T> & \fBoperator=\fR ( T * p )"
.br
.ti -1c
-.BI "bool \fBoperator==\fR ( const QGuardedPtr<T> & p ) const"
+.BI "bool \fBoperator==\fR ( const TQGuardedPtr<T> & p ) const"
.br
.ti -1c
-.BI "bool \fBoperator!=\fR ( const QGuardedPtr<T> & p ) const"
+.BI "bool \fBoperator!=\fR ( const TQGuardedPtr<T> & p ) const"
.br
.ti -1c
.BI "bool \fBisNull\fR () const"
@@ -51,9 +51,9 @@ QGuardedPtr \- Template class that provides guarded pointers to TQObjects
.br
.in -1c
.SH DESCRIPTION
-The QGuardedPtr class is a template class that provides guarded pointers to TQObjects.
+The TQGuardedPtr class is a template class that provides guarded pointers to TQObjects.
.PP
-A guarded pointer, \fCQGuardedPtr<X>\fR, behaves like a normal C++ pointer \fCX*\fR, except that it is automatically set to 0 when the referenced object is destroyed (unlike normal C++ pointers, which become "dangling pointers" in such cases). \fCX\fR must be a subclass of TQObject.
+A guarded pointer, \fCTQGuardedPtr<X>\fR, behaves like a normal C++ pointer \fCX*\fR, except that it is automatically set to 0 when the referenced object is destroyed (unlike normal C++ pointers, which become "dangling pointers" in such cases). \fCX\fR must be a subclass of TQObject.
.PP
Guarded pointers are useful whenever you need to store a pointer to a TQObject that is owned by someone else and therefore might be destroyed while you still hold a reference to it. You can safely test the pointer for validity.
.PP
@@ -61,7 +61,7 @@ Example:
.PP
.nf
.br
- QGuardedPtr<TQLabel> label = new TQLabel( 0, "label" );
+ TQGuardedPtr<TQLabel> label = new TQLabel( 0, "label" );
.br
label->setText( "I like guarded pointers" );
.br
@@ -81,49 +81,49 @@ Example:
.PP
The program will output \fCThe label has been destroyed\fR rather than dereferencing an invalid address in \fClabel->show()\fR.
.PP
-The functions and operators available with a QGuardedPtr are the same as those available with a normal unguarded pointer, except the pointer arithmetic operators (++, --, -, and +), which are normally used only with arrays of objects. Use them like normal pointers and you will not need to read this class documentation.
+The functions and operators available with a TQGuardedPtr are the same as those available with a normal unguarded pointer, except the pointer arithmetic operators (++, --, -, and +), which are normally used only with arrays of objects. Use them like normal pointers and you will not need to read this class documentation.
.PP
For creating guarded pointers, you can construct or assign to them from an X* or from another guarded pointer of the same type. You can compare them with each other using operator==() and operator!=(), or test for 0 with isNull(). And you can dereference them using either the \fC*x\fR or the \fCx->member\fR notation.
.PP
-A guarded pointer will automatically cast to an X*, so you can freely mix guarded and unguarded pointers. This means that if you have a QGuardedPtr<TQWidget>, you can pass it to a function that requires a TQWidget*. For this reason, it is of little value to declare functions to take a QGuardedPtr as a parameter; just use normal pointers. Use a QGuardedPtr when you are storing a pointer over time.
+A guarded pointer will automatically cast to an X*, so you can freely mix guarded and unguarded pointers. This means that if you have a TQGuardedPtr<TQWidget>, you can pass it to a function that requires a TQWidget*. For this reason, it is of little value to declare functions to take a TQGuardedPtr as a parameter; just use normal pointers. Use a TQGuardedPtr when you are storing a pointer over time.
.PP
Note again that class \fIX\fR must inherit TQObject, or a compilation or link error will result.
.PP
See also Object Model.
.SH MEMBER FUNCTION DOCUMENTATION
-.SH "QGuardedPtr::QGuardedPtr ()"
+.SH "TQGuardedPtr::TQGuardedPtr ()"
Constructs a 0 guarded pointer.
.PP
See also isNull().
-.SH "QGuardedPtr::QGuardedPtr ( T * p )"
+.SH "TQGuardedPtr::TQGuardedPtr ( T * p )"
Constructs a guarded pointer that points to same object as \fIp\fR points to.
-.SH "QGuardedPtr::QGuardedPtr ( const QGuardedPtr<T> & p )"
+.SH "TQGuardedPtr::TQGuardedPtr ( const TQGuardedPtr<T> & p )"
Copy one guarded pointer from another. The constructed guarded pointer points to the same object that \fIp\fR points to (which may be 0).
-.SH "QGuardedPtr::~QGuardedPtr ()"
+.SH "TQGuardedPtr::~TQGuardedPtr ()"
Destroys the guarded pointer. Just like a normal pointer, destroying a guarded pointer does \fInot\fR destroy the object being pointed to.
-.SH "bool QGuardedPtr::isNull () const"
+.SH "bool TQGuardedPtr::isNull () const"
Returns \fCTRUE\fR if the referenced object has been destroyed or if there is no referenced object; otherwise returns FALSE.
-.SH "QGuardedPtr::operator T * () const"
-Cast operator; implements pointer semantics. Because of this function you can pass a QGuardedPtr<X> to a function where an X* is required.
-.SH "bool QGuardedPtr::operator!= ( const QGuardedPtr<T> & p ) const"
+.SH "TQGuardedPtr::operator T * () const"
+Cast operator; implements pointer semantics. Because of this function you can pass a TQGuardedPtr<X> to a function where an X* is required.
+.SH "bool TQGuardedPtr::operator!= ( const TQGuardedPtr<T> & p ) const"
Inequality operator; implements pointer semantics, the negation of operator==(). Returns TRUE if \fIp\fR and this guarded pointer are not pointing to the same object; otherwise returns FALSE.
-.SH "T & QGuardedPtr::operator* () const"
+.SH "T & TQGuardedPtr::operator* () const"
Dereference operator; implements pointer semantics. Just use this operator as you would with a normal C++ pointer.
-.SH "T * QGuardedPtr::operator-> () const"
+.SH "T * TQGuardedPtr::operator-> () const"
Overloaded arrow operator; implements pointer semantics. Just use this operator as you would with a normal C++ pointer.
-.SH "QGuardedPtr<T> & QGuardedPtr::operator= ( const QGuardedPtr<T> & p )"
+.SH "TQGuardedPtr<T> & TQGuardedPtr::operator= ( const TQGuardedPtr<T> & p )"
Assignment operator. This guarded pointer then points to the same object as \fIp\fR points to.
-.SH "QGuardedPtr<T> & QGuardedPtr::operator= ( T * p )"
+.SH "TQGuardedPtr<T> & TQGuardedPtr::operator= ( T * p )"
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
.PP
Assignment operator. This guarded pointer then points to the same object as \fIp\fR points to.
-.SH "bool QGuardedPtr::operator== ( const QGuardedPtr<T> & p ) const"
+.SH "bool TQGuardedPtr::operator== ( const TQGuardedPtr<T> & p ) const"
Equality operator; implements traditional pointer semantics. Returns TRUE if both \fIp\fR and this guarded pointer are 0, or if both \fIp\fR and this pointer point to the same object; otherwise returns FALSE.
.PP
See also operator!=().
.SH "SEE ALSO"
-.BR http://doc.trolltech.com/ntqguardedptr.html
+.BR http://doc.trolltech.com/tqguardedptr.html
.BR http://www.trolltech.com/faq/tech.html
.SH COPYRIGHT
Copyright 1992-2007 Trolltech ASA, http://www.trolltech.com. See the
diff --git a/doc/man/man3/tqmemarray.3qt b/doc/man/man3/tqmemarray.3qt
index 5274cd480..ad703b5d6 100644
--- a/doc/man/man3/tqmemarray.3qt
+++ b/doc/man/man3/tqmemarray.3qt
@@ -448,7 +448,7 @@ Returns TRUE if successful, or FALSE if the memory cannot be allocated.
.PP
New elements are not initialized.
.PP
-\fIoptim\fR is either \fCQGArray::MemOptim\fR (the default) or \fCQGArray::SpeedOptim\fR.
+\fIoptim\fR is either \fCTQGArray::MemOptim\fR (the default) or \fCTQGArray::SpeedOptim\fR.
.PP
\fBNote:\fR By default, \fCSpeedOptim\fR is not available for general use since it is only available if TQt is built in a particular configuration.
.PP
diff --git a/doc/man/man3/tqobject.3qt b/doc/man/man3/tqobject.3qt
index 8f44b0760..5c2e2e240 100644
--- a/doc/man/man3/tqobject.3qt
+++ b/doc/man/man3/tqobject.3qt
@@ -203,7 +203,7 @@ TQObjects organize themselves in object trees. When you create a TQObject with a
.PP
Every object has an object name() and can report its className() and whether it inherits() another class in the TQObject inheritance hierarchy.
.PP
-When an object is deleted, it emits a destroyed() signal. You can catch this signal to avoid dangling references to TQObjects. The QGuardedPtr class provides an elegant way to use this feature.
+When an object is deleted, it emits a destroyed() signal. You can catch this signal to avoid dangling references to TQObjects. The TQGuardedPtr class provides an elegant way to use this feature.
.PP
TQObjects can receive events through event() and filter the events of other objects. See installEventFilter() and eventFilter() for details. A convenience handler, childEvent(), can be reimplemented to catch child events.
.PP
diff --git a/doc/man/man3/tqptrlist.3qt b/doc/man/man3/tqptrlist.3qt
index 454bcd00a..ce36a2136 100644
--- a/doc/man/man3/tqptrlist.3qt
+++ b/doc/man/man3/tqptrlist.3qt
@@ -141,7 +141,7 @@ Inherited by TQObjectList and TQStrList.
.BI "type * \fBprev\fR ()"
.br
.ti -1c
-.BI "void \fBtoVector\fR ( QGVector * vec ) const"
+.BI "void \fBtoVector\fR ( TQGVector * vec ) const"
.br
.in -1c
.SS "Important Inherited Members"
@@ -679,7 +679,7 @@ All list iterators that refer to the taken item will be set to point to the item
\fBWarning:\fR Do not call this function unless you are an expert.
.PP
See also removeNode() and currentNode().
-.SH "void TQPtrList::toVector ( QGVector * vec ) const"
+.SH "void TQPtrList::toVector ( TQGVector * vec ) const"
Stores all list items in the vector \fIvec\fR.
.PP
The vector must be of the same item type, otherwise the result will be undefined.
diff --git a/doc/man/man3/tqvariant.3qt b/doc/man/man3/tqvariant.3qt
index 6623e73cd..d164b5856 100644
--- a/doc/man/man3/tqvariant.3qt
+++ b/doc/man/man3/tqvariant.3qt
@@ -544,7 +544,7 @@ This enum type defines the types of variable that a QVariant can contain.
.TP
\fCQVariant::UInt\fR - an unsigned int
.PP
-Note that Qt's definition of bool depends on the compiler. ntqglobal.h has the system-dependent definition of bool.
+Note that Qt's definition of bool depends on the compiler. tqglobal.h has the system-dependent definition of bool.
.SH MEMBER FUNCTION DOCUMENTATION
.SH "QVariant::QVariant ()"
Constructs an invalid variant.
diff --git a/doc/object.doc b/doc/object.doc
index 411f4b299..ec18c7216 100644
--- a/doc/object.doc
+++ b/doc/object.doc
@@ -63,7 +63,7 @@ Qt adds these features to C++:
event-driven GUI;
\i hierarchical and queryable \link objecttrees.html object
trees \endlink that organize object ownership in a natural way;
-\i guarded pointers, \l QGuardedPtr, that are automatically
+\i guarded pointers, \l TQGuardedPtr, that are automatically
set to 0 when the referenced object is destroyed, unlike normal C++
pointers which become "dangling pointers" when their objects are destroyed.
\endlist
diff --git a/doc/qguardedptr.doc b/doc/tqguardedptr.doc
index a37170bd7..951f44a30 100644
--- a/doc/qguardedptr.doc
+++ b/doc/tqguardedptr.doc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** QGuardedPtr class documentation
+** TQGuardedPtr class documentation
**
** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
**
@@ -38,7 +38,7 @@
/*****************************************************************************
- QGuardedPtr documentation
+ TQGuardedPtr documentation
*****************************************************************************/
// Moved to ../src/kernel/qguarderptr.cpp
diff --git a/doc/tqmemarray.doc b/doc/tqmemarray.doc
index 97fe1531f..8a62386d3 100644
--- a/doc/tqmemarray.doc
+++ b/doc/tqmemarray.doc
@@ -288,8 +288,8 @@
New elements are not initialized.
- \a optim is either \c QGArray::MemOptim (the default) or
- \c QGArray::SpeedOptim.
+ \a optim is either \c TQGArray::MemOptim (the default) or
+ \c TQGArray::SpeedOptim.
<b>Note:</b> By default, \c SpeedOptim is not available for general
use since it is only available if TQt is built in a particular
diff --git a/doc/tqptrlist.doc b/doc/tqptrlist.doc
index 7eb7029c1..6d2c2dc91 100644
--- a/doc/tqptrlist.doc
+++ b/doc/tqptrlist.doc
@@ -781,7 +781,7 @@
*/
/*!
- \fn void TQPtrList::toVector( QGVector *vec ) const
+ \fn void TQPtrList::toVector( TQGVector *vec ) const
Stores all list items in the vector \a vec.
diff --git a/doc/tqptrvector.doc b/doc/tqptrvector.doc
index dba9ea9bd..b6c9f2873 100644
--- a/doc/tqptrvector.doc
+++ b/doc/tqptrvector.doc
@@ -360,7 +360,7 @@
/*!
- \fn void TQPtrVector::toList( QGList *list ) const
+ \fn void TQPtrVector::toList( TQGList *list ) const
\internal
diff --git a/doc/tutorial.doc b/doc/tutorial.doc
index c1a6fe49b..b07512c29 100644
--- a/doc/tutorial.doc
+++ b/doc/tutorial.doc
@@ -1654,7 +1654,7 @@ the point calculated above. In the same operation we convert the
point into the widget's coordinate system (see \link coordsys.html The
Coordinate System\endlink).
-The tqRound() function is an inline function defined in ntqglobal.h (included
+The tqRound() function is an inline function defined in tqglobal.h (included
by all other TQt header files). tqRound() rounds a double to the closest
integer.
diff --git a/examples/demo/opengl/fbm.c b/examples/demo/opengl/fbm.c
index 5bfa48441..010768e14 100644
--- a/examples/demo/opengl/fbm.c
+++ b/examples/demo/opengl/fbm.c
@@ -10,7 +10,7 @@
******************************************************************/
#if defined (_MSC_VER)
-#include <ntqglobal.h>
+#include <tqglobal.h>
#endif
#include <time.h>
diff --git a/examples/drawdemo/drawdemo.cpp b/examples/drawdemo/drawdemo.cpp
index bc3d6ae3c..6f34c746f 100644
--- a/examples/drawdemo/drawdemo.cpp
+++ b/examples/drawdemo/drawdemo.cpp
@@ -176,7 +176,7 @@ DrawView::DrawView()
// ourDrawFunctions-array.
for ( i=0; (n=ourDrawFunctions[i].name) != 0; i++ ) {
int w = fm.width( n );
- maxwidth = TQMAX(w,maxwidth); // TQMAX is a macro defined in ntqglobal.h
+ maxwidth = TQMAX(w,maxwidth); // TQMAX is a macro defined in tqglobal.h
// and returns the biggest of to values.
// Due to its macro nature one should use it with care and with
// constant parameters only.
diff --git a/examples/life/patterns.cpp b/examples/life/patterns.cpp
index 66c4c4d5b..b30b3b544 100644
--- a/examples/life/patterns.cpp
+++ b/examples/life/patterns.cpp
@@ -26,7 +26,7 @@
* other special, indirect and consequential damages.
*****************************************************************************/
-//#include <ntqglobal.h>
+//#include <tqglobal.h>
#define NUMPTS 63
diff --git a/examples/tetrix/tqdragapp.cpp b/examples/tetrix/tqdragapp.cpp
index b759403aa..37ed4e45c 100644
--- a/examples/tetrix/tqdragapp.cpp
+++ b/examples/tetrix/tqdragapp.cpp
@@ -11,7 +11,7 @@
#include "tqptrlist.h"
#include "tqintdict.h"
#include "tqpopupmenu.h"
-#include "ntqguardedptr.h"
+#include "tqguardedptr.h"
#include "tqcolor.h"
#include "tqwidget.h"
#include "tqfontmetrics.h"
diff --git a/examples/toplevel/options.ui b/examples/toplevel/options.ui
index 183f39b63..c78d74f4c 100644
--- a/examples/toplevel/options.ui
+++ b/examples/toplevel/options.ui
@@ -533,7 +533,7 @@ Note that this attribute is not supported on many windowing systems and will hav
</connection>
</connections>
<includes>
- <include location="global" impldecl="in declaration">ntqguardedptr.h</include>
+ <include location="global" impldecl="in declaration">tqguardedptr.h</include>
<include location="global" impldecl="in declaration">tqvbox.h</include>
<include location="global" impldecl="in implementation">tqfiledialog.h</include>
</includes>
diff --git a/examples/toplevel/toplevel.doc b/examples/toplevel/toplevel.doc
index f65adc546..b72a42cbc 100644
--- a/examples/toplevel/toplevel.doc
+++ b/examples/toplevel/toplevel.doc
@@ -104,7 +104,7 @@
The widget is created if it has not been created yet, or if it was
closed (since we use the \c WDestructiveClose flag). Note that the
window is not visible yet.
- \footnote The example uses QGuardedPtr to make sure that the
+ \footnote The example uses TQGuardedPtr to make sure that the
pointer is reset to zero when the widget object is destroyed
due to the \c WDestructiveClose flag. \endfootnote
diff --git a/include/ntqgarray.h b/include/ntqgarray.h
deleted file mode 120000
index 3396ae70f..000000000
--- a/include/ntqgarray.h
+++ /dev/null
@@ -1 +0,0 @@
-../src/tools/ntqgarray.h \ No newline at end of file
diff --git a/include/ntqgcache.h b/include/ntqgcache.h
deleted file mode 120000
index 38498483f..000000000
--- a/include/ntqgcache.h
+++ /dev/null
@@ -1 +0,0 @@
-../src/tools/ntqgcache.h \ No newline at end of file
diff --git a/include/ntqgdict.h b/include/ntqgdict.h
deleted file mode 120000
index a31575627..000000000
--- a/include/ntqgdict.h
+++ /dev/null
@@ -1 +0,0 @@
-../src/tools/ntqgdict.h \ No newline at end of file
diff --git a/include/ntqgeneric.h b/include/ntqgeneric.h
deleted file mode 120000
index 18840b2b5..000000000
--- a/include/ntqgeneric.h
+++ /dev/null
@@ -1 +0,0 @@
-../src/tools/ntqgeneric.h \ No newline at end of file
diff --git a/include/ntqglist.h b/include/ntqglist.h
deleted file mode 120000
index ae4ee5199..000000000
--- a/include/ntqglist.h
+++ /dev/null
@@ -1 +0,0 @@
-../src/tools/ntqglist.h \ No newline at end of file
diff --git a/include/ntqglobal.h b/include/ntqglobal.h
deleted file mode 120000
index 0e09d93d5..000000000
--- a/include/ntqglobal.h
+++ /dev/null
@@ -1 +0,0 @@
-../src/tools/ntqglobal.h \ No newline at end of file
diff --git a/include/ntqgplugin.h b/include/ntqgplugin.h
deleted file mode 120000
index 5a1542137..000000000
--- a/include/ntqgplugin.h
+++ /dev/null
@@ -1 +0,0 @@
-../src/kernel/ntqgplugin.h \ No newline at end of file
diff --git a/include/ntqguardedptr.h b/include/ntqguardedptr.h
deleted file mode 120000
index 9f5d3d6e8..000000000
--- a/include/ntqguardedptr.h
+++ /dev/null
@@ -1 +0,0 @@
-../src/kernel/ntqguardedptr.h \ No newline at end of file
diff --git a/include/ntqgvector.h b/include/ntqgvector.h
deleted file mode 120000
index acb85086c..000000000
--- a/include/ntqgvector.h
+++ /dev/null
@@ -1 +0,0 @@
-../src/tools/ntqgvector.h \ No newline at end of file
diff --git a/include/private/qgpluginmanager_p.h b/include/private/qgpluginmanager_p.h
deleted file mode 120000
index 18a99360c..000000000
--- a/include/private/qgpluginmanager_p.h
+++ /dev/null
@@ -1 +0,0 @@
-../../src/tools/qgpluginmanager_p.h \ No newline at end of file
diff --git a/include/private/tqgpluginmanager_p.h b/include/private/tqgpluginmanager_p.h
new file mode 120000
index 000000000..e3ba037bf
--- /dev/null
+++ b/include/private/tqgpluginmanager_p.h
@@ -0,0 +1 @@
+../../src/tools/tqgpluginmanager_p.h \ No newline at end of file
diff --git a/include/tqgarray.h b/include/tqgarray.h
new file mode 120000
index 000000000..afc6cf9a1
--- /dev/null
+++ b/include/tqgarray.h
@@ -0,0 +1 @@
+../src/tools/tqgarray.h \ No newline at end of file
diff --git a/include/tqgcache.h b/include/tqgcache.h
new file mode 120000
index 000000000..81a756044
--- /dev/null
+++ b/include/tqgcache.h
@@ -0,0 +1 @@
+../src/tools/tqgcache.h \ No newline at end of file
diff --git a/include/tqgdict.h b/include/tqgdict.h
new file mode 120000
index 000000000..082d3c8e9
--- /dev/null
+++ b/include/tqgdict.h
@@ -0,0 +1 @@
+../src/tools/tqgdict.h \ No newline at end of file
diff --git a/include/tqglist.h b/include/tqglist.h
new file mode 120000
index 000000000..cbc1f4189
--- /dev/null
+++ b/include/tqglist.h
@@ -0,0 +1 @@
+../src/tools/tqglist.h \ No newline at end of file
diff --git a/include/tqglobal.h b/include/tqglobal.h
new file mode 120000
index 000000000..ef6895d2d
--- /dev/null
+++ b/include/tqglobal.h
@@ -0,0 +1 @@
+../src/tools/tqglobal.h \ No newline at end of file
diff --git a/include/tqgplugin.h b/include/tqgplugin.h
new file mode 120000
index 000000000..cf689bbae
--- /dev/null
+++ b/include/tqgplugin.h
@@ -0,0 +1 @@
+../src/kernel/tqgplugin.h \ No newline at end of file
diff --git a/include/tqguardedptr.h b/include/tqguardedptr.h
new file mode 120000
index 000000000..e7e8b6be6
--- /dev/null
+++ b/include/tqguardedptr.h
@@ -0,0 +1 @@
+../src/kernel/tqguardedptr.h \ No newline at end of file
diff --git a/include/tqgvector.h b/include/tqgvector.h
new file mode 120000
index 000000000..0193e2f63
--- /dev/null
+++ b/include/tqgvector.h
@@ -0,0 +1 @@
+../src/tools/tqgvector.h \ No newline at end of file
diff --git a/mkspecs/aix-g++-64/qplatformdefs.h b/mkspecs/aix-g++-64/qplatformdefs.h
index c141ea519..6a1160382 100644
--- a/mkspecs/aix-g++-64/qplatformdefs.h
+++ b/mkspecs/aix-g++-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/aix-g++/qplatformdefs.h b/mkspecs/aix-g++/qplatformdefs.h
index e2d4e43fa..a001355af 100644
--- a/mkspecs/aix-g++/qplatformdefs.h
+++ b/mkspecs/aix-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/aix-xlc-64/qplatformdefs.h b/mkspecs/aix-xlc-64/qplatformdefs.h
index 5daec24ba..e943236ba 100644
--- a/mkspecs/aix-xlc-64/qplatformdefs.h
+++ b/mkspecs/aix-xlc-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/aix-xlc/qplatformdefs.h b/mkspecs/aix-xlc/qplatformdefs.h
index 6e27328f8..b57c4f276 100644
--- a/mkspecs/aix-xlc/qplatformdefs.h
+++ b/mkspecs/aix-xlc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/bsdi-g++/qplatformdefs.h b/mkspecs/bsdi-g++/qplatformdefs.h
index fad1e16a4..8fb03ad3b 100644
--- a/mkspecs/bsdi-g++/qplatformdefs.h
+++ b/mkspecs/bsdi-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/cygwin-g++/qplatformdefs.h b/mkspecs/cygwin-g++/qplatformdefs.h
index 2df16d923..a5366e118 100644
--- a/mkspecs/cygwin-g++/qplatformdefs.h
+++ b/mkspecs/cygwin-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/darwin-g++/qplatformdefs.h b/mkspecs/darwin-g++/qplatformdefs.h
index e2e383dc7..7d1c63629 100644
--- a/mkspecs/darwin-g++/qplatformdefs.h
+++ b/mkspecs/darwin-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/dgux-g++/qplatformdefs.h b/mkspecs/dgux-g++/qplatformdefs.h
index 50c266b1b..ffca35e44 100644
--- a/mkspecs/dgux-g++/qplatformdefs.h
+++ b/mkspecs/dgux-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/dilos-g++/qplatformdefs.h b/mkspecs/dilos-g++/qplatformdefs.h
index 48c666ac1..a7a28c715 100644
--- a/mkspecs/dilos-g++/qplatformdefs.h
+++ b/mkspecs/dilos-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
#ifndef _POSIX_PTHREAD_SEMANTICS
diff --git a/mkspecs/freebsd-clang/qplatformdefs.h b/mkspecs/freebsd-clang/qplatformdefs.h
index 17075a738..e1743da2f 100644
--- a/mkspecs/freebsd-clang/qplatformdefs.h
+++ b/mkspecs/freebsd-clang/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/freebsd-g++/qplatformdefs.h b/mkspecs/freebsd-g++/qplatformdefs.h
index 5f8a8adda..ae07a2c69 100644
--- a/mkspecs/freebsd-g++/qplatformdefs.h
+++ b/mkspecs/freebsd-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/freebsd-icc/qplatformdefs.h b/mkspecs/freebsd-icc/qplatformdefs.h
index 5f8a8adda..ae07a2c69 100644
--- a/mkspecs/freebsd-icc/qplatformdefs.h
+++ b/mkspecs/freebsd-icc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/hpux-acc-64/qplatformdefs.h b/mkspecs/hpux-acc-64/qplatformdefs.h
index f0d2d1ed6..eda20ebf5 100644
--- a/mkspecs/hpux-acc-64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h
index cff4a8bbf..37c59cc19 100644
--- a/mkspecs/hpux-acc-o64/qplatformdefs.h
+++ b/mkspecs/hpux-acc-o64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h
index 1a7500979..ae371c99a 100644
--- a/mkspecs/hpux-acc/qplatformdefs.h
+++ b/mkspecs/hpux-acc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/hpux-cc/qplatformdefs.h b/mkspecs/hpux-cc/qplatformdefs.h
index 956fd05d5..7c6408fb4 100644
--- a/mkspecs/hpux-cc/qplatformdefs.h
+++ b/mkspecs/hpux-cc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/hpux-g++-64/qplatformdefs.h b/mkspecs/hpux-g++-64/qplatformdefs.h
index f0d2d1ed6..eda20ebf5 100644
--- a/mkspecs/hpux-g++-64/qplatformdefs.h
+++ b/mkspecs/hpux-g++-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h
index ce22db0d6..035d27ed4 100644
--- a/mkspecs/hpux-g++/qplatformdefs.h
+++ b/mkspecs/hpux-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h
index cff4a8bbf..37c59cc19 100644
--- a/mkspecs/hpuxi-acc-32/qplatformdefs.h
+++ b/mkspecs/hpuxi-acc-32/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h
index cff4a8bbf..37c59cc19 100644
--- a/mkspecs/hpuxi-acc-64/qplatformdefs.h
+++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/hurd-g++/qplatformdefs.h b/mkspecs/hurd-g++/qplatformdefs.h
index 51de25a52..251b936d6 100644
--- a/mkspecs/hurd-g++/qplatformdefs.h
+++ b/mkspecs/hurd-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/irix-cc-64/qplatformdefs.h b/mkspecs/irix-cc-64/qplatformdefs.h
index 0606b7ace..5c7e122ad 100644
--- a/mkspecs/irix-cc-64/qplatformdefs.h
+++ b/mkspecs/irix-cc-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/irix-cc-o32/qplatformdefs.h b/mkspecs/irix-cc-o32/qplatformdefs.h
index a2a3bd868..815699bb4 100644
--- a/mkspecs/irix-cc-o32/qplatformdefs.h
+++ b/mkspecs/irix-cc-o32/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/irix-cc/qplatformdefs.h b/mkspecs/irix-cc/qplatformdefs.h
index 0606b7ace..5c7e122ad 100644
--- a/mkspecs/irix-cc/qplatformdefs.h
+++ b/mkspecs/irix-cc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/irix-g++/qplatformdefs.h b/mkspecs/irix-g++/qplatformdefs.h
index 655a0a183..583bc76b5 100644
--- a/mkspecs/irix-g++/qplatformdefs.h
+++ b/mkspecs/irix-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/linux-clang/qplatformdefs.h b/mkspecs/linux-clang/qplatformdefs.h
index c770770f3..976472985 100644
--- a/mkspecs/linux-clang/qplatformdefs.h
+++ b/mkspecs/linux-clang/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-cxx/qplatformdefs.h b/mkspecs/linux-cxx/qplatformdefs.h
index d2267da05..df314007c 100644
--- a/mkspecs/linux-cxx/qplatformdefs.h
+++ b/mkspecs/linux-cxx/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-ecc-64/qplatformdefs.h b/mkspecs/linux-ecc-64/qplatformdefs.h
index d2267da05..df314007c 100644
--- a/mkspecs/linux-ecc-64/qplatformdefs.h
+++ b/mkspecs/linux-ecc-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-g++-32/qplatformdefs.h b/mkspecs/linux-g++-32/qplatformdefs.h
index c770770f3..976472985 100644
--- a/mkspecs/linux-g++-32/qplatformdefs.h
+++ b/mkspecs/linux-g++-32/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-g++-64/qplatformdefs.h b/mkspecs/linux-g++-64/qplatformdefs.h
index c770770f3..976472985 100644
--- a/mkspecs/linux-g++-64/qplatformdefs.h
+++ b/mkspecs/linux-g++-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-g++-sparc/qplatformdefs.h b/mkspecs/linux-g++-sparc/qplatformdefs.h
index c770770f3..976472985 100644
--- a/mkspecs/linux-g++-sparc/qplatformdefs.h
+++ b/mkspecs/linux-g++-sparc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h
index c770770f3..976472985 100644
--- a/mkspecs/linux-g++/qplatformdefs.h
+++ b/mkspecs/linux-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-icc/qplatformdefs.h b/mkspecs/linux-icc/qplatformdefs.h
index d2267da05..df314007c 100644
--- a/mkspecs/linux-icc/qplatformdefs.h
+++ b/mkspecs/linux-icc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h
index 606a9dad1..a3f9861aa 100644
--- a/mkspecs/linux-kcc/qplatformdefs.h
+++ b/mkspecs/linux-kcc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-kylix/qplatformdefs.h b/mkspecs/linux-kylix/qplatformdefs.h
index d2267da05..df314007c 100644
--- a/mkspecs/linux-kylix/qplatformdefs.h
+++ b/mkspecs/linux-kylix/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/linux-pgcc/qplatformdefs.h b/mkspecs/linux-pgcc/qplatformdefs.h
index d2267da05..df314007c 100644
--- a/mkspecs/linux-pgcc/qplatformdefs.h
+++ b/mkspecs/linux-pgcc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#ifndef _DEFAULT_SOURCE
# define _DEFAULT_SOURCE
diff --git a/mkspecs/lynxos-g++/qplatformdefs.h b/mkspecs/lynxos-g++/qplatformdefs.h
index 9418b263e..746d155a7 100644
--- a/mkspecs/lynxos-g++/qplatformdefs.h
+++ b/mkspecs/lynxos-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/macx-g++/qplatformdefs.h b/mkspecs/macx-g++/qplatformdefs.h
index 514474e0e..af3e65cd0 100644
--- a/mkspecs/macx-g++/qplatformdefs.h
+++ b/mkspecs/macx-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/macx-mwerks/qplatformdefs.h b/mkspecs/macx-mwerks/qplatformdefs.h
index bb77570a7..1b961b8f7 100644
--- a/mkspecs/macx-mwerks/qplatformdefs.h
+++ b/mkspecs/macx-mwerks/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/macx-pbuilder/qplatformdefs.h b/mkspecs/macx-pbuilder/qplatformdefs.h
index 514474e0e..af3e65cd0 100644
--- a/mkspecs/macx-pbuilder/qplatformdefs.h
+++ b/mkspecs/macx-pbuilder/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/macx-xlc/qplatformdefs.h b/mkspecs/macx-xlc/qplatformdefs.h
index 514474e0e..af3e65cd0 100644
--- a/mkspecs/macx-xlc/qplatformdefs.h
+++ b/mkspecs/macx-xlc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/netbsd-g++/qplatformdefs.h b/mkspecs/netbsd-g++/qplatformdefs.h
index f0e72f190..5e246c2ae 100644
--- a/mkspecs/netbsd-g++/qplatformdefs.h
+++ b/mkspecs/netbsd-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/openbsd-g++/qplatformdefs.h b/mkspecs/openbsd-g++/qplatformdefs.h
index 5dea7a473..4830a0cf2 100644
--- a/mkspecs/openbsd-g++/qplatformdefs.h
+++ b/mkspecs/openbsd-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/qnx-g++/qplatformdefs.h b/mkspecs/qnx-g++/qplatformdefs.h
index 9ce955a6c..f4db48be7 100644
--- a/mkspecs/qnx-g++/qplatformdefs.h
+++ b/mkspecs/qnx-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/reliant-cds-64/qplatformdefs.h b/mkspecs/reliant-cds-64/qplatformdefs.h
index 29392edab..99fca770b 100644
--- a/mkspecs/reliant-cds-64/qplatformdefs.h
+++ b/mkspecs/reliant-cds-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/reliant-cds/qplatformdefs.h b/mkspecs/reliant-cds/qplatformdefs.h
index c4aa26d8d..718c7f4b8 100644
--- a/mkspecs/reliant-cds/qplatformdefs.h
+++ b/mkspecs/reliant-cds/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/sco-cc/qplatformdefs.h b/mkspecs/sco-cc/qplatformdefs.h
index 3c9348c22..0f0fd0c5c 100644
--- a/mkspecs/sco-cc/qplatformdefs.h
+++ b/mkspecs/sco-cc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/sco-g++/qplatformdefs.h b/mkspecs/sco-g++/qplatformdefs.h
index 189b69daa..12d956f4b 100644
--- a/mkspecs/sco-g++/qplatformdefs.h
+++ b/mkspecs/sco-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/solaris-cc-64/qplatformdefs.h b/mkspecs/solaris-cc-64/qplatformdefs.h
index 918e1bf31..2a784224a 100644
--- a/mkspecs/solaris-cc-64/qplatformdefs.h
+++ b/mkspecs/solaris-cc-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/solaris-cc/qplatformdefs.h b/mkspecs/solaris-cc/qplatformdefs.h
index 8a54d9b34..0c055f8e0 100644
--- a/mkspecs/solaris-cc/qplatformdefs.h
+++ b/mkspecs/solaris-cc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
#define _POSIX_PTHREAD_SEMANTICS
diff --git a/mkspecs/solaris-g++-64/qplatformdefs.h b/mkspecs/solaris-g++-64/qplatformdefs.h
index ba496f22b..f4f12dc17 100644
--- a/mkspecs/solaris-g++-64/qplatformdefs.h
+++ b/mkspecs/solaris-g++-64/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
#ifndef _POSIX_PTHREAD_SEMANTICS
diff --git a/mkspecs/solaris-g++/qplatformdefs.h b/mkspecs/solaris-g++/qplatformdefs.h
index 9be7b84e0..6f64df7ff 100644
--- a/mkspecs/solaris-g++/qplatformdefs.h
+++ b/mkspecs/solaris-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
#ifndef _POSIX_PTHREAD_SEMANTICS
diff --git a/mkspecs/tru64-cxx/qplatformdefs.h b/mkspecs/tru64-cxx/qplatformdefs.h
index 24d8153f1..0a7f6673f 100644
--- a/mkspecs/tru64-cxx/qplatformdefs.h
+++ b/mkspecs/tru64-cxx/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/tru64-g++/qplatformdefs.h b/mkspecs/tru64-g++/qplatformdefs.h
index e355e9f4c..6e91b1e20 100644
--- a/mkspecs/tru64-g++/qplatformdefs.h
+++ b/mkspecs/tru64-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/unixware-cc/qplatformdefs.h b/mkspecs/unixware-cc/qplatformdefs.h
index 3c9348c22..0f0fd0c5c 100644
--- a/mkspecs/unixware-cc/qplatformdefs.h
+++ b/mkspecs/unixware-cc/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/unixware-g++/qplatformdefs.h b/mkspecs/unixware-g++/qplatformdefs.h
index 3c9348c22..0f0fd0c5c 100644
--- a/mkspecs/unixware-g++/qplatformdefs.h
+++ b/mkspecs/unixware-g++/qplatformdefs.h
@@ -3,7 +3,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
diff --git a/mkspecs/win32-borland/qplatformdefs.h b/mkspecs/win32-borland/qplatformdefs.h
index 6cad4a676..9817d47fd 100644
--- a/mkspecs/win32-borland/qplatformdefs.h
+++ b/mkspecs/win32-borland/qplatformdefs.h
@@ -9,7 +9,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#define Q_FS_FAT
#define _POSIX_
diff --git a/mkspecs/win32-g++/qplatformdefs.h b/mkspecs/win32-g++/qplatformdefs.h
index 2893c7a19..1b7de62f8 100644
--- a/mkspecs/win32-g++/qplatformdefs.h
+++ b/mkspecs/win32-g++/qplatformdefs.h
@@ -9,7 +9,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include <tchar.h>
#include <io.h>
diff --git a/mkspecs/win32-icc/qplatformdefs.h b/mkspecs/win32-icc/qplatformdefs.h
index 1b8340516..60cb01959 100644
--- a/mkspecs/win32-icc/qplatformdefs.h
+++ b/mkspecs/win32-icc/qplatformdefs.h
@@ -9,7 +9,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#define _POSIX_
#include <limits.h>
diff --git a/mkspecs/win32-msvc.net/qplatformdefs.h b/mkspecs/win32-msvc.net/qplatformdefs.h
index 1b8340516..60cb01959 100644
--- a/mkspecs/win32-msvc.net/qplatformdefs.h
+++ b/mkspecs/win32-msvc.net/qplatformdefs.h
@@ -9,7 +9,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#define _POSIX_
#include <limits.h>
diff --git a/mkspecs/win32-msvc/qplatformdefs.h b/mkspecs/win32-msvc/qplatformdefs.h
index 1b8340516..60cb01959 100644
--- a/mkspecs/win32-msvc/qplatformdefs.h
+++ b/mkspecs/win32-msvc/qplatformdefs.h
@@ -9,7 +9,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#define _POSIX_
#include <limits.h>
diff --git a/mkspecs/win32-msvc2005/qplatformdefs.h b/mkspecs/win32-msvc2005/qplatformdefs.h
index 1b8340516..60cb01959 100644
--- a/mkspecs/win32-msvc2005/qplatformdefs.h
+++ b/mkspecs/win32-msvc2005/qplatformdefs.h
@@ -9,7 +9,7 @@
// Get TQt defines/settings
-#include "ntqglobal.h"
+#include "tqglobal.h"
#define _POSIX_
#include <limits.h>
diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
index cb4f1cf52..393bf0a62 100644
--- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
+++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h
@@ -48,7 +48,7 @@
#include <ntqnamespace.h>
#include <tqwidget.h>
#include <ntqinputcontext.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include <tqintdict.h>
class TQPopupMenu;
diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
index bdb2744a4..ea5e71beb 100644
--- a/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
+++ b/plugins/src/inputmethods/simple/qsimpleinputcontext.cpp
@@ -44,7 +44,7 @@
#include <ntqnamespace.h>
#include <tqevent.h>
-#include <ntqglobal.h>
+#include <tqglobal.h>
#include <algorithm>
static const int ignoreKeys[] = {
diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h
index 5b5f407cc..57430326a 100644
--- a/plugins/src/inputmethods/xim/qximinputcontext.h
+++ b/plugins/src/inputmethods/xim/qximinputcontext.h
@@ -51,7 +51,7 @@
#if !defined(Q_NO_IM)
-#include "ntqglobal.h"
+#include "tqglobal.h"
#include <ntqinputcontext.h>
#include <tqfont.h>
#include <tqcstring.h>
diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index 7a3a98720..c5c08a34f 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -5,9 +5,9 @@ OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o
msvc_objectmodel.o meta.o qtmd5.o
#qt code
-QOBJS=tqstring.o tqtextstream.o tqiodevice.o qglobal.o qgdict.o tqcstring.o \
- tqdatastream.o qgarray.o tqbuffer.o qglist.o tqptrcollection.o tqfile.o \
- tqfile_unix.o tqregexp.o qgvector.o qgcache.o tqbitarray.o tqdir.o quuid.o \
+QOBJS=tqstring.o tqtextstream.o tqiodevice.o tqglobal.o tqgdict.o tqcstring.o \
+ tqdatastream.o tqgarray.o tqbuffer.o tqglist.o tqptrcollection.o tqfile.o \
+ tqfile_unix.o tqregexp.o tqgvector.o tqgcache.o tqbitarray.o tqdir.o quuid.o \
tqfileinfo_unix.o tqdir_unix.o tqfileinfo.o tqdatetime.o tqstringlist.o tqmap.o \
qconfig.o qunicodetables.o tqsettings.o tqlocale.o @QMAKE_QTOBJS@
@@ -17,13 +17,13 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef
generators/win32/winmakefile.cpp generators/projectgenerator.cpp generators/mac/metrowerks_xml.cpp \
generators/mac/pbuilder_pbx.cpp generators/win32/msvc_objectmodel.cpp \
@SOURCE_PATH@/src/tools/tqstring.cpp @SOURCE_PATH@/src/tools/tqtextstream.cpp \
- @SOURCE_PATH@/src/tools/tqiodevice.cpp @SOURCE_PATH@/src/tools/qglobal.cpp \
- @SOURCE_PATH@/src/tools/qgdict.cpp @SOURCE_PATH@/src/tools/tqcstring.cpp \
- @SOURCE_PATH@/src/tools/tqdatastream.cpp @SOURCE_PATH@/src/tools/qgarray.cpp \
- @SOURCE_PATH@/src/tools/tqbuffer.cpp @SOURCE_PATH@/src/tools/qglist.cpp \
+ @SOURCE_PATH@/src/tools/tqiodevice.cpp @SOURCE_PATH@/src/tools/tqglobal.cpp \
+ @SOURCE_PATH@/src/tools/tqgdict.cpp @SOURCE_PATH@/src/tools/tqcstring.cpp \
+ @SOURCE_PATH@/src/tools/tqdatastream.cpp @SOURCE_PATH@/src/tools/tqgarray.cpp \
+ @SOURCE_PATH@/src/tools/tqbuffer.cpp @SOURCE_PATH@/src/tools/tqglist.cpp \
@SOURCE_PATH@/src/tools/tqptrcollection.cpp @SOURCE_PATH@/src/tools/tqfile.cpp \
@SOURCE_PATH@/src/tools/tqfile_unix.cpp @SOURCE_PATH@/src/tools/tqregexp.cpp \
- @SOURCE_PATH@/src/tools/qgvector.cpp @SOURCE_PATH@/src/tools/qgcache.cpp \
+ @SOURCE_PATH@/src/tools/tqgvector.cpp @SOURCE_PATH@/src/tools/tqgcache.cpp \
@SOURCE_PATH@/src/tools/tqbitarray.cpp @SOURCE_PATH@/src/tools/tqdir.cpp \
@SOURCE_PATH@/src/tools/quuid.cpp @SOURCE_PATH@/src/tools/tqfileinfo_unix.cpp \
@SOURCE_PATH@/src/tools/tqdir_unix.cpp @SOURCE_PATH@/src/tools/tqfileinfo.cpp \
@@ -66,11 +66,11 @@ tqtextstream.o: @SOURCE_PATH@/src/tools/tqtextstream.cpp
tqiodevice.o: @SOURCE_PATH@/src/tools/tqiodevice.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqiodevice.cpp
-qglobal.o: @SOURCE_PATH@/src/tools/qglobal.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qglobal.cpp
+tqglobal.o: @SOURCE_PATH@/src/tools/tqglobal.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqglobal.cpp
-qgdict.o: @SOURCE_PATH@/src/tools/qgdict.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgdict.cpp
+tqgdict.o: @SOURCE_PATH@/src/tools/tqgdict.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqgdict.cpp
tqcstring.o: @SOURCE_PATH@/src/tools/tqcstring.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqcstring.cpp
@@ -96,14 +96,14 @@ tqdatastream.o: @SOURCE_PATH@/src/tools/tqdatastream.cpp
qunicodetables.o: @SOURCE_PATH@/src/tools/qunicodetables.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qunicodetables.cpp
-qgarray.o: @SOURCE_PATH@/src/tools/qgarray.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgarray.cpp
+tqgarray.o: @SOURCE_PATH@/src/tools/tqgarray.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqgarray.cpp
tqbuffer.o: @SOURCE_PATH@/src/tools/tqbuffer.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqbuffer.cpp
-qglist.o: @SOURCE_PATH@/src/tools/qglist.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qglist.cpp
+tqglist.o: @SOURCE_PATH@/src/tools/tqglist.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqglist.cpp
tqptrcollection.o: @SOURCE_PATH@/src/tools/tqptrcollection.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqptrcollection.cpp
@@ -117,11 +117,11 @@ tqfile_unix.o: @SOURCE_PATH@/src/tools/tqfile_unix.cpp
tqregexp.o: @SOURCE_PATH@/src/tools/tqregexp.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqregexp.cpp
-qgvector.o: @SOURCE_PATH@/src/tools/qgvector.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgvector.cpp
+tqgvector.o: @SOURCE_PATH@/src/tools/tqgvector.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqgvector.cpp
-qgcache.o: @SOURCE_PATH@/src/tools/qgcache.cpp
- $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qgcache.cpp
+tqgcache.o: @SOURCE_PATH@/src/tools/tqgcache.cpp
+ $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqgcache.cpp
tqbitarray.o: @SOURCE_PATH@/src/tools/tqbitarray.cpp
$(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqbitarray.cpp
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index f2ef722b2..c33b5e2d4 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -19,9 +19,9 @@ OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_ma
metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o
#qt code
-QTOBJS=tqstring.o quuid.o tqtextstream.o tqiodevice.o qglobal.o qgdict.o tqcstring.o tqdatastream.o \
- qgarray.o tqbuffer.o qglist.o tqptrcollection.o tqfile.o tqfile_win.o tqregexp.o qgvector.o \
- qgcache.o tqbitarray.o tqdir.o tqfileinfo_win.o tqdir_win.o tqfileinfo.o tqdatetime.o \
+QTOBJS=tqstring.o quuid.o tqtextstream.o tqiodevice.o tqglobal.o tqgdict.o tqcstring.o tqdatastream.o \
+ tqgarray.o tqbuffer.o tqglist.o tqptrcollection.o tqfile.o tqfile_win.o tqregexp.o tqgvector.o \
+ tqgcache.o tqbitarray.o tqdir.o tqfileinfo_win.o tqdir_win.o tqfileinfo.o tqdatetime.o \
tqstringlist.o tqmap.o qlibrary.o qlibrary_win.o qconfig.o tqsettings.o tqsettings_win.o qunicodetables.o \
tqlocale.o
@@ -58,11 +58,11 @@ tqtextstream.o: ..\src\tools\tqtextstream.cpp
tqiodevice.o: ..\src\tools\tqiodevice.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqiodevice.cpp
-qglobal.o: ..\src\tools\qglobal.cpp
- $(CXX) $(CXXFLAGS) ..\src\tools\qglobal.cpp
+tqglobal.o: ..\src\tools\tqglobal.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqglobal.cpp
-qgdict.o: ..\src\tools\qgdict.cpp
- $(CXX) $(CXXFLAGS) ..\src\tools\qgdict.cpp
+tqgdict.o: ..\src\tools\tqgdict.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqgdict.cpp
tqcstring.o: ..\src\tools\tqcstring.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqcstring.cpp
@@ -79,14 +79,14 @@ quuid.o: ..\src\tools\quuid.cpp
tqdatastream.o: ..\src\tools\tqdatastream.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqdatastream.cpp
-qgarray.o: ..\src\tools\qgarray.cpp
- $(CXX) $(CXXFLAGS) ..\src\tools\qgarray.cpp
+tqgarray.o: ..\src\tools\tqgarray.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqgarray.cpp
tqbuffer.o: ..\src\tools\tqbuffer.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqbuffer.cpp
-qglist.o: ..\src\tools\qglist.cpp
- $(CXX) $(CXXFLAGS) ..\src\tools\qglist.cpp
+tqglist.o: ..\src\tools\tqglist.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqglist.cpp
tqptrcollection.o: ..\src\tools\tqptrcollection.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqptrcollection.cpp
@@ -103,11 +103,11 @@ tqtextcodec.o: ..\src\codecs\tqtextcodec.cpp
tqregexp.o: ..\src\tools\tqregexp.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqregexp.cpp
-qgvector.o: ..\src\tools\qgvector.cpp
- $(CXX) $(CXXFLAGS) ..\src\tools\qgvector.cpp
+tqgvector.o: ..\src\tools\tqgvector.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqgvector.cpp
-qgcache.o: ..\src\tools\qgcache.cpp
- $(CXX) $(CXXFLAGS) ..\src\tools\qgcache.cpp
+tqgcache.o: ..\src\tools\tqgcache.cpp
+ $(CXX) $(CXXFLAGS) ..\src\tools\tqgcache.cpp
tqbitarray.o: ..\src\tools\tqbitarray.cpp
$(CXX) $(CXXFLAGS) ..\src\tools\tqbitarray.cpp
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"
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index 162ab052b..670767f17 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -43,7 +43,7 @@
#include <tqstringlist.h>
#include <tqdir.h>
#include <ntqmessagebox.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include <stdlib.h>
#include <stdio.h>
#include <tqtextcodec.h>
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index 81586bd7f..0c6fc0b0f 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -597,7 +597,7 @@
<include location="global" impldecl="in implementation">tqcheckbox.h</include>
<include location="local" impldecl="in implementation">tabbedbrowser.h</include>
<include location="global" impldecl="in declaration">tqptrlist.h</include>
- <include location="global" impldecl="in declaration">ntqguardedptr.h</include>
+ <include location="global" impldecl="in declaration">tqguardedptr.h</include>
<include location="global" impldecl="in declaration">tqmap.h</include>
<include location="local" impldecl="in declaration">finddialog.h</include>
<include location="global" impldecl="in declaration">tqstringlist.h</include>
diff --git a/tools/designer/designer/actiondnd.h b/tools/designer/designer/actiondnd.h
index 9ecce881b..aa3531b34 100644
--- a/tools/designer/designer/actiondnd.h
+++ b/tools/designer/designer/actiondnd.h
@@ -42,7 +42,7 @@
#include <tqpopupmenu.h>
#include <tqptrlist.h>
#include <tqtoolbar.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include "../shared/widgetdatabase.h"
//class TQDesignerPopupMenu;
diff --git a/tools/designer/designer/hierarchyview.h b/tools/designer/designer/hierarchyview.h
index 77656d7f0..2b30f6530 100644
--- a/tools/designer/designer/hierarchyview.h
+++ b/tools/designer/designer/hierarchyview.h
@@ -37,7 +37,7 @@
#include <ntqvariant.h>
#include <tqlistview.h>
#include <tqtabwidget.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include <private/qcom_p.h>
#include "../interfaces/classbrowserinterface.h"
diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h
index 3ac9c170d..0b26e9675 100644
--- a/tools/designer/designer/layout.h
+++ b/tools/designer/designer/layout.h
@@ -36,7 +36,7 @@
#include <tqwidget.h>
#include <tqmap.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include <tqobject.h>
#include <tqlayout.h>
#include <tqmap.h>
diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h
index c7efb63c1..ddc99c07e 100644
--- a/tools/designer/designer/mainwindow.h
+++ b/tools/designer/designer/mainwindow.h
@@ -49,7 +49,7 @@
#include <tqaction.h>
#include <tqmainwindow.h>
#include <tqmap.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include <private/qpluginmanager_p.h>
#include <tqobjectlist.h>
diff --git a/tools/designer/designer/propertyeditor.h b/tools/designer/designer/propertyeditor.h
index afe518a3a..8ef82f3ab 100644
--- a/tools/designer/designer/propertyeditor.h
+++ b/tools/designer/designer/propertyeditor.h
@@ -38,7 +38,7 @@
#include <ntqvariant.h>
#include <tqlistview.h>
#include <tqptrlist.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include <tqtabwidget.h>
#include <ntqmodules.h>
#include <tqptrlist.h>
diff --git a/tools/designer/designer/sourceeditor.h b/tools/designer/designer/sourceeditor.h
index cf94351ec..ab6094987 100644
--- a/tools/designer/designer/sourceeditor.h
+++ b/tools/designer/designer/sourceeditor.h
@@ -36,7 +36,7 @@
#include "../interfaces/editorinterface.h"
#include <tqvbox.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
class FormWindow;
class TQCloseEvent;
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 96e1d5644..e9a6b126f 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -53,7 +53,7 @@
#include <tqradiobutton.h>
#include <tqbuttongroup.h>
#include <tqwidgetstack.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
#include <tqtoolbox.h>
#include "metadatabase.h"
diff --git a/tools/designer/plugins/cppeditor/cppcompletion.h b/tools/designer/plugins/cppeditor/cppcompletion.h
index f6d2134c9..5ca10b4b4 100644
--- a/tools/designer/plugins/cppeditor/cppcompletion.h
+++ b/tools/designer/plugins/cppeditor/cppcompletion.h
@@ -36,7 +36,7 @@
#define CPPCOMPLETION_H
#include <completion.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
class CppEditorCompletion : public EditorCompletion
{
diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
index 7b3472371..a83c07dfd 100644
--- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
+++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.h
@@ -37,7 +37,7 @@
#include <editorinterface.h>
#include <tqobject.h>
-#include <ntqguardedptr.h>
+#include <tqguardedptr.h>
class TQTimer;
class ViewManager;