diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-05-23 14:04:45 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-05-27 16:08:54 +0900 |
| commit | 04913ce7a46fd027856e83a96205fdc388742a19 (patch) | |
| tree | a04a117317c14854a6b91072658ba0eb3ad8b3fc /src | |
| parent | c11c0f228b65f7471a26513ef8dbde413e75f8fa (diff) | |
| download | tqt3-04913ce7a46fd027856e83a96205fdc388742a19.tar.gz tqt3-04913ce7a46fd027856e83a96205fdc388742a19.zip | |
Rename ntqobject*.h and qobject*.cpp to tqobject*
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src')
91 files changed, 111 insertions, 109 deletions
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp index f8067b545..eb9526387 100644 --- a/src/dialogs/qdialog.cpp +++ b/src/dialogs/qdialog.cpp @@ -45,7 +45,7 @@ #include "ntqpushbutton.h" #include "ntqfocusdata.h" #include "ntqapplication.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqwidgetlist.h" #include "ntqlayout.h" #include "ntqsizegrip.h" diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 864139e12..bb02ad2bd 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -78,7 +78,7 @@ #include "ntqmessagebox.h" #include "ntqmime.h" #include "ntqnetworkprotocol.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqpainter.h" #include "ntqpopupmenu.h" #include "ntqprogressbar.h" diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp index 929be411a..29005500c 100644 --- a/src/dialogs/qmessagebox.cpp +++ b/src/dialogs/qmessagebox.cpp @@ -48,7 +48,7 @@ #include "ntqimage.h" #include "ntqapplication.h" #include "ntqstyle.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #if defined(QT_ACCESSIBILITY_SUPPORT) #include "ntqaccessible.h" #endif diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp index e6641dbc6..a9ad79d7d 100644 --- a/src/dialogs/qtabdialog.cpp +++ b/src/dialogs/qtabdialog.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_TABDIALOG -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqtabbar.h" #include "ntqtabwidget.h" #include "ntqpushbutton.h" 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 diff --git a/src/moc/moc.y b/src/moc/moc.y index 4b754b7bc..796647595 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -2135,7 +2135,7 @@ void registerClassInNamespace() // // Remove white space from TQ_SIGNAL and TQ_SLOT names. -// This function has been copied from qobject.cpp. +// This function has been copied from tqobject.cpp. // inline bool isSpace( char x ) @@ -3116,7 +3116,7 @@ void generateClass() // generate C++ source code for a class if ( !predef_call_func && !included_list_headers ) { // yes we need it, because otherwise TQT_VERSION may not be defined - fprintf( out, "\n#include <%sntqobjectdefs.h>\n", (const char*)g->qtPath ); + fprintf( out, "\n#include <%stqobjectdefs.h>\n", (const char*)g->qtPath ); fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath ); included_list_headers = TRUE; } diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index ef980dd34..d6b97ad85 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -5010,7 +5010,7 @@ void registerClassInNamespace() // // Remove white space from TQ_SIGNAL and TQ_SLOT names. -// This function has been copied from qobject.cpp. +// This function has been copied from tqobject.cpp. // inline bool isSpace( char x ) @@ -5991,7 +5991,7 @@ void generateClass() // generate C++ source code for a class if ( !predef_call_func && !included_list_headers ) { // yes we need it, because otherwise TQT_VERSION may not be defined - fprintf( out, "\n#include <%sntqobjectdefs.h>\n", (const char*)g->qtPath ); + fprintf( out, "\n#include <%stqobjectdefs.h>\n", (const char*)g->qtPath ); fprintf( out, "#include <%sntqsignalslotimp.h>\n", (const char*)g->qtPath ); included_list_headers = TRUE; } diff --git a/src/network/ntqdns.h b/src/network/ntqdns.h index 1c0559151..7201c3043 100644 --- a/src/network/ntqdns.h +++ b/src/network/ntqdns.h @@ -42,7 +42,7 @@ #define TQDNS_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqhostaddress.h" #include "ntqsocketnotifier.h" #include "ntqstringlist.h" diff --git a/src/network/ntqhttp.h b/src/network/ntqhttp.h index 8fc966bc3..f201363c8 100644 --- a/src/network/ntqhttp.h +++ b/src/network/ntqhttp.h @@ -42,7 +42,7 @@ #define TQHTTP_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqnetworkprotocol.h" #include "ntqstringlist.h" #endif // QT_H diff --git a/src/network/ntqserversocket.h b/src/network/ntqserversocket.h index f00f4c775..ab9c242ed 100644 --- a/src/network/ntqserversocket.h +++ b/src/network/ntqserversocket.h @@ -42,7 +42,7 @@ #define TQSERVERSOCKET_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqhostaddress.h" #include "ntqsocketdevice.h" // ### remove or keep for users' convenience? #endif // QT_H diff --git a/src/network/ntqsocket.h b/src/network/ntqsocket.h index 90f1f74ac..4946e81f5 100644 --- a/src/network/ntqsocket.h +++ b/src/network/ntqsocket.h @@ -42,7 +42,7 @@ #define TQSOCKET_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqiodevice.h" #include "ntqhostaddress.h" // int->TQHostAddress conversion #endif // QT_H diff --git a/src/sql/ntqeditorfactory.h b/src/sql/ntqeditorfactory.h index 212424003..cea5885ac 100644 --- a/src/sql/ntqeditorfactory.h +++ b/src/sql/ntqeditorfactory.h @@ -42,7 +42,7 @@ #define TQEDITORFACTORY_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqvariant.h" #endif // QT_H diff --git a/src/sql/ntqsqldatabase.h b/src/sql/ntqsqldatabase.h index 1fed63e04..c50955e82 100644 --- a/src/sql/ntqsqldatabase.h +++ b/src/sql/ntqsqldatabase.h @@ -42,7 +42,7 @@ #define TQSQLDATABASE_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqstring.h" #include "ntqsqlquery.h" #include "ntqstringlist.h" diff --git a/src/sql/ntqsqldriver.h b/src/sql/ntqsqldriver.h index b1b2fcb3a..ce900b72a 100644 --- a/src/sql/ntqsqldriver.h +++ b/src/sql/ntqsqldriver.h @@ -42,7 +42,7 @@ #define TQSQLDRIVER_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqptrdict.h" #include "ntqstring.h" #include "ntqsqlerror.h" diff --git a/src/sql/ntqsqlform.h b/src/sql/ntqsqlform.h index 3d3b6272f..7771f7b70 100644 --- a/src/sql/ntqsqlform.h +++ b/src/sql/ntqsqlform.h @@ -42,7 +42,7 @@ #define TQSQLFORM_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqmap.h" #endif // QT_H diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h index d1f56f858..62df18531 100644 --- a/src/sql/ntqsqlquery.h +++ b/src/sql/ntqsqlquery.h @@ -42,7 +42,7 @@ #define TQSQLQUERY_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqstring.h" #include "ntqvariant.h" #include "ntqvaluelist.h" diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp index 66c1725aa..e21af1d36 100644 --- a/src/sql/qsqldatabase.cpp +++ b/src/sql/qsqldatabase.cpp @@ -81,7 +81,7 @@ #include "qsqldriverinterface_p.h" #include <private/qpluginmanager_p.h> #include <private/qsqlextension_p.h> -#include "ntqobject.h" +#include "tqobject.h" #include "ntqguardedptr.h" #include "ntqcleanuphandler.h" #include "ntqdict.h" diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp index f5c57d46f..3ce552ebd 100644 --- a/src/styles/qcommonstyle.cpp +++ b/src/styles/qcommonstyle.cpp @@ -172,7 +172,7 @@ static void tqt_style_control_element_data_null_cleanup() { #include <ntqmetaobject.h> -// Keep in sync with duplicate definition in qobject.cpp +// Keep in sync with duplicate definition in tqobject.cpp class TQStyleControlElementDataPrivate { public: bool isTQPushButton; diff --git a/src/styles/qstyleplugin.cpp b/src/styles/qstyleplugin.cpp index c6512de1f..2650708c1 100644 --- a/src/styles/qstyleplugin.cpp +++ b/src/styles/qstyleplugin.cpp @@ -44,7 +44,7 @@ #ifndef TQT_NO_COMPONENT #include "qstyleinterface_p.h" -#include "ntqobjectcleanuphandler.h" +#include "tqobjectcleanuphandler.h" #include "ntqstyle.h" /*! diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp index d3b130707..1bf789d22 100644 --- a/src/styles/qwindowsstyle.cpp +++ b/src/styles/qwindowsstyle.cpp @@ -63,7 +63,7 @@ #include "ntqbitmap.h" #include "ntqcleanuphandler.h" #include "ntqdockwindow.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqmenubar.h" #include <limits.h> diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp index bf27224c8..31fa8e25d 100644 --- a/src/table/qtable.cpp +++ b/src/table/qtable.cpp @@ -53,7 +53,7 @@ #include <ntqcursor.h> #include <ntqapplication.h> #include <ntqtimer.h> -#include <ntqobjectlist.h> +#include <tqobjectlist.h> #include <ntqiconset.h> #include <ntqcombobox.h> #include <ntqcheckbox.h> diff --git a/src/tools/qfile.cpp b/src/tools/qfile.cpp index 709d175bb..d5dae9a7e 100644 --- a/src/tools/qfile.cpp +++ b/src/tools/qfile.cpp @@ -56,7 +56,7 @@ #endif -// Duplicated from ntqobject.h, but we cannot include ntqobject.h here since +// Duplicated from tqobject.h, but we cannot include tqobject.h here since // it causes qmake to not build on irix g++ #define TQT_TRANSLATE_NOOP(scope,x) (x) diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp index 38592c9bb..9fae544ac 100644 --- a/src/tools/qwinexport.cpp +++ b/src/tools/qwinexport.cpp @@ -4,7 +4,7 @@ #include <ntqaccessible.h> #include <ntqconnection.h> #include <ntqguardedptr.h> -#include <ntqobject.h> +#include <tqobject.h> #include <ntqpoint.h> #include <ntqrect.h> #include <ntqsignalslotimp.h> diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h index a00d7d8fd..326b5236d 100644 --- a/src/widgets/ntqaction.h +++ b/src/widgets/ntqaction.h @@ -42,7 +42,7 @@ #define TQACTION_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqiconset.h" #include "ntqstring.h" #include "ntqkeysequence.h" diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h index c5ddedaac..406d210f0 100644 --- a/src/widgets/ntqvalidator.h +++ b/src/widgets/ntqvalidator.h @@ -42,7 +42,7 @@ #define TQVALIDATOR_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #include "ntqstring.h" // char*->TQString conversion #include "ntqregexp.h" // TQString->TQRegExp conversion #endif // QT_H diff --git a/src/widgets/ntqwhatsthis.h b/src/widgets/ntqwhatsthis.h index 98f1fd9fa..66b4b3c90 100644 --- a/src/widgets/ntqwhatsthis.h +++ b/src/widgets/ntqwhatsthis.h @@ -40,7 +40,7 @@ #define TQWHATSTHIS_H #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #endif // QT_H #ifndef TQT_NO_WHATSTHIS diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp index 361ed026e..cbeb093c3 100644 --- a/src/widgets/qaction.cpp +++ b/src/widgets/qaction.cpp @@ -49,7 +49,7 @@ #include "ntqtooltip.h" #include "ntqwhatsthis.h" #include "ntqstatusbar.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" /*! diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp index 9a31d397f..f9b450e66 100644 --- a/src/widgets/qgroupbox.cpp +++ b/src/widgets/qgroupbox.cpp @@ -46,7 +46,7 @@ #include "ntqaccel.h" #include "ntqradiobutton.h" #include "ntqfocusdata.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqdrawutil.h" #include "ntqapplication.h" #include "ntqstyle.h" diff --git a/src/widgets/qhbox.cpp b/src/widgets/qhbox.cpp index 117164cfc..7f5e0c893 100644 --- a/src/widgets/qhbox.cpp +++ b/src/widgets/qhbox.cpp @@ -38,7 +38,7 @@ #ifndef TQT_NO_HBOX #include "ntqlayout.h" #include "ntqapplication.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" /*! diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index 69f4c16ad..970d8cdf4 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -43,7 +43,7 @@ #include "ntqtimer.h" #include "ntqlayout.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqintdict.h" #include "ntqapplication.h" #include "ntqptrlist.h" diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp index ec93e3a22..afeb80f94 100644 --- a/src/widgets/qpopupmenu.cpp +++ b/src/widgets/qpopupmenu.cpp @@ -49,7 +49,7 @@ #include "ntqpixmapcache.h" #include "ntqtimer.h" #include "ntqwhatsthis.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqguardedptr.h" #include "qeffects_p.h" #include "ntqcursor.h" diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp index 493b88f8b..4198e3132 100644 --- a/src/widgets/qscrollview.cpp +++ b/src/widgets/qscrollview.cpp @@ -41,7 +41,7 @@ #include "ntqwidget.h" #ifndef TQT_NO_SCROLLVIEW #include "ntqscrollbar.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqpainter.h" #include "ntqpixmap.h" #include "ntqcursor.h" diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp index c94757620..33e5250bf 100644 --- a/src/widgets/qsplitter.cpp +++ b/src/widgets/qsplitter.cpp @@ -47,7 +47,7 @@ #include "ntqbitmap.h" #include "ntqdrawutil.h" #include "ntqmemarray.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqpainter.h" #include "ntqptrlist.h" #include "ntqstyle.h" diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp index 5f1949099..f6c54524c 100644 --- a/src/widgets/qtabwidget.cpp +++ b/src/widgets/qtabwidget.cpp @@ -40,7 +40,7 @@ #include "ntqtabwidget.h" #ifndef TQT_NO_TABWIDGET -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqtabbar.h" #include "ntqapplication.h" #include "ntqwidgetstack.h" diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp index dfff7c763..fd5bf56a2 100644 --- a/src/widgets/qtoolbar.cpp +++ b/src/widgets/qtoolbar.cpp @@ -46,7 +46,7 @@ #include "ntqcursor.h" #include "ntqlayout.h" #include "ntqframe.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqpainter.h" #include "ntqdrawutil.h" #include "ntqtoolbutton.h" diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp index d5c906477..a8d2523ac 100644 --- a/src/widgets/qtoolbox.cpp +++ b/src/widgets/qtoolbox.cpp @@ -47,7 +47,7 @@ #include <ntqscrollview.h> #include <ntqpainter.h> #include <ntqstyle.h> -#include <ntqobjectlist.h> +#include <tqobjectlist.h> #include <ntqapplication.h> #include <ntqwidgetlist.h> #include <ntqlayout.h> diff --git a/src/widgets/qwidgetplugin.cpp b/src/widgets/qwidgetplugin.cpp index f7d0bb2f9..2d026221c 100644 --- a/src/widgets/qwidgetplugin.cpp +++ b/src/widgets/qwidgetplugin.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_WIDGETPLUGIN #include "qwidgetinterface_p.h" -#include "ntqobjectcleanuphandler.h" +#include "tqobjectcleanuphandler.h" #include "ntqwidget.h" #ifdef QT_CONTAINER_CUSTOM_WIDGETS #include "ntqwidgetlist.h" diff --git a/src/widgets/qwidgetresizehandler_p.h b/src/widgets/qwidgetresizehandler_p.h index 08f04b65d..30f8e088c 100644 --- a/src/widgets/qwidgetresizehandler_p.h +++ b/src/widgets/qwidgetresizehandler_p.h @@ -54,7 +54,7 @@ // #ifndef QT_H -#include "ntqobject.h" +#include "tqobject.h" #endif // QT_H #ifndef TQT_NO_RESIZEHANDLER class TQMouseEvent; diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/qwidgetstack.cpp index 457376191..b8cb9e76a 100644 --- a/src/widgets/qwidgetstack.cpp +++ b/src/widgets/qwidgetstack.cpp @@ -43,7 +43,7 @@ #include "../kernel/qlayoutengine_p.h" #ifndef TQT_NO_WIDGETSTACK -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqfocusdata.h" #include "ntqbutton.h" #include "ntqbuttongroup.h" diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp index ff8e3d03c..a2cd96faf 100644 --- a/src/workspace/qworkspace.cpp +++ b/src/workspace/qworkspace.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_WORKSPACE #include "ntqapplication.h" #include "../widgets/qtitlebar_p.h" -#include "ntqobjectlist.h" +#include "tqobjectlist.h" #include "ntqlayout.h" #include "ntqtoolbutton.h" #include "ntqlabel.h" diff --git a/src/xml/qxml.cpp b/src/xml/qxml.cpp index 9acdafc79..e211a88b0 100644 --- a/src/xml/qxml.cpp +++ b/src/xml/qxml.cpp @@ -47,7 +47,7 @@ #include "ntqvaluestack.h" // needed for TQT_TRANSLATE_NOOP: -#include "ntqobject.h" +#include "tqobject.h" #ifndef TQT_NO_XML |