summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-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
45 files changed, 65 insertions, 112 deletions
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)