summaryrefslogtreecommitdiffstats
path: root/src/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel')
-rw-r--r--src/kernel/ntqaccel.h2
-rw-r--r--src/kernel/ntqaccessible.h2
-rw-r--r--src/kernel/ntqasyncio.h2
-rw-r--r--src/kernel/ntqclipboard.h2
-rw-r--r--src/kernel/ntqconnection.h2
-rw-r--r--src/kernel/ntqdragobject.h2
-rw-r--r--src/kernel/ntqeventloop.h2
-rw-r--r--src/kernel/ntqgplugin.h2
-rw-r--r--src/kernel/ntqguardedptr.h2
-rw-r--r--src/kernel/ntqiconset.h2
-rw-r--r--src/kernel/ntqinputcontext.h2
-rw-r--r--src/kernel/ntqlayout.h2
-rw-r--r--src/kernel/ntqnamespace.h2
-rw-r--r--src/kernel/ntqnetworkprotocol.h2
-rw-r--r--src/kernel/ntqprocess.h2
-rw-r--r--src/kernel/ntqsessionmanager.h2
-rw-r--r--src/kernel/ntqsignal.h2
-rw-r--r--src/kernel/ntqsignalmapper.h2
-rw-r--r--src/kernel/ntqsocketnotifier.h2
-rw-r--r--src/kernel/ntqsound.h2
-rw-r--r--src/kernel/ntqstyle.h2
-rw-r--r--src/kernel/ntqstylesheet.h2
-rw-r--r--src/kernel/ntqt.h10
-rw-r--r--src/kernel/ntqtimer.h2
-rw-r--r--src/kernel/ntqtranslator.h2
-rw-r--r--src/kernel/ntqurloperator.h2
-rw-r--r--src/kernel/ntqwidget.h2
-rw-r--r--src/kernel/ntqwindowdefs.h2
-rw-r--r--src/kernel/qapplication.cpp2
-rw-r--r--src/kernel/qapplication_x11.cpp2
-rw-r--r--src/kernel/qdesktopwidget_x11.cpp2
-rw-r--r--src/kernel/qdnd_x11.cpp2
-rw-r--r--src/kernel/qfontdata_p.h2
-rw-r--r--src/kernel/qmovie.cpp2
-rw-r--r--src/kernel/qpixmap.cpp2
-rw-r--r--src/kernel/qpixmapcache.cpp2
-rw-r--r--src/kernel/qrichtext_p.h4
-rw-r--r--src/kernel/qsizegrip.cpp2
-rw-r--r--src/kernel/qstyle.cpp2
-rw-r--r--src/kernel/qt_kernel.pri14
-rw-r--r--src/kernel/qt_pch.h2
-rw-r--r--src/kernel/qtimer.cpp2
-rw-r--r--src/kernel/qwidget.cpp2
-rw-r--r--src/kernel/qwidget_x11.cpp2
-rw-r--r--src/kernel/tqobject.cpp (renamed from src/kernel/qobject.cpp)12
-rw-r--r--src/kernel/tqobject.h (renamed from src/kernel/ntqobject.h)4
-rw-r--r--src/kernel/tqobjectcleanuphandler.cpp (renamed from src/kernel/qobjectcleanuphandler.cpp)6
-rw-r--r--src/kernel/tqobjectcleanuphandler.h (renamed from src/kernel/ntqobjectcleanuphandler.h)2
-rw-r--r--src/kernel/tqobjectdefs.h (renamed from src/kernel/ntqobjectdefs.h)0
-rw-r--r--src/kernel/tqobjectdict.h (renamed from src/kernel/ntqobjectdict.h)0
-rw-r--r--src/kernel/tqobjectlist.h (renamed from src/kernel/ntqobjectlist.h)2
51 files changed, 69 insertions, 67 deletions
diff --git a/src/kernel/ntqaccel.h b/src/kernel/ntqaccel.h
index ef578242a..22c2f80e1 100644
--- a/src/kernel/ntqaccel.h
+++ b/src/kernel/ntqaccel.h
@@ -42,7 +42,7 @@
#define TQACCEL_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqkeysequence.h"
#endif // QT_H
diff --git a/src/kernel/ntqaccessible.h b/src/kernel/ntqaccessible.h
index 61baf31b0..39f68ee3f 100644
--- a/src/kernel/ntqaccessible.h
+++ b/src/kernel/ntqaccessible.h
@@ -40,7 +40,7 @@
#define TQACCESSIBLE_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include <private/qcom_p.h>
#include "ntqrect.h"
#include "ntqguardedptr.h"
diff --git a/src/kernel/ntqasyncio.h b/src/kernel/ntqasyncio.h
index 1fea830be..19fe284b0 100644
--- a/src/kernel/ntqasyncio.h
+++ b/src/kernel/ntqasyncio.h
@@ -42,7 +42,7 @@
#define TQASYNCIO_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqsignal.h"
#include "ntqtimer.h"
#endif // QT_H
diff --git a/src/kernel/ntqclipboard.h b/src/kernel/ntqclipboard.h
index 706115f33..0202f78de 100644
--- a/src/kernel/ntqclipboard.h
+++ b/src/kernel/ntqclipboard.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "ntqwindowdefs.h"
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
#ifndef TQT_NO_CLIPBOARD
diff --git a/src/kernel/ntqconnection.h b/src/kernel/ntqconnection.h
index b259d9866..6906184b7 100644
--- a/src/kernel/ntqconnection.h
+++ b/src/kernel/ntqconnection.h
@@ -42,7 +42,7 @@
#define TQCONNECTION_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
class TQ_EXPORT TQConnection
diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h
index 069e82973..60a43ca34 100644
--- a/src/kernel/ntqdragobject.h
+++ b/src/kernel/ntqdragobject.h
@@ -46,7 +46,7 @@ class TQStoredDragData;
class TQImageDragData;
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqimage.h"
#include "ntqstrlist.h"
#include "ntqcolor.h"
diff --git a/src/kernel/ntqeventloop.h b/src/kernel/ntqeventloop.h
index deca8d061..1c66e5950 100644
--- a/src/kernel/ntqeventloop.h
+++ b/src/kernel/ntqeventloop.h
@@ -40,7 +40,7 @@
#define TQEVENTLOOP_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqsocketnotifier.h"
#endif // QT_H
diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h
index 1b7431458..88212515b 100644
--- a/src/kernel/ntqgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -52,7 +52,7 @@
//
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
#ifndef TQT_NO_COMPONENT
diff --git a/src/kernel/ntqguardedptr.h b/src/kernel/ntqguardedptr.h
index c0b7084a3..29ef8b8c7 100644
--- a/src/kernel/ntqguardedptr.h
+++ b/src/kernel/ntqguardedptr.h
@@ -42,7 +42,7 @@
#define TQGUARDEDPTR_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
// ### 4.0: rename to something without Private in it. Not really internal.
diff --git a/src/kernel/ntqiconset.h b/src/kernel/ntqiconset.h
index d9a90460e..66fc71146 100644
--- a/src/kernel/ntqiconset.h
+++ b/src/kernel/ntqiconset.h
@@ -42,7 +42,7 @@
#define TQICONSET_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqpixmap.h"
#endif // QT_H
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index 24bbca763..a37c01670 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -39,7 +39,7 @@
#ifndef TQT_NO_IM
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqglobal.h"
#include "ntqevent.h"
#include "ntqstring.h"
diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h
index 6e0749098..9ff6615a9 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -42,7 +42,7 @@
#define TQLAYOUT_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqsizepolicy.h"
#include "ntqwidget.h"
#endif // QT_H
diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h
index 14b4a67e1..5ce38f835 100644
--- a/src/kernel/ntqnamespace.h
+++ b/src/kernel/ntqnamespace.h
@@ -89,7 +89,7 @@ public:
Keypad = 0x4000
};
- // documented in qobject.cpp
+ // documented in tqobject.cpp
// ideally would start at 1, as in TQSizePolicy, but that breaks other things
enum Orientation {
Horizontal = 0,
diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h
index fa245f9c2..3872ffb3c 100644
--- a/src/kernel/ntqnetworkprotocol.h
+++ b/src/kernel/ntqnetworkprotocol.h
@@ -45,7 +45,7 @@
#include "ntqurlinfo.h"
#include "ntqstring.h"
#include "ntqdict.h"
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
#ifndef TQT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h
index b03ffe647..e3e189af0 100644
--- a/src/kernel/ntqprocess.h
+++ b/src/kernel/ntqprocess.h
@@ -42,7 +42,7 @@
#define TQPROCESS_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqstringlist.h"
#include "ntqdir.h"
#endif // QT_H
diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h
index f87fb3b11..600b2950e 100644
--- a/src/kernel/ntqsessionmanager.h
+++ b/src/kernel/ntqsessionmanager.h
@@ -42,7 +42,7 @@
#define TQSESSIONMANAGER_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqwindowdefs.h"
#include "ntqstring.h"
#include "ntqstringlist.h"
diff --git a/src/kernel/ntqsignal.h b/src/kernel/ntqsignal.h
index 942eaaeb9..bb3875a09 100644
--- a/src/kernel/ntqsignal.h
+++ b/src/kernel/ntqsignal.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "ntqvariant.h"
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
diff --git a/src/kernel/ntqsignalmapper.h b/src/kernel/ntqsignalmapper.h
index b8125e57b..aed7e72d4 100644
--- a/src/kernel/ntqsignalmapper.h
+++ b/src/kernel/ntqsignalmapper.h
@@ -42,7 +42,7 @@
#define TQSIGNALMAPPER_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
#ifndef TQT_NO_SIGNALMAPPER
class TQSignalMapperData;
diff --git a/src/kernel/ntqsocketnotifier.h b/src/kernel/ntqsocketnotifier.h
index 7a9c56fb3..717be3898 100644
--- a/src/kernel/ntqsocketnotifier.h
+++ b/src/kernel/ntqsocketnotifier.h
@@ -42,7 +42,7 @@
#define TQSOCKETNOTIFIER_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
diff --git a/src/kernel/ntqsound.h b/src/kernel/ntqsound.h
index 19f1ba4ec..d3ba92ed3 100644
--- a/src/kernel/ntqsound.h
+++ b/src/kernel/ntqsound.h
@@ -41,7 +41,7 @@
#define TQSOUND_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
#ifndef TQT_NO_SOUND
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index 5ebbb2c5e..d4288aa33 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -41,7 +41,7 @@
#define TQSTYLE_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqpixmap.h"
#include "ntqcolor.h"
#include "ntqiconset.h"
diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h
index 17f13a25b..2b397f946 100644
--- a/src/kernel/ntqstylesheet.h
+++ b/src/kernel/ntqstylesheet.h
@@ -46,7 +46,7 @@
#include "ntqvaluelist.h"
#include "ntqptrvector.h"
#include "ntqdict.h"
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
#ifndef TQT_NO_RICHTEXT
diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h
index 1d2147fae..2e4c2caaa 100644
--- a/src/kernel/ntqt.h
+++ b/src/kernel/ntqt.h
@@ -20,7 +20,7 @@
#include "ntqshared.h"
#include "ntqptrcollection.h"
#include "ntqglist.h"
-#include "ntqobjectdefs.h"
+#include "tqobjectdefs.h"
#include "ntqnamespace.h"
#include "ntqgarray.h"
#include "ntqmemarray.h"
@@ -59,7 +59,7 @@
#include "ntqstringlist.h"
#include "ntqcolor.h"
#include <ntqdom.h>
-#include "ntqobject.h"
+#include "tqobject.h"
#include <ntqdrawutil.h>
#include "ntqbrush.h"
#include "ntqpalette.h"
@@ -140,10 +140,10 @@
#include <ntqnetwork.h>
#include <ntqftp.h>
#include "ntqguardedptr.h"
-#include <ntqobjectcleanuphandler.h>
+#include <tqobjectcleanuphandler.h>
#include "ntqsqlfield.h"
-#include <ntqobjectdict.h>
-#include <ntqobjectlist.h>
+#include <tqobjectdict.h>
+#include <tqobjectlist.h>
#include <ntqcolordialog.h>
#include <ntqpaintdevicemetrics.h>
#include "ntqpointarray.h"
diff --git a/src/kernel/ntqtimer.h b/src/kernel/ntqtimer.h
index 1b3045caa..40aae8724 100644
--- a/src/kernel/ntqtimer.h
+++ b/src/kernel/ntqtimer.h
@@ -42,7 +42,7 @@
#define TQTIMER_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
diff --git a/src/kernel/ntqtranslator.h b/src/kernel/ntqtranslator.h
index beb6f5528..e255b81e1 100644
--- a/src/kernel/ntqtranslator.h
+++ b/src/kernel/ntqtranslator.h
@@ -43,7 +43,7 @@
#define TQTRANSLATOR_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqvaluelist.h"
#endif // QT_H
diff --git a/src/kernel/ntqurloperator.h b/src/kernel/ntqurloperator.h
index 1644922aa..986fb25aa 100644
--- a/src/kernel/ntqurloperator.h
+++ b/src/kernel/ntqurloperator.h
@@ -42,7 +42,7 @@
#define TQURLOPERATOR_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqurl.h"
#include "ntqptrlist.h"
#include "ntqnetworkprotocol.h"
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index 7e589c1a8..d328dd95d 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -43,7 +43,7 @@
#ifndef QT_H
#include "ntqwindowdefs.h"
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqpaintdevice.h"
#include "ntqpalette.h"
#include "ntqfont.h"
diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h
index 4af074cc9..ae28caace 100644
--- a/src/kernel/ntqwindowdefs.h
+++ b/src/kernel/ntqwindowdefs.h
@@ -43,7 +43,7 @@
#define TQWINDOWDEFS_H
#ifndef QT_H
-#include "ntqobjectdefs.h"
+#include "tqobjectdefs.h"
#include "ntqstring.h"
#include "ntqnamespace.h"
#endif // QT_H
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 45016b04c..31bd5ecc4 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "ntqapplication.h"
#include "ntqeventloop.h"
#include "qeventloop_p.h"
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 0148f8760..125f1fa21 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -67,7 +67,7 @@
#include "ntqcursor.h"
#include "ntqwidget.h"
#include "qwidget_p.h"
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "ntqwidgetlist.h"
#include "ntqwidgetintdict.h"
#include "ntqbitarray.h"
diff --git a/src/kernel/qdesktopwidget_x11.cpp b/src/kernel/qdesktopwidget_x11.cpp
index 449af4ffc..bb301e522 100644
--- a/src/kernel/qdesktopwidget_x11.cpp
+++ b/src/kernel/qdesktopwidget_x11.cpp
@@ -38,7 +38,7 @@
#include "ntqdesktopwidget.h"
#include "ntqapplication.h"
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "qt_x11_p.h"
#include <cstdlib>
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index bad09d3cd..a50f23319 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -50,7 +50,7 @@
#include "ntqdict.h"
#include "ntqguardedptr.h"
#include "ntqdragobject.h"
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "ntqcursor.h"
#include "ntqbitmap.h"
#include "ntqpainter.h"
diff --git a/src/kernel/qfontdata_p.h b/src/kernel/qfontdata_p.h
index 9c21dfe60..991b61773 100644
--- a/src/kernel/qfontdata_p.h
+++ b/src/kernel/qfontdata_p.h
@@ -53,7 +53,7 @@
//
//
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqfont.h"
#include "ntqpaintdevicemetrics.h"
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 6833762e8..2f83cabff 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -47,7 +47,7 @@
#include "ntqmovie.h"
#include "ntqfile.h"
#include "ntqbuffer.h"
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqpixmapcache.h"
#ifndef TQT_NO_MOVIE
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index b11530f6c..4f05adc02 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -46,7 +46,7 @@
#include "ntqpainter.h"
#include "ntqdatastream.h"
#include "ntqbuffer.h"
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "ntqapplication.h"
#include <private/qinternal_p.h>
#include "ntqmime.h"
diff --git a/src/kernel/qpixmapcache.cpp b/src/kernel/qpixmapcache.cpp
index c30e5b9d0..16a7c5ed2 100644
--- a/src/kernel/qpixmapcache.cpp
+++ b/src/kernel/qpixmapcache.cpp
@@ -40,7 +40,7 @@
#include "ntqpixmapcache.h"
#include "ntqcache.h"
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqcleanuphandler.h"
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 428b0ec5d..1915820fa 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -66,14 +66,14 @@
#include "ntqsize.h"
#include "ntqvaluelist.h"
#include "ntqvaluestack.h"
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqdict.h"
#include "ntqpixmap.h"
#include "ntqstylesheet.h"
#include "ntqptrvector.h"
#include "ntqpainter.h"
#include "ntqlayout.h"
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqapplication.h"
#endif // QT_H
diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/qsizegrip.cpp
index 7b8140c62..d27e0b534 100644
--- a/src/kernel/qsizegrip.cpp
+++ b/src/kernel/qsizegrip.cpp
@@ -50,7 +50,7 @@
#include "qt_x11_p.h"
extern Atom qt_sizegrip; // defined in qapplication_x11.cpp
#elif defined (TQ_WS_WIN )
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "qt_windows.h"
#elif defined(TQ_WS_MAC)
bool qt_mac_update_sizer(TQWidget *, int); //qwidget_mac.cpp
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 7d143270b..67b42e70f 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -49,7 +49,7 @@
#include "ntqlistview.h"
#include "ntqpopupmenu.h"
#include "ntqpushbutton.h"
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "ntqwidgetlist.h"
#include <limits.h>
diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri
index 684866e7d..6baa0c732 100644
--- a/src/kernel/qt_kernel.pri
+++ b/src/kernel/qt_kernel.pri
@@ -45,11 +45,11 @@ kernel {
$$KERNEL_H/ntqmovie.h \
$$KERNEL_H/ntqnamespace.h \
$$KERNEL_H/ntqnetworkprotocol.h \
- $$KERNEL_H/ntqobject.h \
- $$KERNEL_H/ntqobjectcleanuphandler.h \
- $$KERNEL_H/ntqobjectdefs.h \
- $$KERNEL_H/ntqobjectdict.h \
- $$KERNEL_H/ntqobjectlist.h \
+ $$KERNEL_H/tqobject.h \
+ $$KERNEL_H/tqobjectcleanuphandler.h \
+ $$KERNEL_H/tqobjectdefs.h \
+ $$KERNEL_H/tqobjectdict.h \
+ $$KERNEL_H/tqobjectlist.h \
$$KERNEL_H/ntqpaintdevice.h \
$$KERNEL_H/ntqpainter.h \
$$KERNEL_P/qpainter_p.h \
@@ -226,8 +226,8 @@ kernel {
$$KERNEL_CPP/qmime.cpp \
$$KERNEL_CPP/qmovie.cpp \
$$KERNEL_CPP/qnetworkprotocol.cpp \
- $$KERNEL_CPP/qobject.cpp \
- $$KERNEL_CPP/qobjectcleanuphandler.cpp \
+ $$KERNEL_CPP/tqobject.cpp \
+ $$KERNEL_CPP/tqobjectcleanuphandler.cpp \
$$KERNEL_CPP/qpainter.cpp \
$$KERNEL_CPP/qpalette.cpp \
$$KERNEL_CPP/qpaintdevicemetrics.cpp \
diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h
index cdde3e790..1aef6f4a8 100644
--- a/src/kernel/qt_pch.h
+++ b/src/kernel/qt_pch.h
@@ -30,7 +30,7 @@
#include <ntqglobal.h>
#include <ntqimage.h>
#include <ntqmetaobject.h> // All moc genereated code has this include
-#include <ntqobject.h>
+#include <tqobject.h>
#include <ntqpainter.h>
#include <ntqpixmap.h>
#include <qplatformdefs.h>
diff --git a/src/kernel/qtimer.cpp b/src/kernel/qtimer.cpp
index f7736c028..ca2dddb9e 100644
--- a/src/kernel/qtimer.cpp
+++ b/src/kernel/qtimer.cpp
@@ -40,7 +40,7 @@
#include "ntqtimer.h"
#include "ntqsignal.h"
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
/*!
\class TQTimer ntqtimer.h
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index 1af274c6e..e855e7448 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -39,7 +39,7 @@
**********************************************************************/
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "ntqwidget.h"
#include "ntqwidgetlist.h"
#include "ntqwidgetintdict.h"
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 0591ca4cf..db3500cfe 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -45,7 +45,7 @@
#include "ntqpainter.h"
#include "ntqbitmap.h"
#include "ntqimage.h"
-#include "ntqobjectlist.h"
+#include "tqobjectlist.h"
#include "ntqlayout.h"
#include "ntqtextcodec.h"
#include "ntqdatetime.h"
diff --git a/src/kernel/qobject.cpp b/src/kernel/tqobject.cpp
index bb4c848b8..d66f8cf16 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/tqobject.cpp
@@ -40,8 +40,8 @@
#include "ntqvariant.h"
#include "ntqapplication.h"
-#include "ntqobject.h"
-#include "ntqobjectlist.h"
+#include "tqobject.h"
+#include "tqobjectlist.h"
#include "ntqsignalslotimp.h"
#include "ntqregexp.h"
#include "ntqmetaobject.h"
@@ -344,7 +344,7 @@ TQMetaCallEvent::~TQMetaCallEvent()
/*!
- \class TQObject ntqobject.h
+ \class TQObject tqobject.h
\brief The TQObject class is the base class of all TQt objects.
\ingroup objectmodel
@@ -1473,7 +1473,7 @@ static void objSearch( TQObjectList *result,
Returns a list of child objects, or 0 if this object has no
children.
- The TQObjectList class is defined in the \c ntqobjectlist.h header
+ The TQObjectList class is defined in the \c tqobjectlist.h header
file.
The first child added is the \link TQPtrList::first() first\endlink
@@ -1495,7 +1495,7 @@ static void objSearch( TQObjectList *result,
Returns a pointer to the list of all object trees (their root
objects), or 0 if there are no objects.
- The TQObjectList class is defined in the \c ntqobjectlist.h header
+ The TQObjectList class is defined in the \c tqobjectlist.h header
file.
The most recent root object created is the \link TQPtrList::first()
@@ -1549,7 +1549,7 @@ const TQObjectList *TQObject::objectTrees()
delete l; // delete the list, not the objects
\endcode
- The TQObjectList class is defined in the \c ntqobjectlist.h header
+ The TQObjectList class is defined in the \c tqobjectlist.h header
file.
\warning Delete the list as soon you have finished using it. The
diff --git a/src/kernel/ntqobject.h b/src/kernel/tqobject.h
index 19df54726..0d63af0a3 100644
--- a/src/kernel/ntqobject.h
+++ b/src/kernel/tqobject.h
@@ -42,7 +42,7 @@
#define TQOBJECT_H
#ifndef QT_H
-#include "ntqobjectdefs.h"
+#include "tqobjectdefs.h"
#include "ntqwindowdefs.h"
#include "ntqstring.h"
#include "ntqevent.h"
@@ -50,6 +50,8 @@
#include "ntqnamespace.h"
#endif // QT_H
+#include <tqt.h>
+
#define TQT_TR_NOOP(x) (x)
#define TQT_TRANSLATE_NOOP(scope,x) (x)
diff --git a/src/kernel/qobjectcleanuphandler.cpp b/src/kernel/tqobjectcleanuphandler.cpp
index 8523e4add..f06ebb7f3 100644
--- a/src/kernel/qobjectcleanuphandler.cpp
+++ b/src/kernel/tqobjectcleanuphandler.cpp
@@ -36,11 +36,11 @@
**
**********************************************************************/
-#include "ntqobjectcleanuphandler.h"
-#include "ntqobjectlist.h"
+#include "tqobjectcleanuphandler.h"
+#include "tqobjectlist.h"
/*!
- \class TQObjectCleanupHandler ntqobjectcleanuphandler.h
+ \class TQObjectCleanupHandler tqobjectcleanuphandler.h
\brief The TQObjectCleanupHandler class watches the lifetime of multiple TQObjects.
\ingroup objectmodel
diff --git a/src/kernel/ntqobjectcleanuphandler.h b/src/kernel/tqobjectcleanuphandler.h
index 82fe6d9b2..a4b83ee91 100644
--- a/src/kernel/ntqobjectcleanuphandler.h
+++ b/src/kernel/tqobjectcleanuphandler.h
@@ -40,7 +40,7 @@
#define TQOBJECTCLEANUPHANDLER_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#endif // QT_H
class TQObjectList;
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/tqobjectdefs.h
index ba5e12b88..ba5e12b88 100644
--- a/src/kernel/ntqobjectdefs.h
+++ b/src/kernel/tqobjectdefs.h
diff --git a/src/kernel/ntqobjectdict.h b/src/kernel/tqobjectdict.h
index 4ee49faf2..4ee49faf2 100644
--- a/src/kernel/ntqobjectdict.h
+++ b/src/kernel/tqobjectdict.h
diff --git a/src/kernel/ntqobjectlist.h b/src/kernel/tqobjectlist.h
index 80c353f0d..830a32e33 100644
--- a/src/kernel/ntqobjectlist.h
+++ b/src/kernel/tqobjectlist.h
@@ -42,7 +42,7 @@
#define TQOBJECTLIST_H
#ifndef QT_H
-#include "ntqobject.h"
+#include "tqobject.h"
#include "ntqptrlist.h"
#endif // QT_H