From 69d87202cb139ffe9e4b3ce92e434523b7b09b64 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 17 Oct 2018 19:46:30 +0900 Subject: QT_NO_* -> TQT_NO_* renaming. Signed-off-by: Michele Calgaro --- ChangeLog.immodule | 58 +- configure | 20 +- doc/debug.doc | 8 +- doc/features.doc | 176 ++--- doc/html/canvas-example.html | 6 +- doc/html/debug.html | 8 +- doc/html/drawdemo-example.html | 4 +- doc/html/drawlines-example.html | 2 +- doc/html/emb-features.html | 176 ++--- doc/html/hello-example.html | 2 +- doc/html/helpviewer-example.html | 4 +- doc/html/i18n.html | 2 +- doc/html/mdi-example.html | 10 +- doc/html/ntqapplication.html | 4 +- doc/html/ntqstring.html | 4 +- doc/html/porting.html | 4 +- doc/html/porting2.html | 4 +- doc/html/qaccel-h.html | 4 +- doc/html/qaction-h.html | 8 +- doc/html/qapplication-h.html | 40 +- doc/html/qasyncimageio-h.html | 4 +- doc/html/qasyncio-h.html | 4 +- doc/html/qaxbase-h.html | 4 +- doc/html/qbig5codec-h.html | 2 +- doc/html/qbitarray-h.html | 2 +- doc/html/qbitmap-h.html | 4 +- doc/html/qbrush-h.html | 2 +- doc/html/qbutton-h.html | 6 +- doc/html/qbuttongroup-h.html | 4 +- doc/html/qcanvas-h.html | 12 +- doc/html/qcdestyle-h.html | 4 +- doc/html/qcheckbox-h.html | 4 +- doc/html/qclipboard-h.html | 8 +- doc/html/qcolor-h.html | 4 +- doc/html/qcolordialog-h.html | 2 +- doc/html/qcombobox-h.html | 6 +- doc/html/qcommonstyle-h.html | 4 +- doc/html/qcopchannel_qws-h.html | 2 +- doc/html/qcstring-h.html | 14 +- doc/html/qcursor-h.html | 10 +- doc/html/qdatabrowser-h.html | 2 +- doc/html/qdatastream-h.html | 4 +- doc/html/qdatatable-h.html | 2 +- doc/html/qdataview-h.html | 2 +- doc/html/qdatetime-h.html | 32 +- doc/html/qdatetimeedit-h.html | 2 +- doc/html/qdial-h.html | 6 +- doc/html/qdialog-h.html | 4 +- doc/html/qdir-h.html | 4 +- doc/html/qdirectpainter_qws-h.html | 2 +- doc/html/qdns-h.html | 4 +- doc/html/qdockarea-h.html | 6 +- doc/html/qdockwindow-h.html | 4 +- doc/html/qdom-h.html | 4 +- doc/html/qdragobject-h.html | 10 +- doc/html/qdrawutil-h.html | 4 +- doc/html/qeditorfactory-h.html | 4 +- doc/html/qerrormessage-h.html | 4 +- doc/html/qeucjpcodec-h.html | 2 +- doc/html/qeuckrcodec-h.html | 2 +- doc/html/qevent-h.html | 6 +- doc/html/qfiledialog-h.html | 2 +- doc/html/qfileinfo-h.html | 12 +- doc/html/qfont-h.html | 10 +- doc/html/qfontdatabase-h.html | 4 +- doc/html/qfontdialog-h.html | 2 +- doc/html/qframe-h.html | 4 +- doc/html/qftp-h.html | 4 +- doc/html/qgb18030codec-h.html | 2 +- doc/html/qgfx_qws-h.html | 10 +- doc/html/qgfxdriverfactory_qws-h.html | 2 +- doc/html/qgfxdriverplugin_qws-h.html | 6 +- doc/html/qglobal-h.html | 40 +- doc/html/qgrid-h.html | 4 +- doc/html/qgridview-h.html | 4 +- doc/html/qgroupbox-h.html | 14 +- doc/html/qhbox-h.html | 4 +- doc/html/qhbuttongroup-h.html | 4 +- doc/html/qheader-h.html | 4 +- doc/html/qhgroupbox-h.html | 4 +- doc/html/qhostaddress-h.html | 10 +- doc/html/qhttp-h.html | 2 +- doc/html/qiconset-h.html | 4 +- doc/html/qiconview-h.html | 34 +- doc/html/qimage-h.html | 40 +- doc/html/qimageformatplugin-h.html | 4 +- doc/html/qinputdialog-h.html | 4 +- doc/html/qjiscodec-h.html | 2 +- doc/html/qkbddriverfactory_qws-h.html | 2 +- doc/html/qkbddriverplugin_qws-h.html | 6 +- doc/html/qkeyboard_qws-h.html | 2 +- doc/html/qkeysequence-h.html | 6 +- doc/html/qlabel-h.html | 30 +- doc/html/qlayout-h.html | 8 +- doc/html/qlcdnumber-h.html | 4 +- doc/html/qlibrary-h.html | 4 +- doc/html/qlineedit-h.html | 8 +- doc/html/qlistbox-h.html | 4 +- doc/html/qlistview-h.html | 10 +- doc/html/qlocalfs-h.html | 4 +- doc/html/qmacstyle_mac-h.html | 2 +- doc/html/qmainwindow-h.html | 20 +- doc/html/qmap-h.html | 4 +- doc/html/qmenubar-h.html | 8 +- doc/html/qmenudata-h.html | 10 +- doc/html/qmessagebox-h.html | 4 +- doc/html/qmetaobject-h.html | 20 +- doc/html/qmime-h.html | 4 +- doc/html/qmotifplusstyle-h.html | 4 +- doc/html/qmotifstyle-h.html | 4 +- doc/html/qmousedriverfactory_qws-h.html | 2 +- doc/html/qmousedriverplugin_qws-h.html | 6 +- doc/html/qmovie-h.html | 4 +- doc/html/qmultilineedit-h.html | 4 +- doc/html/qnetworkprotocol-h.html | 4 +- doc/html/qobject-h.html | 16 +- doc/html/qpainter-h.html | 20 +- doc/html/qpair-h.html | 2 +- doc/html/qpalette-h.html | 8 +- doc/html/qpen-h.html | 2 +- doc/html/qpicture-h.html | 4 +- doc/html/qpixmap-h.html | 16 +- doc/html/qplatinumstyle-h.html | 4 +- doc/html/qpngio-h.html | 4 +- doc/html/qpoint-h.html | 2 +- doc/html/qpointarray-h.html | 4 +- doc/html/qpopupmenu-h.html | 10 +- doc/html/qprinter-h.html | 4 +- doc/html/qprocess-h.html | 8 +- doc/html/qprogressbar-h.html | 4 +- doc/html/qprogressdialog-h.html | 4 +- doc/html/qpushbutton-h.html | 12 +- doc/html/qradiobutton-h.html | 4 +- doc/html/qrangecontrol-h.html | 10 +- doc/html/qrect-h.html | 2 +- doc/html/qregexp-h.html | 8 +- doc/html/qregion-h.html | 4 +- doc/html/qrtlcodec-h.html | 2 +- doc/html/qscrollbar-h.html | 6 +- doc/html/qscrollview-h.html | 20 +- doc/html/qserversocket-h.html | 4 +- doc/html/qsessionmanager-h.html | 4 +- doc/html/qsettings-h.html | 4 +- doc/html/qsgistyle-h.html | 4 +- doc/html/qsignal-h.html | 8 +- doc/html/qsignalmapper-h.html | 4 +- doc/html/qsimplerichtext-h.html | 4 +- doc/html/qsizegrip-h.html | 4 +- doc/html/qsjiscodec-h.html | 2 +- doc/html/qslider-h.html | 6 +- doc/html/qsocket-h.html | 6 +- doc/html/qsocketdevice-h.html | 4 +- doc/html/qsound-h.html | 4 +- doc/html/qspinbox-h.html | 6 +- doc/html/qsplashscreen-h.html | 4 +- doc/html/qsplitter-h.html | 8 +- doc/html/qsql-h.html | 2 +- doc/html/qsqlcursor-h.html | 4 +- doc/html/qsqldatabase-h.html | 4 +- doc/html/qsqldriver-h.html | 4 +- doc/html/qsqldriverplugin-h.html | 8 +- doc/html/qsqleditorfactory-h.html | 4 +- doc/html/qsqlerror-h.html | 4 +- doc/html/qsqlfield-h.html | 4 +- doc/html/qsqlform-h.html | 4 +- doc/html/qsqlindex-h.html | 4 +- doc/html/qsqlpropertymap-h.html | 4 +- doc/html/qsqlquery-h.html | 4 +- doc/html/qsqlrecord-h.html | 4 +- doc/html/qsqlresult-h.html | 4 +- doc/html/qsqlselectcursor-h.html | 4 +- doc/html/qstatusbar-h.html | 4 +- doc/html/qstring-h.html | 68 +- doc/html/qstringlist-h.html | 14 +- doc/html/qstrlist-h.html | 2 +- doc/html/qstyle-h.html | 4 +- doc/html/qstylefactory-h.html | 6 +- doc/html/qstyleplugin-h.html | 8 +- doc/html/qstylesheet-h.html | 8 +- doc/html/qtabbar-h.html | 4 +- doc/html/qtabdialog-h.html | 4 +- doc/html/qtable-h.html | 8 +- doc/html/qtabwidget-h.html | 4 +- doc/html/qtextbrowser-h.html | 4 +- doc/html/qtextcodec-h.html | 8 +- doc/html/qtextcodecplugin-h.html | 4 +- doc/html/qtextedit-h.html | 20 +- doc/html/qtextstream-h.html | 6 +- doc/html/qtextview-h.html | 4 +- doc/html/qtoolbar-h.html | 4 +- doc/html/qtoolbox-h.html | 4 +- doc/html/qtoolbutton-h.html | 10 +- doc/html/qtooltip-h.html | 4 +- doc/html/qtsciicodec-h.html | 2 +- doc/html/qurl-h.html | 4 +- doc/html/qurloperator-h.html | 4 +- doc/html/quuid-h.html | 4 +- doc/html/qvalidator-h.html | 8 +- doc/html/qvaluelist-h.html | 6 +- doc/html/qvaluevector-h.html | 4 +- doc/html/qvariant-h.html | 34 +- doc/html/qvbox-h.html | 4 +- doc/html/qvbuttongroup-h.html | 4 +- doc/html/qvgroupbox-h.html | 4 +- doc/html/qwerty-example.html | 20 +- doc/html/qwhatsthis-h.html | 4 +- doc/html/qwidget-h.html | 50 +- doc/html/qwidgetfactory-h.html | 2 +- doc/html/qwidgetplugin-h.html | 4 +- doc/html/qwidgetstack-h.html | 4 +- doc/html/qwindowsstyle-h.html | 4 +- doc/html/qwindowsystem_qws-h.html | 56 +- doc/html/qwizard-h.html | 4 +- doc/html/qwmatrix-h.html | 4 +- doc/html/qworkspace-h.html | 8 +- doc/html/qwsdecoration_qws-h.html | 2 +- doc/html/qxml-h.html | 4 +- doc/html/scribble-example.html | 2 +- doc/html/showimg-example.html | 4 +- doc/html/sql-driver.html | 2 +- doc/html/themes-example.html | 16 +- doc/i18n.doc | 2 +- doc/man/man1/tqvfb.1 | 2 +- doc/man/man3/tqapplication.3qt | 4 +- doc/man/man3/tqstring.3qt | 4 +- doc/porting2.doc | 4 +- doc/porting3.doc | 4 +- doc/sql-driver.doc | 2 +- examples/canvas/canvas.cpp | 6 +- examples/demo/dnd/styledbutton.cpp | 6 +- examples/demo/dnd/styledbutton.h | 4 +- examples/demo/qthumbwheel.cpp | 2 +- examples/demo/qthumbwheel.h | 4 +- examples/demo/textdrawing/helpwindow.cpp | 4 +- examples/demo/textdrawing/textedit.cpp | 2 +- examples/drawdemo/drawdemo.cpp | 4 +- examples/drawlines/connect.cpp | 2 +- examples/hello/main.cpp | 2 +- examples/helpviewer/helpwindow.cpp | 4 +- examples/mdi/application.cpp | 10 +- examples/qwerty/qwerty.cpp | 18 +- examples/qwerty/qwerty.h | 2 +- examples/scribble/scribble.cpp | 2 +- examples/showimg/showimg.cpp | 4 +- examples/tablet/canvas.cpp | 2 +- examples/tetrix/qtetrix.cpp | 6 +- examples/tetrix/qtetrix.h | 2 +- examples/textedit/textedit.cpp | 2 +- examples/themes/metal.cpp | 2 +- examples/themes/metal.h | 2 +- examples/themes/themes.cpp | 8 +- examples/themes/wood.cpp | 2 +- examples/themes/wood.h | 2 +- examples/thread/semaphores/main.cpp | 2 +- mkspecs/hpux-acc-o64/qplatformdefs.h | 2 +- mkspecs/hpux-acc/qplatformdefs.h | 4 +- mkspecs/hpux-cc/qplatformdefs.h | 2 +- mkspecs/hpux-g++/qplatformdefs.h | 2 +- mkspecs/hpuxi-acc-32/qplatformdefs.h | 2 +- mkspecs/hpuxi-acc-64/qplatformdefs.h | 2 +- mkspecs/linux-kcc/qplatformdefs.h | 2 +- mkspecs/macx-g++/qplatformdefs.h | 2 +- mkspecs/macx-mwerks/qplatformdefs.h | 2 +- mkspecs/macx-pbuilder/qplatformdefs.h | 2 +- mkspecs/macx-xlc/qplatformdefs.h | 2 +- plugins/src/accessible/widgets/main.cpp | 4 +- .../src/accessible/widgets/qaccessiblewidget.cpp | 6 +- plugins/src/accessible/widgets/qaccessiblewidget.h | 4 +- plugins/src/imageformats/jpeg/main.cpp | 8 +- plugins/src/imageformats/mng/main.cpp | 8 +- plugins/src/imageformats/png/main.cpp | 8 +- .../inputmethods/imsw-multi/qmultiinputcontext.cpp | 14 +- .../inputmethods/imsw-multi/qmultiinputcontext.h | 2 +- .../imsw-multi/qmultiinputcontextplugin.cpp | 2 +- .../imsw-multi/qmultiinputcontextplugin.h | 2 +- .../imsw-none/qnoneinputcontextplugin.cpp | 2 +- .../imsw-none/qnoneinputcontextplugin.h | 2 +- .../simple/qsimpleinputcontextplugin.cpp | 2 +- .../simple/qsimpleinputcontextplugin.h | 2 +- .../src/inputmethods/xim/qximinputcontext_x11.cpp | 68 +- .../inputmethods/xim/qximinputcontextplugin.cpp | 2 +- .../src/inputmethods/xim/qximinputcontextplugin.h | 2 +- plugins/src/inputmethods/xim/xim.pro | 2 +- qmake/Makefile.unix | 4 +- qmake/Makefile.win32-g++ | 2 +- qmake/generators/mac/metrowerks_xml.cpp | 2 +- qmake/generators/unix/unixmake.cpp | 2 +- qmake/generators/win32/borland_bmake.cpp | 2 +- qmake/generators/win32/mingw_make.cpp | 2 +- qmake/generators/win32/msvc_dsp.cpp | 2 +- qmake/generators/win32/msvc_nmake.cpp | 2 +- qmake/generators/win32/msvc_vcproj.cpp | 8 +- src/attic/qtmultilineedit.cpp | 64 +- src/attic/qtmultilineedit.h | 14 +- src/attic/qttableview.cpp | 10 +- src/attic/qttableview.h | 4 +- src/canvas/ntqcanvas.h | 12 +- src/canvas/qcanvas.cpp | 36 +- src/codecs/ntqbig5codec.h | 2 +- src/codecs/ntqeucjpcodec.h | 2 +- src/codecs/ntqeuckrcodec.h | 2 +- src/codecs/ntqgb18030codec.h | 2 +- src/codecs/ntqjiscodec.h | 2 +- src/codecs/ntqjpunicode.h | 4 +- src/codecs/ntqrtlcodec.h | 2 +- src/codecs/ntqsjiscodec.h | 2 +- src/codecs/ntqtextcodec.h | 8 +- src/codecs/ntqtextcodecfactory.h | 4 +- src/codecs/ntqtextcodecplugin.h | 4 +- src/codecs/ntqtsciicodec.h | 2 +- src/codecs/ntqutfcodec.h | 4 +- src/codecs/qbig5codec.cpp | 2 +- src/codecs/qeucjpcodec.cpp | 2 +- src/codecs/qeuckrcodec.cpp | 2 +- src/codecs/qfontcncodec.cpp | 8 +- src/codecs/qfontcodecs_p.h | 8 +- src/codecs/qfonthkcodec.cpp | 8 +- src/codecs/qfontjpcodec.cpp | 8 +- src/codecs/qfontkrcodec.cpp | 8 +- src/codecs/qfontlaocodec.cpp | 8 +- src/codecs/qfonttwcodec.cpp | 8 +- src/codecs/qgb18030codec.cpp | 2 +- src/codecs/qisciicodec.cpp | 4 +- src/codecs/qisciicodec_p.h | 4 +- src/codecs/qjiscodec.cpp | 2 +- src/codecs/qjpunicode.cpp | 2 +- src/codecs/qrtlcodec.cpp | 2 +- src/codecs/qsjiscodec.cpp | 2 +- src/codecs/qt_codecs.pri | 2 +- src/codecs/qtextcodec.cpp | 44 +- src/codecs/qtextcodecfactory.cpp | 16 +- src/codecs/qtextcodecinterface_p.h | 8 +- src/codecs/qtextcodecplugin.cpp | 4 +- src/codecs/qtsciicodec.cpp | 2 +- src/codecs/qutfcodec.cpp | 4 +- src/dialogs/ntqcolordialog.h | 2 +- src/dialogs/ntqdialog.h | 4 +- src/dialogs/ntqerrormessage.h | 4 +- src/dialogs/ntqfiledialog.h | 2 +- src/dialogs/ntqfontdialog.h | 2 +- src/dialogs/ntqinputdialog.h | 4 +- src/dialogs/ntqmessagebox.h | 4 +- src/dialogs/ntqprintdialog.h | 2 +- src/dialogs/ntqprogressdialog.h | 4 +- src/dialogs/ntqsemimodal.h | 2 +- src/dialogs/ntqtabdialog.h | 4 +- src/dialogs/ntqwizard.h | 4 +- src/dialogs/qcolordialog.cpp | 26 +- src/dialogs/qdialog.cpp | 34 +- src/dialogs/qerrormessage.cpp | 8 +- src/dialogs/qfiledialog.cpp | 66 +- src/dialogs/qfontdialog.cpp | 4 +- src/dialogs/qinputdialog.cpp | 12 +- src/dialogs/qmessagebox.cpp | 16 +- src/dialogs/qprintdialog.cpp | 26 +- src/dialogs/qprogressdialog.cpp | 12 +- src/dialogs/qtabdialog.cpp | 2 +- src/dialogs/qwizard.cpp | 12 +- src/embedded/qgfxdriverinterface_p.h | 4 +- src/embedded/qkbddriverinterface_p.h | 4 +- src/embedded/qmousedriverinterface_p.h | 4 +- src/embedded/qt_embedded.pri | 46 +- src/inputmethod/ntqinputcontextfactory.h | 4 +- src/inputmethod/ntqinputcontextplugin.h | 4 +- src/inputmethod/qinputcontextfactory.cpp | 26 +- src/inputmethod/qinputcontextinterface_p.h | 8 +- src/inputmethod/qinputcontextplugin.cpp | 8 +- src/kernel/ntqaccel.h | 4 +- src/kernel/ntqapplication.h | 42 +- src/kernel/ntqasyncimageio.h | 4 +- src/kernel/ntqasyncio.h | 4 +- src/kernel/ntqbitmap.h | 4 +- src/kernel/ntqbrush.h | 2 +- src/kernel/ntqclipboard.h | 8 +- src/kernel/ntqcolor.h | 4 +- src/kernel/ntqcursor.h | 10 +- src/kernel/ntqdragobject.h | 10 +- src/kernel/ntqdrawutil.h | 4 +- src/kernel/ntqevent.h | 6 +- src/kernel/ntqfont.h | 10 +- src/kernel/ntqfontdatabase.h | 4 +- src/kernel/ntqgplugin.h | 4 +- src/kernel/ntqiconset.h | 4 +- src/kernel/ntqimage.h | 40 +- src/kernel/ntqimageformatplugin.h | 4 +- src/kernel/ntqinputcontext.h | 2 +- src/kernel/ntqjpegio.h | 4 +- src/kernel/ntqkeysequence.h | 6 +- src/kernel/ntqlayout.h | 8 +- src/kernel/ntqlocalfs.h | 4 +- src/kernel/ntqmetaobject.h | 20 +- src/kernel/ntqmime.h | 4 +- src/kernel/ntqmngio.h | 4 +- src/kernel/ntqmovie.h | 4 +- src/kernel/ntqnetworkprotocol.h | 4 +- src/kernel/ntqobject.h | 16 +- src/kernel/ntqobjectdefs.h | 6 +- src/kernel/ntqpainter.h | 20 +- src/kernel/ntqpalette.h | 8 +- src/kernel/ntqpen.h | 2 +- src/kernel/ntqpicture.h | 4 +- src/kernel/ntqpixmap.h | 16 +- src/kernel/ntqpngio.h | 4 +- src/kernel/ntqpoint.h | 2 +- src/kernel/ntqpointarray.h | 4 +- src/kernel/ntqprinter.h | 4 +- src/kernel/ntqprocess.h | 8 +- src/kernel/ntqrect.h | 2 +- src/kernel/ntqregion.h | 4 +- src/kernel/ntqsessionmanager.h | 4 +- src/kernel/ntqsignal.h | 8 +- src/kernel/ntqsignalmapper.h | 4 +- src/kernel/ntqsimplerichtext.h | 4 +- src/kernel/ntqsizegrip.h | 4 +- src/kernel/ntqsound.h | 4 +- src/kernel/ntqstyle.h | 4 +- src/kernel/ntqstylesheet.h | 8 +- src/kernel/ntqurl.h | 4 +- src/kernel/ntqurloperator.h | 4 +- src/kernel/ntqvariant.h | 34 +- src/kernel/ntqwidget.h | 62 +- src/kernel/ntqwmatrix.h | 4 +- src/kernel/qabstractlayout.cpp | 26 +- src/kernel/qaccel.cpp | 22 +- src/kernel/qapplication.cpp | 116 ++-- src/kernel/qapplication_p.h | 2 +- src/kernel/qapplication_x11.cpp | 110 +-- src/kernel/qasyncimageio.cpp | 4 +- src/kernel/qasyncio.cpp | 4 +- src/kernel/qbitmap.cpp | 6 +- src/kernel/qclipboard.cpp | 8 +- src/kernel/qclipboard_x11.cpp | 4 +- src/kernel/qcolor.cpp | 4 +- src/kernel/qcolor_p.cpp | 8 +- src/kernel/qcursor.cpp | 12 +- src/kernel/qcursor_x11.cpp | 8 +- src/kernel/qdesktopwidget_x11.cpp | 16 +- src/kernel/qdnd_x11.cpp | 14 +- src/kernel/qdragobject.cpp | 16 +- src/kernel/qdrawutil.cpp | 22 +- src/kernel/qdropsite.cpp | 4 +- src/kernel/qevent.cpp | 2 +- src/kernel/qfont.cpp | 14 +- src/kernel/qfont_x11.cpp | 10 +- src/kernel/qfontdatabase.cpp | 8 +- src/kernel/qfontdatabase_x11.cpp | 26 +- src/kernel/qfontengine_p.h | 8 +- src/kernel/qfontengine_x11.cpp | 4 +- src/kernel/qgplugin.cpp | 4 +- src/kernel/qiconset.cpp | 4 +- src/kernel/qimage.cpp | 216 +++--- src/kernel/qimageformatinterface_p.h | 4 +- src/kernel/qimageformatplugin.cpp | 4 +- src/kernel/qinputcontext.cpp | 16 +- src/kernel/qinputcontext_x11.cpp | 2 +- src/kernel/qjpegio.cpp | 2 +- src/kernel/qkeysequence.cpp | 12 +- src/kernel/qlayout.cpp | 4 +- src/kernel/qlayoutengine.cpp | 4 +- src/kernel/qlayoutengine_p.h | 4 +- src/kernel/qlocalfs.cpp | 4 +- src/kernel/qlock.cpp | 14 +- src/kernel/qmetaobject.cpp | 26 +- src/kernel/qmime.cpp | 6 +- src/kernel/qmngio.cpp | 14 +- src/kernel/qmotifdnd_x11.cpp | 4 +- src/kernel/qmovie.cpp | 6 +- src/kernel/qnetworkprotocol.cpp | 2 +- src/kernel/qobject.cpp | 34 +- src/kernel/qpaintdevice_x11.cpp | 6 +- src/kernel/qpainter.cpp | 80 +-- src/kernel/qpainter_x11.cpp | 24 +- src/kernel/qpalette.cpp | 8 +- src/kernel/qpicture.cpp | 34 +- src/kernel/qpixmap.cpp | 34 +- src/kernel/qpixmap_x11.cpp | 44 +- src/kernel/qpngio.cpp | 26 +- src/kernel/qpoint.cpp | 4 +- src/kernel/qpointarray.cpp | 16 +- src/kernel/qprinter.cpp | 4 +- src/kernel/qprinter_p.h | 2 +- src/kernel/qprinter_unix.cpp | 4 +- src/kernel/qprocess.cpp | 8 +- src/kernel/qprocess_unix.cpp | 8 +- src/kernel/qpsprinter.cpp | 24 +- src/kernel/qpsprinter_p.h | 4 +- src/kernel/qrect.cpp | 4 +- src/kernel/qregion.cpp | 4 +- src/kernel/qrichtext.cpp | 136 ++-- src/kernel/qrichtext_p.cpp | 14 +- src/kernel/qrichtext_p.h | 74 +- src/kernel/qscriptengine.cpp | 8 +- src/kernel/qscriptengine_x11.cpp | 42 +- src/kernel/qsignal.cpp | 18 +- src/kernel/qsignalmapper.cpp | 4 +- src/kernel/qsimplerichtext.cpp | 6 +- src/kernel/qsize.cpp | 4 +- src/kernel/qsizegrip.cpp | 6 +- src/kernel/qsound.cpp | 4 +- src/kernel/qsound_x11.cpp | 4 +- src/kernel/qstyle.cpp | 6 +- src/kernel/qstylesheet.cpp | 6 +- src/kernel/qt_gfx.pri | 6 +- src/kernel/qt_x11.pri | 16 +- src/kernel/qt_x11_p.h | 66 +- src/kernel/qtaddons_x11.cpp | 4 +- src/kernel/qucomextra.cpp | 2 +- src/kernel/qucomextra_p.h | 4 +- src/kernel/qurl.cpp | 4 +- src/kernel/qurlinfo.cpp | 4 +- src/kernel/qurloperator.cpp | 4 +- src/kernel/qvariant.cpp | 180 ++--- src/kernel/qwidget.cpp | 88 +-- src/kernel/qwidget_x11.cpp | 70 +- src/kernel/qwmatrix.cpp | 8 +- src/kernel/tqtkdeintegration_x11.cpp | 4 +- src/moc/moc.pro | 4 +- src/moc/moc.y | 20 +- src/moc/moc_yacc.cpp | 20 +- src/network/ntqdns.h | 4 +- src/network/ntqftp.h | 4 +- src/network/ntqhostaddress.h | 10 +- src/network/ntqhttp.h | 2 +- src/network/ntqnetwork.h | 2 +- src/network/ntqserversocket.h | 4 +- src/network/ntqsocket.h | 6 +- src/network/ntqsocketdevice.h | 4 +- src/network/qdns.cpp | 20 +- src/network/qftp.cpp | 10 +- src/network/qhostaddress.cpp | 8 +- src/network/qhttp.cpp | 2 +- src/network/qnetwork.cpp | 8 +- src/network/qserversocket.cpp | 4 +- src/network/qsocket.cpp | 16 +- src/network/qsocketdevice.cpp | 4 +- src/network/qsocketdevice_unix.cpp | 24 +- src/opengl/qgl.cpp | 2 +- src/opengl/qgl_x11.cpp | 4 +- src/qt.pro | 4 +- src/sql/drivers/cache/qsqlcachedresult.cpp | 4 +- src/sql/drivers/cache/qsqlcachedresult.h | 2 +- src/sql/ntqdatabrowser.h | 2 +- src/sql/ntqdatatable.h | 2 +- src/sql/ntqdataview.h | 2 +- src/sql/ntqeditorfactory.h | 4 +- src/sql/ntqsql.h | 2 +- src/sql/ntqsqlcursor.h | 4 +- src/sql/ntqsqldatabase.h | 4 +- src/sql/ntqsqldriver.h | 4 +- src/sql/ntqsqldriverplugin.h | 8 +- src/sql/ntqsqleditorfactory.h | 4 +- src/sql/ntqsqlerror.h | 4 +- src/sql/ntqsqlfield.h | 4 +- src/sql/ntqsqlform.h | 4 +- src/sql/ntqsqlindex.h | 4 +- src/sql/ntqsqlpropertymap.h | 4 +- src/sql/ntqsqlquery.h | 4 +- src/sql/ntqsqlrecord.h | 4 +- src/sql/ntqsqlresult.h | 4 +- src/sql/ntqsqlselectcursor.h | 4 +- src/sql/qdatabrowser.cpp | 2 +- src/sql/qdatatable.cpp | 22 +- src/sql/qdataview.cpp | 2 +- src/sql/qeditorfactory.cpp | 6 +- src/sql/qsqlcursor.cpp | 2 +- src/sql/qsqldatabase.cpp | 14 +- src/sql/qsqldriver.cpp | 4 +- src/sql/qsqldriverinterface_p.h | 8 +- src/sql/qsqldriverplugin.cpp | 8 +- src/sql/qsqleditorfactory.cpp | 6 +- src/sql/qsqlerror.cpp | 8 +- src/sql/qsqlextension_p.cpp | 2 +- src/sql/qsqlextension_p.h | 2 +- src/sql/qsqlfield.cpp | 2 +- src/sql/qsqlform.cpp | 4 +- src/sql/qsqlindex.cpp | 2 +- src/sql/qsqlmanager_p.cpp | 26 +- src/sql/qsqlmanager_p.h | 4 +- src/sql/qsqlpropertymap.cpp | 4 +- src/sql/qsqlquery.cpp | 4 +- src/sql/qsqlrecord.cpp | 2 +- src/sql/qsqlresult.cpp | 4 +- src/sql/qsqlselectcursor.cpp | 4 +- src/styles/ntqcdestyle.h | 4 +- src/styles/ntqcommonstyle.h | 4 +- src/styles/ntqcompactstyle.h | 4 +- src/styles/ntqinterlacestyle.h | 4 +- src/styles/ntqmotifplusstyle.h | 4 +- src/styles/ntqmotifstyle.h | 4 +- src/styles/ntqplatinumstyle.h | 4 +- src/styles/ntqsgistyle.h | 4 +- src/styles/ntqstylefactory.h | 6 +- src/styles/ntqstyleplugin.h | 8 +- src/styles/ntqwindowsstyle.h | 4 +- src/styles/qcdestyle.cpp | 4 +- src/styles/qcommonstyle.cpp | 144 ++-- src/styles/qcompactstyle.cpp | 2 +- src/styles/qinterlacestyle.cpp | 4 +- src/styles/qmotifplusstyle.cpp | 42 +- src/styles/qmotifstyle.cpp | 54 +- src/styles/qplatinumstyle.cpp | 18 +- src/styles/qsgistyle.cpp | 44 +- src/styles/qstylefactory.cpp | 66 +- src/styles/qstyleinterface_p.h | 8 +- src/styles/qstyleplugin.cpp | 8 +- src/styles/qt_styles.pri | 24 +- src/styles/qwindowsstyle.cpp | 42 +- src/table/ntqtable.h | 8 +- src/table/qtable.cpp | 18 +- src/tools/ntqbitarray.h | 2 +- src/tools/ntqcstring.h | 14 +- src/tools/ntqdatastream.h | 4 +- src/tools/ntqdatetime.h | 32 +- src/tools/ntqdir.h | 4 +- src/tools/ntqfeatures.h | 764 ++++++++++----------- src/tools/ntqfileinfo.h | 12 +- src/tools/ntqgdict.h | 4 +- src/tools/ntqglist.h | 6 +- src/tools/ntqglobal.h | 38 +- src/tools/ntqgvector.h | 6 +- src/tools/ntqlibrary.h | 4 +- src/tools/ntqmap.h | 4 +- src/tools/ntqpair.h | 2 +- src/tools/ntqregexp.h | 8 +- src/tools/ntqsettings.h | 4 +- src/tools/ntqstring.h | 70 +- src/tools/ntqstringlist.h | 14 +- src/tools/ntqstrlist.h | 2 +- src/tools/ntqstrvec.h | 2 +- src/tools/ntqtextstream.h | 6 +- src/tools/ntqtl.h | 4 +- src/tools/ntquuid.h | 4 +- src/tools/ntqvaluelist.h | 6 +- src/tools/ntqvaluevector.h | 4 +- src/tools/qbitarray.cpp | 4 +- src/tools/qcom_p.h | 4 +- src/tools/qcomlibrary.cpp | 4 +- src/tools/qcomlibrary_p.h | 4 +- src/tools/qcomponentfactory.cpp | 4 +- src/tools/qcomponentfactory_p.h | 4 +- src/tools/qconfig-large.h | 76 +- src/tools/qconfig-medium.h | 208 +++--- src/tools/qconfig-minimal.h | 170 ++--- src/tools/qconfig-small.h | 156 ++--- src/tools/qcstring.cpp | 18 +- src/tools/qdatastream.cpp | 4 +- src/tools/qdatetime.cpp | 54 +- src/tools/qdir.cpp | 4 +- src/tools/qdir_unix.cpp | 4 +- src/tools/qfileinfo.cpp | 10 +- src/tools/qfileinfo_unix.cpp | 2 +- src/tools/qgdict.cpp | 8 +- src/tools/qglist.cpp | 8 +- src/tools/qglobal.cpp | 4 +- src/tools/qgpluginmanager.cpp | 4 +- src/tools/qgpluginmanager_p.h | 2 +- src/tools/qgvector.cpp | 8 +- src/tools/qlibrary.cpp | 8 +- src/tools/qlibrary_p.h | 4 +- src/tools/qlibrary_unix.cpp | 2 +- src/tools/qpluginmanager_p.h | 4 +- src/tools/qregexp.cpp | 316 ++++----- src/tools/qsettings.cpp | 2 +- src/tools/qsettings_p.h | 4 +- src/tools/qstring.cpp | 78 +-- src/tools/qstringlist.cpp | 12 +- src/tools/qtextstream.cpp | 22 +- src/tools/qucom.cpp | 2 +- src/tools/qunicodetables.cpp | 8 +- src/tools/qunicodetables_p.h | 24 +- src/tools/quuid.cpp | 6 +- src/widgets/ntqaction.h | 8 +- src/widgets/ntqbutton.h | 6 +- src/widgets/ntqbuttongroup.h | 4 +- src/widgets/ntqcheckbox.h | 4 +- src/widgets/ntqcombobox.h | 6 +- src/widgets/ntqdatetimeedit.h | 2 +- src/widgets/ntqdial.h | 6 +- src/widgets/ntqdockarea.h | 6 +- src/widgets/ntqdockwindow.h | 4 +- src/widgets/ntqframe.h | 4 +- src/widgets/ntqgrid.h | 4 +- src/widgets/ntqgridview.h | 4 +- src/widgets/ntqgroupbox.h | 14 +- src/widgets/ntqhbox.h | 4 +- src/widgets/ntqhbuttongroup.h | 4 +- src/widgets/ntqheader.h | 4 +- src/widgets/ntqhgroupbox.h | 4 +- src/widgets/ntqiconview.h | 34 +- src/widgets/ntqlabel.h | 30 +- src/widgets/ntqlcdnumber.h | 4 +- src/widgets/ntqlineedit.h | 8 +- src/widgets/ntqlistbox.h | 4 +- src/widgets/ntqlistview.h | 10 +- src/widgets/ntqmainwindow.h | 20 +- src/widgets/ntqmenubar.h | 8 +- src/widgets/ntqmenudata.h | 12 +- src/widgets/ntqmultilineedit.h | 4 +- src/widgets/ntqpopupmenu.h | 10 +- src/widgets/ntqprogressbar.h | 4 +- src/widgets/ntqpushbutton.h | 12 +- src/widgets/ntqradiobutton.h | 4 +- src/widgets/ntqrangecontrol.h | 10 +- src/widgets/ntqscrollbar.h | 6 +- src/widgets/ntqscrollview.h | 20 +- src/widgets/ntqslider.h | 6 +- src/widgets/ntqspinbox.h | 6 +- src/widgets/ntqsplashscreen.h | 4 +- src/widgets/ntqsplitter.h | 6 +- src/widgets/ntqstatusbar.h | 4 +- src/widgets/ntqtabbar.h | 4 +- src/widgets/ntqtabwidget.h | 4 +- src/widgets/ntqtextbrowser.h | 4 +- src/widgets/ntqtextedit.h | 20 +- src/widgets/ntqtextview.h | 4 +- src/widgets/ntqtoolbar.h | 4 +- src/widgets/ntqtoolbox.h | 4 +- src/widgets/ntqtoolbutton.h | 10 +- src/widgets/ntqtooltip.h | 4 +- src/widgets/ntqvalidator.h | 8 +- src/widgets/ntqvbox.h | 4 +- src/widgets/ntqvbuttongroup.h | 4 +- src/widgets/ntqvgroupbox.h | 4 +- src/widgets/ntqwhatsthis.h | 4 +- src/widgets/ntqwidgetplugin.h | 4 +- src/widgets/ntqwidgetstack.h | 4 +- src/widgets/qaction.cpp | 58 +- src/widgets/qbutton.cpp | 34 +- src/widgets/qbuttongroup.cpp | 2 +- src/widgets/qcheckbox.cpp | 4 +- src/widgets/qcombobox.cpp | 8 +- src/widgets/qdatetimeedit.cpp | 4 +- src/widgets/qdial.cpp | 4 +- src/widgets/qdialogbuttons.cpp | 18 +- src/widgets/qdialogbuttons_p.h | 8 +- src/widgets/qdockarea.cpp | 6 +- src/widgets/qdockwindow.cpp | 20 +- src/widgets/qeffects.cpp | 8 +- src/widgets/qeffects_p.h | 4 +- src/widgets/qframe.cpp | 28 +- src/widgets/qgrid.cpp | 2 +- src/widgets/qgridview.cpp | 4 +- src/widgets/qgroupbox.cpp | 48 +- src/widgets/qhbox.cpp | 2 +- src/widgets/qhbuttongroup.cpp | 2 +- src/widgets/qheader.cpp | 10 +- src/widgets/qhgroupbox.cpp | 2 +- src/widgets/qiconview.cpp | 68 +- src/widgets/qlabel.cpp | 90 +-- src/widgets/qlcdnumber.cpp | 4 +- src/widgets/qlineedit.cpp | 70 +- src/widgets/qlistbox.cpp | 4 +- src/widgets/qlistview.cpp | 20 +- src/widgets/qmainwindow.cpp | 38 +- src/widgets/qmenubar.cpp | 34 +- src/widgets/qmenudata.cpp | 28 +- src/widgets/qmultilineedit.cpp | 2 +- src/widgets/qpopupmenu.cpp | 66 +- src/widgets/qprogressbar.cpp | 2 +- src/widgets/qpushbutton.cpp | 32 +- src/widgets/qradiobutton.cpp | 6 +- src/widgets/qrangecontrol.cpp | 2 +- src/widgets/qscrollbar.cpp | 8 +- src/widgets/qscrollview.cpp | 32 +- src/widgets/qslider.cpp | 4 +- src/widgets/qspinbox.cpp | 4 +- src/widgets/qspinwidget.cpp | 4 +- src/widgets/qsplashscreen.cpp | 4 +- src/widgets/qsplitter.cpp | 6 +- src/widgets/qstatusbar.cpp | 16 +- src/widgets/qsyntaxhighlighter.cpp | 2 +- src/widgets/qsyntaxhighlighter_p.h | 4 +- src/widgets/qtabbar.cpp | 28 +- src/widgets/qtabwidget.cpp | 2 +- src/widgets/qtextbrowser.cpp | 10 +- src/widgets/qtextedit.cpp | 136 ++-- src/widgets/qtextview.cpp | 2 +- src/widgets/qtitlebar.cpp | 28 +- src/widgets/qtitlebar_p.h | 4 +- src/widgets/qtoolbar.cpp | 10 +- src/widgets/qtoolbox.cpp | 4 +- src/widgets/qtoolbutton.cpp | 32 +- src/widgets/qtooltip.cpp | 4 +- src/widgets/qvalidator.cpp | 4 +- src/widgets/qvbox.cpp | 2 +- src/widgets/qvbuttongroup.cpp | 2 +- src/widgets/qvgroupbox.cpp | 2 +- src/widgets/qwhatsthis.cpp | 28 +- src/widgets/qwidgetinterface_p.h | 4 +- src/widgets/qwidgetplugin.cpp | 4 +- src/widgets/qwidgetresizehandler.cpp | 22 +- src/widgets/qwidgetresizehandler_p.h | 4 +- src/widgets/qwidgetstack.cpp | 6 +- src/workspace/ntqworkspace.h | 8 +- src/workspace/qworkspace.cpp | 58 +- src/xml/ntqdom.h | 4 +- src/xml/ntqxml.h | 4 +- src/xml/qdom.cpp | 4 +- src/xml/qsvgdevice.cpp | 10 +- src/xml/qsvgdevice_p.h | 4 +- src/xml/qxml.cpp | 4 +- tools/designer/designer/actiondnd.cpp | 2 +- tools/designer/designer/actiondnd.h | 2 +- tools/designer/designer/command.cpp | 16 +- tools/designer/designer/connectionitems.cpp | 2 +- tools/designer/designer/database.cpp | 2 +- tools/designer/designer/database.h | 2 +- tools/designer/designer/database2.h | 2 +- tools/designer/designer/dbconnectionimpl.cpp | 2 +- tools/designer/designer/dbconnectionsimpl.cpp | 6 +- tools/designer/designer/designerappiface.cpp | 4 +- tools/designer/designer/designerappiface.h | 2 +- tools/designer/designer/formwindow.cpp | 4 +- tools/designer/designer/hierarchyview.cpp | 8 +- tools/designer/designer/mainwindow.cpp | 2 +- tools/designer/designer/mainwindowactions.cpp | 6 +- tools/designer/designer/project.cpp | 44 +- tools/designer/designer/project.h | 12 +- tools/designer/designer/propertyeditor.cpp | 8 +- tools/designer/designer/resource.cpp | 10 +- tools/designer/designer/styledbutton.cpp | 6 +- tools/designer/designer/styledbutton.h | 4 +- tools/designer/designer/tableeditorimpl.cpp | 42 +- tools/designer/designer/widgetfactory.cpp | 26 +- tools/designer/plugins/wizards/main.cpp | 6 +- .../designer/plugins/wizards/sqlformwizardimpl.cpp | 6 +- tools/designer/shared/widgetdatabase.cpp | 8 +- tools/designer/uic/embed.cpp | 20 +- tools/designer/uilib/ntqwidgetfactory.h | 2 +- tools/designer/uilib/qwidgetfactory.cpp | 32 +- tools/qconfig/main.cpp | 6 +- tools/qtconfig/mainwindow.cpp | 4 +- tools/tqvfb/README | 4 +- tools/tqvfb/tqvfbview.cpp | 4 +- 834 files changed, 5324 insertions(+), 5324 deletions(-) diff --git a/ChangeLog.immodule b/ChangeLog.immodule index f4b9c9793..4bf083aa2 100644 --- a/ChangeLog.immodule +++ b/ChangeLog.immodule @@ -137,17 +137,17 @@ * src/input/ntqinputcontextfactory.h - Remove #include "ntqinputcontext.h" to reduce compilation dependency - Add 'class QWidget' declaration - - Remove inappropriate #ifndef QT_NO_STRINGLIST. QStringList is now + - Remove inappropriate #ifndef TQT_NO_STRINGLIST. QStringList is now required feature for immodule. See also changes of ntqfeatures.h * src/input/qinputcontextfactory.cpp - Add #include "ntqinputcontext.h" - Remove unnecessary #include "ntqpopupmenu.h" - - Remove inappropriate #ifndef QT_NO_STRINGLIST. QStringList is now + - Remove inappropriate #ifndef TQT_NO_STRINGLIST. QStringList is now required feature for immodule. See also changes of ntqfeatures.h * src/tools/ntqfeatures.h - - Define QT_NO_IM if QT_NO_STRINGLIST is defined - - Define QT_NO_IM_EXTENSIONS if QT_NO_IM or QT_NO_STRINGLIST is + - Define TQT_NO_IM if TQT_NO_STRINGLIST is defined + - Define TQT_NO_IM_EXTENSIONS if TQT_NO_IM or TQT_NO_STRINGLIST is defined * plugins/src/inputmethods/inputmethods.pro @@ -207,15 +207,15 @@ * src/kernel/qapplication_x11.cpp - (x11_apply_settings): - * Move immodule handling into #ifndef QT_NO_IM rather than QT_NO_XIM - * Move qtrc handling into #ifndef QT_NO_IM_EXTENSIONS + * Move immodule handling into #ifndef TQT_NO_IM rather than TQT_NO_XIM + * Move qtrc handling into #ifndef TQT_NO_IM_EXTENSIONS * src/inputmethods/imsw-multi/qmultiinputcontext.cpp - (QMultiInputContext): Move qtrc handling into #ifndef - QT_NO_IM_EXTENSIONS + TQT_NO_IM_EXTENSIONS * tools/qtconfig/mainwindow.cpp - - (MainWindow): Move qtrc handling into #ifndef QT_NO_IM_EXTENSIONS + - (MainWindow): Move qtrc handling into #ifndef TQT_NO_IM_EXTENSIONS * src/kernel/qt_x11.pri - Remove unnecessary configuration @@ -309,8 +309,8 @@ 2004-08-12 YamaKen * configure - - Fix incomplete qconfig configuratoin about QT_NO_IM and - QT_NO_IM_EXTENSIONS + - Fix incomplete qconfig configuratoin about TQT_NO_IM and + TQT_NO_IM_EXTENSIONS * src/kernel/qwidget_x11.cpp - (changeInputContext, createInputContext, destroyInputContext): Fix @@ -351,7 +351,7 @@ * This commit merges 'Binary Compatible branch' into the trunk to reduce maintenance cost. Now binary compatibility is configurable. Binary incompatible features are surrounded by - #ifndef QT_NO_IM_EXTENSIONS + #ifndef TQT_NO_IM_EXTENSIONS * configure - Add '-im' option to enable immodule feature (default yes). @@ -360,32 +360,32 @@ standard TQt3 * src/kernel/qt_x11.pri - - Add conditional QT_NO_IM and QT_NO_IM_EXTENSIONS definition in + - Add conditional TQT_NO_IM and TQT_NO_IM_EXTENSIONS definition in accordance with '-im' and '-im-ext' options * src/kernel/ntqwidget.h - - (icHolderWidget): New function for QT_NO_IM_EXTENSIONS - - (ic): Add #ifndef QT_NO_IM_EXTENSIONS for binary incompatible + - (icHolderWidget): New function for TQT_NO_IM_EXTENSIONS + - (ic): Add #ifndef TQT_NO_IM_EXTENSIONS for binary incompatible variable - - (xic): Add #ifdef QT_NO_IM_EXTENSIONS for binary compatible + - (xic): Add #ifdef TQT_NO_IM_EXTENSIONS for binary compatible variable * src/kernel/qwidget_x11.cpp - - (create): Add #ifndef QT_NO_IM_EXTENSIONS - - (destroy): Make some codes QT_NO_IM_EXTENSIONS independent - - (createTLSysExtra): Add a code fragment for QT_NO_IM_EXTENSIONS + - (create): Add #ifndef TQT_NO_IM_EXTENSIONS + - (destroy): Make some codes TQT_NO_IM_EXTENSIONS independent + - (createTLSysExtra): Add a code fragment for TQT_NO_IM_EXTENSIONS - (deleteTLSysExtra): Modify a comment - (getInputContext, changeInputContext, createInputContext, - destroyInputContext): Merge code fragments for QT_NO_IM_EXTENSIONS - - (deleteExtra): Merge a comment for QT_NO_IM_EXTENSIONS + destroyInputContext): Merge code fragments for TQT_NO_IM_EXTENSIONS + - (deleteExtra): Merge a comment for TQT_NO_IM_EXTENSIONS * src/kernel/ntqapplication.h - (locateICHolderWidget, icHolderWidgets, create_xim, close_xim): - New functions for QT_NO_IM_EXTENSIONS + New functions for TQT_NO_IM_EXTENSIONS * src/kernel/qapplication_x11.cpp - - (create_im, close_im): Add #ifndef QT_NO_IM_EXTENSIONS - - (create_xim, close_xim): Merge functions for QT_NO_IM_EXTENSIONS + - (create_im, close_im): Add #ifndef TQT_NO_IM_EXTENSIONS + - (create_xim, close_xim): Merge functions for TQT_NO_IM_EXTENSIONS - (tqt_init_internal, tqt_cleanup): Merge code fragments for - QT_NO_IM_EXTENSIONS + TQT_NO_IM_EXTENSIONS * plugins/src/inputmethods/inputmethods.pro - Make plugin compilations configurable with '-im' option @@ -992,18 +992,18 @@ postIMEvent() - (postIMEvent): New slot. Renamed from imEventReceived() * src/input/qmultiinputcontext.cpp - - (QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX): New macro. Defined as default - - (filterEvent): Insert #ifdef QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX + - (TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX): New macro. Defined as default + - (filterEvent): Insert #ifdef TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX - (destroyInputContext): New slot. Processes deletionRequested from slave - (imEventReceived): Remove this inappropriate name to rename to postIMEvent() - (postIMEvent): New slot. Renamed from imEventReceived() - (slave): * Add proper instanciation code for popup menu mode - * Insert #ifdef QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX + * Insert #ifdef TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX - (changeInputMethod(int)): * Add error handling for no available input methods - * Insert #ifdef QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX + * Insert #ifdef TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX - (changeInputMethod(QString)): * Add error handling for no available input methods * Add default selection for null key @@ -1220,7 +1220,7 @@ - (lastCreatedIMKey): new variable * src/input/qmultiinputcontext.cpp - - add #ifndef QT_NO_IM + - add #ifndef TQT_NO_IM - (createImSelPopup): create QPopupMenu object which can switch IM. Currently selected IM is marked as checked. diff --git a/configure b/configure index 3f89314b1..86b92f944 100755 --- a/configure +++ b/configure @@ -2489,19 +2489,19 @@ if [ -n "$CFG_QWS_DEPTHS" -a "$PLATFORM_QWS" = "yes" ]; then esac done if [ -z "$D4" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_DEPTH_4" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_QWS_DEPTH_4" fi if [ -z "$D8" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_DEPTH_8" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_QWS_DEPTH_8" fi if [ -z "$D16" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_DEPTH_16" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_QWS_DEPTH_16" fi if [ -z "$D24" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_DEPTH_24" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_QWS_DEPTH_24" fi if [ -z "$D32" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_QWS_DEPTH_32" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_QWS_DEPTH_32" fi fi @@ -2592,7 +2592,7 @@ else fi [ "$CFG_PRECOMPILE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG precompile_header" if [ "$CFG_IPV6" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IPV6" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_IPV6" else QMAKE_CONFIG="$QMAKE_CONFIG ipv6" fi @@ -2657,7 +2657,7 @@ if [ "x$PLATFORM_MAC" = "xyes" ]; then fi if [ "$CFG_ZLIB" = "no" ]; then QMAKE_CONFIG="$QMAKE_CONFIG no-zlib" - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_COMPRESS" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_COMPRESS" elif [ "$CFG_ZLIB" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG zlib" elif [ "$CFG_ZLIB" = "system" ]; then @@ -2708,12 +2708,12 @@ if [ "$PLATFORM_X11" = "yes" ]; then if [ "$CFG_IM" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG inputmethod" elif [ "$CFG_IM" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IM" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_IM" fi if [ "$CFG_IM_EXT" = "yes" ]; then QMAKE_CONFIG="$QMAKE_CONFIG inputmethod-ext" elif [ "$CFG_IM_EXT" = "no" ]; then - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_IM_EXTENSIONS" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_IM_EXTENSIONS" fi elif [ "$PLATFORM_MAC" = "yes" ]; then if [ "$CFG_TABLET" = "yes" ]; then @@ -3033,7 +3033,7 @@ STRIPPED=`echo $QMVAR | sed 's,^",,' | sed 's,"$,,'` if [ "$VSTYLE" = "yes" ]; then if [ "$VNO" = "yes" ]; then NOSTYLE=`echo $STRIPPED | tr '[:lower:]' '[:upper:]'` - QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_STYLE_$NOSTYLE" + QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_STYLE_$NOSTYLE" VSTYLE=no VNO=no else diff --git a/doc/debug.doc b/doc/debug.doc index a766b3810..a6a6dd89e 100644 --- a/doc/debug.doc +++ b/doc/debug.doc @@ -151,14 +151,14 @@ conditional, based on the state of various debugging flags: \row \i QT_CHECK_RANGE \i Check for variable range errors \row \i QT_CHECK_NULL \i Check for dangerous null pointers \row \i QT_CHECK_MATH \i Check for dangerous math, e.g. division by 0 -\row \i QT_NO_CHECK \i Turn off all QT_CHECK_... flags +\row \i TQT_NO_CHECK \i Turn off all QT_CHECK_... flags \row \i QT_DEBUG \i Enable debugging code -\row \i QT_NO_DEBUG \i Turn off QT_DEBUG flag +\row \i TQT_NO_DEBUG \i Turn off QT_DEBUG flag \endtable By default, both QT_DEBUG and all the QT_CHECK flags are on. To turn -off QT_DEBUG, define QT_NO_DEBUG. To turn off the QT_CHECK flags, -define QT_NO_CHECK. +off QT_DEBUG, define TQT_NO_DEBUG. To turn off the QT_CHECK flags, +define TQT_NO_CHECK. Example: \code diff --git a/doc/features.doc b/doc/features.doc index 6660e9fd9..c26d58a75 100644 --- a/doc/features.doc +++ b/doc/features.doc @@ -60,215 +60,215 @@ The available options are: \header \i Macro \i Disables \i Set automatically by \header \i31 Images (\l QImageIO) -\row \i QT_NO_IMAGEIO_BMP +\row \i TQT_NO_IMAGEIO_BMP \i Microsoft Bitmap image file format. \i   -\row \i QT_NO_IMAGEIO_PPM +\row \i TQT_NO_IMAGEIO_PPM \i Portable Pixmap image file format. \i   -\row \i QT_NO_IMAGEIO_XBM +\row \i TQT_NO_IMAGEIO_XBM \i X11 Bitmap image file format. \i   -\row \i QT_NO_IMAGEIO_XPM +\row \i TQT_NO_IMAGEIO_XPM \i X11 Pixmap image file format. \i   -\row \i QT_NO_IMAGEIO_PNG +\row \i TQT_NO_IMAGEIO_PNG \i Portable Network Graphics image file format. \i   \header \i31 Animation -\row \i QT_NO_ASYNC_IO +\row \i TQT_NO_ASYNC_IO \i Asynchronous I/O (\l QAsyncIO) \i   -\row \i QT_NO_ASYNC_IMAGE_IO +\row \i TQT_NO_ASYNC_IMAGE_IO \i Asynchronous Image I/O and GIF image support (\l QImageDecoder, ...) \i   -\row \i QT_NO_MOVIE +\row \i TQT_NO_MOVIE \i Animation support (\l QMovie) - \i QT_NO_ASYNC_IO, QT_NO_ASYNC_IMAGE_IO + \i TQT_NO_ASYNC_IO, TQT_NO_ASYNC_IMAGE_IO \header \i31 Fonts -\row \i QT_NO_TRUETYPE +\row \i TQT_NO_TRUETYPE \i TrueType (TTF and TTC) font file format, only used by Qt/Embedded. \i   -\row \i QT_NO_BDF +\row \i TQT_NO_BDF \i Bitmap Distribution Format (BDF) font file format, only used by Qt/Embedded. \i   -\row \i QT_NO_FONTDATABASE +\row \i TQT_NO_FONTDATABASE \i Font database. \i   \header \i31 Internationalization -\row \i QT_NO_I18N +\row \i TQT_NO_I18N \i Conversions between Unicode and 8-bit encodings. \i   -\row \i QT_NO_UNICODETABLES +\row \i TQT_NO_UNICODETABLES \i Large tables defining such things as upper and lowercase conversions for all Unicode characters. \i   \header \i31 MIME -\row \i QT_NO_MIME +\row \i TQT_NO_MIME \i Multipurpose Internet Mail Extensions, an Internet standard for encoding and tagging typed data (eg. text, images, colors) (\l QMimeSource) \i   -\row \i QT_NO_RICHTEXT +\row \i TQT_NO_RICHTEXT \i HTML-like text (\l QStyleSheet, \l QLabel) - \i QT_NO_MIME -\row \i QT_NO_DRAGANDDROP + \i TQT_NO_MIME +\row \i TQT_NO_DRAGANDDROP \i Drag-and-drop data between applications (\l QDragObject) - \i QT_NO_MIME -\row \i QT_NO_CLIPBOARD + \i TQT_NO_MIME +\row \i TQT_NO_CLIPBOARD \i Cut-and-paste data between applications (\l QClipboard) - \i QT_NO_MIME + \i TQT_NO_MIME \header \i31 Sound -\row \i QT_NO_SOUND +\row \i TQT_NO_SOUND \i Playing audio files (\l QSound) \i   \header \i31 Scripting -\row \i QT_NO_PROPERTIES +\row \i TQT_NO_PROPERTIES \i Scripting Qt-based applications. \i   \header \i31 Qt/Embedded-specific -\row \i QT_NO_QWS_CURSOR +\row \i TQT_NO_QWS_CURSOR \i The cursor sprite on Qt/Embedded. Pen-operated devices would not normally need this feature. \i   -\row \i QT_NO_QWS_DEPTH_8GRAYSCALE +\row \i TQT_NO_QWS_DEPTH_8GRAYSCALE \i11 8 bits per pixel: 256 levels of gray. Incompatible with QWS_DEPTH_8. \i   -\row \i QT_NO_QWS_DEPTH_8 +\row \i TQT_NO_QWS_DEPTH_8 \i11 8 bits per pixel: 216-color cube with 40 auxiliary colors. Incompatible with QWS_DEPTH_8GRAYSCALE. \i   -\row \i QT_NO_QWS_DEPTH_15 +\row \i TQT_NO_QWS_DEPTH_15 \i11 15 bits per pixel: 32 levels for each of red, green and blue. \i   -\row \i QT_NO_QWS_DEPTH_16 +\row \i TQT_NO_QWS_DEPTH_16 \i11 16 bits per pixel: 64 levels of green, 32 levels for red and for blue. \i   -\row \i QT_NO_QWS_DEPTH_32 +\row \i TQT_NO_QWS_DEPTH_32 \i11 32 bits per pixel: 256 levels for each of red, green and blue. \i   -\row \i QT_NO_QWS_MACH64 +\row \i TQT_NO_QWS_MACH64 \i Mach64 accelerated driver (demonstration only). \i   -\row \i QT_NO_QWS_VFB +\row \i TQT_NO_QWS_VFB \i Virtual framebuffer running on X11 (see reference documentation). \i   \header \i31 Networking -\row \i QT_NO_NETWORKPROTOCOL +\row \i TQT_NO_NETWORKPROTOCOL \i Abstract multi-protocol data retrieval, with local file retrieval included (\l QNetworkProtocol) \i   -\row \i QT_NO_NETWORKPROTOCOL_FTP +\row \i TQT_NO_NETWORKPROTOCOL_FTP \i FTP-protocol data retrieval. - \i QT_NO_NETWORKPROTOCOL -\row \i QT_NO_NETWORKPROTOCOL_HTTP + \i TQT_NO_NETWORKPROTOCOL +\row \i TQT_NO_NETWORKPROTOCOL_HTTP \i HTTP-protocol data retrieval. - \i QT_NO_NETWORKPROTOCOL + \i TQT_NO_NETWORKPROTOCOL \header \i31 Painting/drawing -\row \i QT_NO_COLORNAMES +\row \i TQT_NO_COLORNAMES \i Color names such as "red", used by some \l QColor constructors and by some HTML documents (\l QColor, \l QStyleSheet) \i   -\row \i QT_NO_TRANSFORMATIONS +\row \i TQT_NO_TRANSFORMATIONS \i Used by a number of classes in Qt. With this, rotation and scaling are possible. Without it you can only do coordinate translation (\l QWMatrix) \i   -\row \i QT_NO_PSPRINTER +\row \i TQT_NO_PSPRINTER \i PostScript printer support. \i   -\row \i QT_NO_PRINTER +\row \i TQT_NO_PRINTER \i Printer support (\l QPrinter) - \i QT_NO_PSPRINTER (Unix only) -\row \i QT_NO_PICTURE + \i TQT_NO_PSPRINTER (Unix only) +\row \i TQT_NO_PICTURE \i Save TQt drawing commands to a files (\l QPicture) \i   \header \i31 Widgets -\row \i QT_NO_WIDGETS +\row \i TQT_NO_WIDGETS \i Disabling this disables all widgets except \l QWidget. \i   -\row \i QT_NO_TEXTVIEW +\row \i TQT_NO_TEXTVIEW \i HTML document viewing (\l QTextView) - \i QT_NO_WIDGETS, QT_NO_RICHTEXT -\row \i QT_NO_TEXTBROWSER + \i TQT_NO_WIDGETS, TQT_NO_RICHTEXT +\row \i TQT_NO_TEXTBROWSER \i HTML document browsing (\l QTextBrowser) - \i QT_NO_TEXTVIEW -\row \i QT_NO_ICONVIEW + \i TQT_NO_TEXTVIEW +\row \i TQT_NO_ICONVIEW \i Labelled icons (\l QIconView) - \i QT_NO_WIDGETS, QT_NO_DRAGANDDROP -\row \i QT_NO_LISTVIEW + \i TQT_NO_WIDGETS, TQT_NO_DRAGANDDROP +\row \i TQT_NO_LISTVIEW \i Lists of information (\l QListView) - \i QT_NO_WIDGETS -\row \i QT_NO_CANVAS + \i TQT_NO_WIDGETS +\row \i TQT_NO_CANVAS \i Object canvas (\l QCanvas) - \i QT_NO_WIDGETS -\row \i QT_NO_DIAL + \i TQT_NO_WIDGETS +\row \i TQT_NO_DIAL \i Value control (\l QDial) - \i QT_NO_WIDGETS -\row \i QT_NO_WORKSPACE + \i TQT_NO_WIDGETS +\row \i TQT_NO_WORKSPACE \i MDI (Multiple Document Interface) (\l QWorkspace) - \i QT_NO_WIDGETS -\row \i QT_NO_LCDNUMBER + \i TQT_NO_WIDGETS +\row \i TQT_NO_LCDNUMBER \i LCD-like number display (\l QLCDNumber) - \i QT_NO_WIDGETS + \i TQT_NO_WIDGETS \header \i31 GUI Styles -\row \i QT_NO_STYLE_WINDOWS +\row \i TQT_NO_STYLE_WINDOWS \i Microsoft Windows style (\l QWindowsStyle) - \i QT_NO_WIDGETS -\row \i QT_NO_STYLE_MOTIF + \i TQT_NO_WIDGETS +\row \i TQT_NO_STYLE_MOTIF \i OSF Motif style (\l QMotifStyle) - \i QT_NO_WIDGETS -\row \i QT_NO_STYLE_CDE + \i TQT_NO_WIDGETS +\row \i TQT_NO_STYLE_CDE \i Open Group CDE style (\l QCDEStyle) - \i QT_NO_STYLE_MOTIF -\row \i QT_NO_STYLE_AQUA + \i TQT_NO_STYLE_MOTIF +\row \i TQT_NO_STYLE_AQUA \i MacOS X style (\l QAquaStyle) -\row \i QT_NO_STYLE_PLATINUM +\row \i TQT_NO_STYLE_PLATINUM \i MacOS 9 style (\l QPlatinumStyle) - \i QT_NO_WIDGETS -\row \i QT_NO_STYLE_SGI + \i TQT_NO_WIDGETS +\row \i TQT_NO_STYLE_SGI \i SGI style (\l QSGIStyle) - \i QT_NO_STYLE_MOTIF + \i TQT_NO_STYLE_MOTIF \header \i31 Dialogs -\row \i QT_NO_DIALOGS +\row \i TQT_NO_DIALOGS \i Disabling this disables all common dialogs \l QWidget. - \i QT_NO_WIDGETS -\row \i QT_NO_FILEDIALOG + \i TQT_NO_WIDGETS +\row \i TQT_NO_FILEDIALOG \i The file selection dialog (\l QFileDialog) - \i QT_NO_DIALOGS, QT_NO_NETWORKPROTOCOL, QT_NO_LISTVIEW -\row \i QT_NO_FONTDIALOG + \i TQT_NO_DIALOGS, TQT_NO_NETWORKPROTOCOL, TQT_NO_LISTVIEW +\row \i TQT_NO_FONTDIALOG \i The font selection dialog (\l QFontDialog) - \i QT_NO_DIALOGS, QT_NO_FONTDATABASE -\row \i QT_NO_COLORDIALOG + \i TQT_NO_DIALOGS, TQT_NO_FONTDATABASE +\row \i TQT_NO_COLORDIALOG \i The color selection dialog (\l QColorDialog) - \i QT_NO_DIALOGS -\row \i QT_NO_INPUTDIALOG + \i TQT_NO_DIALOGS +\row \i TQT_NO_INPUTDIALOG \i Text input dialog (\l QInputDialog) - \i QT_NO_DIALOGS -\row \i QT_NO_MESSAGEBOX + \i TQT_NO_DIALOGS +\row \i TQT_NO_MESSAGEBOX \i Message/prompting dialog (\l QMessageBox) - \i QT_NO_DIALOGS -\row \i QT_NO_PROGRESSDIALOG + \i TQT_NO_DIALOGS +\row \i TQT_NO_PROGRESSDIALOG \i Long-computation progress dialog (\l QProgressDialog) - \i QT_NO_DIALOGS -\row \i QT_NO_TABDIALOG + \i TQT_NO_DIALOGS +\row \i TQT_NO_TABDIALOG \i Tabbed-pages dialog (\l QTabDialog) - \i QT_NO_DIALOGS -\row \i QT_NO_WIZARD + \i TQT_NO_DIALOGS +\row \i TQT_NO_WIZARD \i Multi-step dialog (\l QWizard) - \i QT_NO_DIALOGS + \i TQT_NO_DIALOGS \endtable */ diff --git a/doc/html/canvas-example.html b/doc/html/canvas-example.html index ab874cfcd..2c36c44a3 100644 --- a/doc/html/canvas-example.html +++ b/doc/html/canvas-example.html @@ -824,7 +824,7 @@ void Main::addMesh() int rows = h / dist; int cols = w / dist; -#ifndef QT_NO_PROGRESSDIALOG +#ifndef TQT_NO_PROGRESSDIALOG TQProgressDialog progress( "Creating mesh...", "Abort", rows, this, "progress", TRUE ); #endif @@ -858,13 +858,13 @@ void Main::addMesh() el->show(); } lastRow[n-1]=prev; -#ifndef QT_NO_PROGRESSDIALOG +#ifndef TQT_NO_PROGRESSDIALOG progress.setProgress( j ); if ( progress.wasCancelled() ) break; #endif } -#ifndef QT_NO_PROGRESSDIALOG +#ifndef TQT_NO_PROGRESSDIALOG progress.setProgress( rows ); #endif // tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() ); diff --git a/doc/html/debug.html b/doc/html/debug.html index 0747921ea..ccbecfb12 100644 --- a/doc/html/debug.html +++ b/doc/html/debug.html @@ -128,13 +128,13 @@ conditional, based on the state of various debugging flags: QT_CHECK_RANGE Check for variable range errors QT_CHECK_NULL Check for dangerous null pointers QT_CHECK_MATH Check for dangerous math, e.g. division by 0 - QT_NO_CHECK Turn off all QT_CHECK_... flags + TQT_NO_CHECK Turn off all QT_CHECK_... flags QT_DEBUG Enable debugging code - QT_NO_DEBUG Turn off QT_DEBUG flag + TQT_NO_DEBUG Turn off QT_DEBUG flag

By default, both QT_DEBUG and all the QT_CHECK flags are on. To turn -off QT_DEBUG, define QT_NO_DEBUG. To turn off the QT_CHECK flags, -define QT_NO_CHECK. +off QT_DEBUG, define TQT_NO_DEBUG. To turn off the QT_CHECK flags, +define TQT_NO_CHECK.

Example: 

   void f( char *p, int i )
diff --git a/doc/html/drawdemo-example.html b/doc/html/drawdemo-example.html
index 07f2c1126..9019f9efa 100644
--- a/doc/html/drawdemo-example.html
+++ b/doc/html/drawdemo-example.html
@@ -251,7 +251,7 @@ private:
 // If -- at compile time -- printer support will be disabled,
 // we won't set up printing functionality.
 
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
 
     printer = new TQPrinter;
 
@@ -274,7 +274,7 @@ private:
 //
 DrawView::~DrawView()
 {
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
     delete printer;
 #endif
 }
diff --git a/doc/html/drawlines-example.html b/doc/html/drawlines-example.html
index 2f96f4562..c41b5349c 100644
--- a/doc/html/drawlines-example.html
+++ b/doc/html/drawlines-example.html
@@ -165,7 +165,7 @@ int main( int argc, char **argv )
 {
     TQApplication a( argc, argv );
     ConnectWidget connect;
-#ifndef QT_NO_WIDGET_TOPEXTRA   // for TQt/Embedded minimal build
+#ifndef TQT_NO_WIDGET_TOPEXTRA   // for TQt/Embedded minimal build
     connect.setCaption( "TQt Example - Draw lines");
 #endif
     a.setMainWidget( &connect );
diff --git a/doc/html/emb-features.html b/doc/html/emb-features.html
index 622c93654..ba76e2ec8 100644
--- a/doc/html/emb-features.html
+++ b/doc/html/emb-features.html
@@ -47,203 +47,203 @@ dependencies are expressed in ntqfeatures.h.
 
 

 
 Macro Disables Set automatically by
 
  Images (TQImageIO)
-
 QT_NO_IMAGEIO_BMP
+
 TQT_NO_IMAGEIO_BMP
 Microsoft Bitmap image file format.
  
-
 QT_NO_IMAGEIO_PPM
+
 TQT_NO_IMAGEIO_PPM
 Portable Pixmap image file format.
  
-
 QT_NO_IMAGEIO_XBM
+
 TQT_NO_IMAGEIO_XBM
 X11 Bitmap image file format.
  
-
 QT_NO_IMAGEIO_XPM
+
 TQT_NO_IMAGEIO_XPM
 X11 Pixmap image file format.
  
-
 QT_NO_IMAGEIO_PNG
+
 TQT_NO_IMAGEIO_PNG
 Portable Network Graphics image file format.
  
 
  Animation
-
 QT_NO_ASYNC_IO
+
 TQT_NO_ASYNC_IO
 Asynchronous I/O (TQAsyncIO)
  
-
 QT_NO_ASYNC_IMAGE_IO
+
 TQT_NO_ASYNC_IMAGE_IO
 Asynchronous Image I/O and GIF image support (TQImageDecoder, ...)
  
-
 QT_NO_MOVIE
+
 TQT_NO_MOVIE
 Animation support (TQMovie)
-QT_NO_ASYNC_IO, QT_NO_ASYNC_IMAGE_IO
+TQT_NO_ASYNC_IO, TQT_NO_ASYNC_IMAGE_IO
 
  Fonts
-
 QT_NO_TRUETYPE
+
 TQT_NO_TRUETYPE
 TrueType (TTF and TTC) font file format, only used by TQt/Embedded.
  
-
 QT_NO_BDF
+
 TQT_NO_BDF
 Bitmap Distribution Format (BDF) font file format, only used by TQt/Embedded.
  
-
 QT_NO_FONTDATABASE
+
 TQT_NO_FONTDATABASE
 Font database.
  
 
  Internationalization
-
 QT_NO_I18N
+
 TQT_NO_I18N
 Conversions between Unicode and 8-bit encodings.
  
-
 QT_NO_UNICODETABLES
+
 TQT_NO_UNICODETABLES
 Large tables defining such things as upper and lowercase conversions
 for all Unicode characters.
  
 
  MIME
-
 QT_NO_MIME
+
 TQT_NO_MIME
 Multipurpose Internet Mail Extensions, an Internet standard for encoding
 and tagging typed data (eg. text, images, colors) (TQMimeSource)
  
-
 QT_NO_RICHTEXT
+
 TQT_NO_RICHTEXT
 HTML-like text (TQStyleSheet, TQLabel)
-QT_NO_MIME
-
 QT_NO_DRAGANDDROP
+TQT_NO_MIME
+
 TQT_NO_DRAGANDDROP
 Drag-and-drop data between applications (TQDragObject)
-QT_NO_MIME
-
 QT_NO_CLIPBOARD
+TQT_NO_MIME
+
 TQT_NO_CLIPBOARD
 Cut-and-paste data between applications (TQClipboard)
-QT_NO_MIME
+TQT_NO_MIME
 
  Sound
-
 QT_NO_SOUND
+
 TQT_NO_SOUND
 Playing audio files (TQSound)
  
 
  Scripting
-
 QT_NO_PROPERTIES
+
 TQT_NO_PROPERTIES
 Scripting TQt-based applications.
  
 
  TQt/Embedded-specific
-
 QT_NO_QWS_CURSOR
+
 TQT_NO_QWS_CURSOR
 The cursor sprite on TQt/Embedded. Pen-operated devices would not
 normally need this feature.
  
-
 QT_NO_QWS_DEPTH_8GRAYSCALE
+
 TQT_NO_QWS_DEPTH_8GRAYSCALE
  8 bits per pixel: 256 levels of gray.
 Incompatible with TQWS_DEPTH_8.
  
-
 QT_NO_QWS_DEPTH_8
+
 TQT_NO_QWS_DEPTH_8
  8 bits per pixel: 216-color cube with 40 auxiliary colors.
 Incompatible with TQWS_DEPTH_8GRAYSCALE.
  
-
 QT_NO_QWS_DEPTH_15
+
 TQT_NO_QWS_DEPTH_15
  15 bits per pixel: 32 levels for each of red, green and blue.
  
-
 QT_NO_QWS_DEPTH_16
+
 TQT_NO_QWS_DEPTH_16
  16 bits per pixel: 64 levels of green, 32 levels for red and for blue.
  
-
 QT_NO_QWS_DEPTH_32
+
 TQT_NO_QWS_DEPTH_32
  32 bits per pixel: 256 levels for each of red, green and blue.
  
-
 QT_NO_QWS_MACH64
+
 TQT_NO_QWS_MACH64
 Mach64 accelerated driver (demonstration only).
  
-
 QT_NO_QWS_VFB
+
 TQT_NO_QWS_VFB
 Virtual framebuffer running on X11 (see reference documentation).
  
 
  Networking
-
 QT_NO_NETWORKPROTOCOL
+
 TQT_NO_NETWORKPROTOCOL
 Abstract multi-protocol data retrieval,
 with local file retrieval included (TQNetworkProtocol)
  
-
 QT_NO_NETWORKPROTOCOL_FTP
+
 TQT_NO_NETWORKPROTOCOL_FTP
 FTP-protocol data retrieval.
-QT_NO_NETWORKPROTOCOL
-
 QT_NO_NETWORKPROTOCOL_HTTP
+TQT_NO_NETWORKPROTOCOL
+
 TQT_NO_NETWORKPROTOCOL_HTTP
 HTTP-protocol data retrieval.
-QT_NO_NETWORKPROTOCOL
+TQT_NO_NETWORKPROTOCOL
 
  Painting/drawing
-
 QT_NO_COLORNAMES
+
 TQT_NO_COLORNAMES
 Color names such as "red", used by some TQColor constructors
 and by some HTML documents (TQColor, TQStyleSheet)
  
-
 QT_NO_TRANSFORMATIONS
+
 TQT_NO_TRANSFORMATIONS
 Used by a number of classes in TQt. With this, rotation and
 scaling are possible. Without it you can only do coordinate
 translation (TQWMatrix)
  
-
 QT_NO_PSPRINTER
+
 TQT_NO_PSPRINTER
 PostScript printer support.
  
-
 QT_NO_PRINTER
+
 TQT_NO_PRINTER
 Printer support (TQPrinter)
-QT_NO_PSPRINTER (Unix only)
-
 QT_NO_PICTURE
+TQT_NO_PSPRINTER (Unix only)
+
 TQT_NO_PICTURE
 Save TQt drawing commands to a files (TQPicture)
  
 
  Widgets
-
 QT_NO_WIDGETS
+
 TQT_NO_WIDGETS
 Disabling this disables all widgets except TQWidget.
  
-
 QT_NO_TEXTVIEW
+
 TQT_NO_TEXTVIEW
 HTML document viewing (TQTextView)
-QT_NO_WIDGETS, QT_NO_RICHTEXT
-
 QT_NO_TEXTBROWSER
+TQT_NO_WIDGETS, TQT_NO_RICHTEXT
+
 TQT_NO_TEXTBROWSER
 HTML document browsing (TQTextBrowser)
-QT_NO_TEXTVIEW
-
 QT_NO_ICONVIEW
+TQT_NO_TEXTVIEW
+
 TQT_NO_ICONVIEW
 Labelled icons (TQIconView)
-QT_NO_WIDGETS, QT_NO_DRAGANDDROP
-
 QT_NO_LISTVIEW
+TQT_NO_WIDGETS, TQT_NO_DRAGANDDROP
+
 TQT_NO_LISTVIEW
 Lists of information (TQListView)
-QT_NO_WIDGETS
-
 QT_NO_CANVAS
+TQT_NO_WIDGETS
+
 TQT_NO_CANVAS
 Object canvas (TQCanvas)
-QT_NO_WIDGETS
-
 QT_NO_DIAL
+TQT_NO_WIDGETS
+
 TQT_NO_DIAL
 Value control (TQDial)
-QT_NO_WIDGETS
-
 QT_NO_WORKSPACE
+TQT_NO_WIDGETS
+
 TQT_NO_WORKSPACE
 MDI (Multiple Document Interface) (TQWorkspace)
-QT_NO_WIDGETS
-
 QT_NO_LCDNUMBER
+TQT_NO_WIDGETS
+
 TQT_NO_LCDNUMBER
 LCD-like number display (TQLCDNumber)
-QT_NO_WIDGETS
+TQT_NO_WIDGETS
 
  GUI Styles
-
 QT_NO_STYLE_WINDOWS
+
 TQT_NO_STYLE_WINDOWS
 Microsoft Windows style (TQWindowsStyle)
-QT_NO_WIDGETS
-
 QT_NO_STYLE_MOTIF
+TQT_NO_WIDGETS
+
 TQT_NO_STYLE_MOTIF
 OSF Motif style (TQMotifStyle)
-QT_NO_WIDGETS
-
 QT_NO_STYLE_CDE
+TQT_NO_WIDGETS
+
 TQT_NO_STYLE_CDE
 Open Group CDE style (TQCDEStyle)
-QT_NO_STYLE_MOTIF
-
 QT_NO_STYLE_AQUA
+TQT_NO_STYLE_MOTIF
+
 TQT_NO_STYLE_AQUA
 MacOS X style (TQAquaStyle)
-
 QT_NO_STYLE_PLATINUM
+
 TQT_NO_STYLE_PLATINUM
 MacOS 9 style (TQPlatinumStyle)
-QT_NO_WIDGETS
-
 QT_NO_STYLE_SGI
+TQT_NO_WIDGETS
+
 TQT_NO_STYLE_SGI
 SGI style (TQSGIStyle)
-QT_NO_STYLE_MOTIF
+TQT_NO_STYLE_MOTIF
 
  Dialogs
-
 QT_NO_DIALOGS
+
 TQT_NO_DIALOGS
 Disabling this disables all common dialogs TQWidget.
-QT_NO_WIDGETS
-
 QT_NO_FILEDIALOG
+TQT_NO_WIDGETS
+
 TQT_NO_FILEDIALOG
 The file selection dialog (TQFileDialog)
-QT_NO_DIALOGS, QT_NO_NETWORKPROTOCOL, QT_NO_LISTVIEW
-
 QT_NO_FONTDIALOG
+TQT_NO_DIALOGS, TQT_NO_NETWORKPROTOCOL, TQT_NO_LISTVIEW
+
 TQT_NO_FONTDIALOG
 The font selection dialog (TQFontDialog)
-QT_NO_DIALOGS, QT_NO_FONTDATABASE
-
 QT_NO_COLORDIALOG
+TQT_NO_DIALOGS, TQT_NO_FONTDATABASE
+
 TQT_NO_COLORDIALOG
 The color selection dialog (TQColorDialog)
-QT_NO_DIALOGS
-
 QT_NO_INPUTDIALOG
+TQT_NO_DIALOGS
+
 TQT_NO_INPUTDIALOG
 Text input dialog (TQInputDialog)
-QT_NO_DIALOGS
-
 QT_NO_MESSAGEBOX
+TQT_NO_DIALOGS
+
 TQT_NO_MESSAGEBOX
 Message/prompting dialog (TQMessageBox)
-QT_NO_DIALOGS
-
 QT_NO_PROGRESSDIALOG
+TQT_NO_DIALOGS
+
 TQT_NO_PROGRESSDIALOG
 Long-computation progress dialog (TQProgressDialog)
-QT_NO_DIALOGS
-
 QT_NO_TABDIALOG
+TQT_NO_DIALOGS
+
 TQT_NO_TABDIALOG
 Tabbed-pages dialog (TQTabDialog)
-QT_NO_DIALOGS
-
 QT_NO_WIZARD
+TQT_NO_DIALOGS
+
 TQT_NO_WIZARD
 Multi-step dialog (TQWizard)
-QT_NO_DIALOGS
+TQT_NO_DIALOGS
 

 
 
 
diff --git a/doc/html/hello-example.html b/doc/html/hello-example.html
index 2d20c3128..0cb176c57 100644
--- a/doc/html/hello-example.html
+++ b/doc/html/hello-example.html
@@ -212,7 +212,7 @@ int main( int argc, char **argv )
     if ( s.isEmpty() )
         s = "Hello, World";
     Hello h( s );
-#ifndef QT_NO_WIDGET_TOPEXTRA   // for TQt/Embedded minimal build
+#ifndef TQT_NO_WIDGET_TOPEXTRA   // for TQt/Embedded minimal build
     h.setCaption( "TQt says hello" );
 #endif
     TQObject::connect( &h, SIGNAL(clicked()), &a, SLOT(quit()) );
diff --git a/doc/html/helpviewer-example.html b/doc/html/helpviewer-example.html
index 190056972..33bed5d9b 100644
--- a/doc/html/helpviewer-example.html
+++ b/doc/html/helpviewer-example.html
@@ -326,7 +326,7 @@ void HelpWindow::aboutTQt()
 
 void HelpWindow::openFile()
 {
-#ifndef QT_NO_FILEDIALOG
+#ifndef TQT_NO_FILEDIALOG
     TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this );
     if ( !fn.isEmpty() )
         browser->setSource( fn );
@@ -340,7 +340,7 @@ void HelpWindow::newWindow()
 
 void HelpWindow::print()
 {
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
     TQPrinter printer( TQPrinter::HighResolution );
     printer.setFullPage(TRUE);
     if ( printer.setup( this ) ) {
diff --git a/doc/html/i18n.html b/doc/html/i18n.html
index 99e2894c8..9f74d1154 100644
--- a/doc/html/i18n.html
+++ b/doc/html/i18n.html
@@ -246,7 +246,7 @@ The macros expand to just the text (without the context).

If you disable the const char* to TQString automatic conversion -by compiling your software with the macro QT_NO_CAST_ASCII +by compiling your software with the macro TQT_NO_CAST_ASCII defined, you'll be very likely to catch any strings you are missing. See TQString::fromLatin1() for more information. Disabling the conversion can make programming a bit cumbersome. diff --git a/doc/html/mdi-example.html b/doc/html/mdi-example.html index 94cf3aafe..50684724d 100644 --- a/doc/html/mdi-example.html +++ b/doc/html/mdi-example.html @@ -195,7 +195,7 @@ const char * filePrintText = "Click this button to print the file you " = new TQToolButton( saveIcon, "Save File", TQString::null, this, SLOT(save()), fileTools, "save file" ); -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER printer = new TQPrinter( TQPrinter::HighResolution ); TQPixmap printIcon; @@ -225,7 +225,7 @@ const char * filePrintText = "Click this button to print the file you " file->setWhatsThis( id, fileSaveText ); id = file->insertItem( "Save &As...", this, SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER file->insertSeparator(); id = file->insertItem( printIcon, "&Print...", this, SLOT(print()), CTRL+Key_P ); @@ -262,7 +262,7 @@ const char * filePrintText = "Click this button to print the file you " ApplicationWindow::~ApplicationWindow() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER delete printer; #endif } @@ -312,7 +312,7 @@ void ApplicationWindow::saveAs() void ApplicationWindow::print() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER MDIWindow* m = (MDIWindow*)ws->activeWindow(); if ( m ) m->print( printer ); @@ -520,7 +520,7 @@ void MDIWindow::saveAs() void MDIWindow::print( TQPrinter* printer) { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER int pageNo = 1; if ( printer->setup(this) ) { // printer dialog diff --git a/doc/html/ntqapplication.html b/doc/html/ntqapplication.html index 4577524a8..f8e7cad9a 100644 --- a/doc/html/ntqapplication.html +++ b/doc/html/ntqapplication.html @@ -400,7 +400,7 @@ can also be accessed later with tqApp->argc() and tqApp->argv The documentation for argv() contains a detailed description of how to process command line arguments.

TQt debugging options (not available if TQt was compiled with the -QT_NO_DEBUG flag defined): +TQT_NO_DEBUG flag defined):

  • -nograb, tells TQt that it must never grab the mouse or the keyboard.
  • -dograb (only under X11), running under a debugger can cause @@ -1996,7 +1996,7 @@ computer is truly weird (i.e. different endianness for 16 bit and error message. When code is -1 (the default), the system's last error code will be used if possible. Use this method to handle failures in platform specific API calls. -

    This function does nothing when TQt is built with QT_NO_DEBUG +

    This function does nothing when TQt is built with TQT_NO_DEBUG defined.

    const char * tqVersion () diff --git a/doc/html/ntqstring.html b/doc/html/ntqstring.html index e8605bc65..06533f222 100644 --- a/doc/html/ntqstring.html +++ b/doc/html/ntqstring.html @@ -380,7 +380,7 @@ you change it using TQTextCodec:

    If str is 0, then a null string is created.

    This is a cast constructor, but it is perfectly safe: converting a Latin-1 const char * to TQString preserves all the information. You -can disable this constructor by defining QT_NO_CAST_ASCII when +can disable this constructor by defining TQT_NO_CAST_ASCII when you compile your applications. You can also make TQString objects by using setLatin1(), fromLatin1(), fromLocal8Bit(), and fromUtf8(). Or whatever encoding is appropriate for the 8-bit data @@ -928,7 +928,7 @@ it is used to convert the string from 8-bit characters to Unicode. Otherwise, this function does the same as fromLatin1().

    This is the same as the TQString(const char*) constructor, but you can make that constructor invisible if you compile with the define -QT_NO_CAST_ASCII, in which case you can explicitly create a +TQT_NO_CAST_ASCII, in which case you can explicitly create a TQString from 8-bit ASCII text using this function. 

             TQString str = TQString::fromAscii( "123456789", 5 );
diff --git a/doc/html/porting.html b/doc/html/porting.html
index 58d1a0598..19f45c3e7 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -210,8 +210,8 @@ error messages on the UNIX console or the Windows debugging stream that were
 previously disabled, please check these macro variables:
 
     
      
 
    •  DEBUG becomes QT_DEBUG
-
    •  NO_DEBUG becomes QT_NO_DEBUG
-
    •  NO_CHECK becomes QT_NO_CHECK
+
    •  NO_DEBUG becomes TQT_NO_DEBUG
+
    •  NO_CHECK becomes TQT_NO_CHECK
 
    •  CHECK_STATE becomes QT_CHECK_STATE
 
    •  CHECK_RANGE becomes QT_CHECK_RANGE
 
    •  CHECK_NULL becomes QT_CHECK_NULL
diff --git a/doc/html/porting2.html b/doc/html/porting2.html
index a41f4b4dd..f53af35de 100644
--- a/doc/html/porting2.html
+++ b/doc/html/porting2.html
@@ -213,9 +213,9 @@ This change has been made to avoid collisions with other namespaces.
 
       
       The GCF global typedef is removed (it was not used in TQt).
 
       
      Debug vs. Release
      
 
       
      The Q_ASSERT macro is now a null expression if the QT_CHECK_STATE flag
-is not set (i.e. if the QT_NO_CHECK flag is defined).
+is not set (i.e. if the TQT_NO_CHECK flag is defined).
 
       
      The debug() function now outputs nothing if TQt was compiled with
-the QT_NO_DEBUG macro defined.
+the TQT_NO_DEBUG macro defined.
 
       
      TQString
      
 
       TQString has undergone major changes internally, and although it is highly
 backward compatible, it is worth studying in detail when porting to TQt 2.x.
diff --git a/doc/html/qaccel-h.html b/doc/html/qaccel-h.html
index 001e2a479..04df7eed4 100644
--- a/doc/html/qaccel-h.html
+++ b/doc/html/qaccel-h.html
@@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
 #include "ntqkeysequence.h"
 #endif // QT_H
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 class TQAccelPrivate;
 
@@ -142,7 +142,7 @@ private:
     friend class TQAccelManager;
 };
 
-#endif // QT_NO_ACCEL
+#endif // TQT_NO_ACCEL
 #endif // TQACCEL_H
    diff --git a/doc/html/qaction-h.html b/doc/html/qaction-h.html index 7d02afa73..11a06f9e4 100644 --- a/doc/html/qaction-h.html +++ b/doc/html/qaction-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #include "ntqkeysequence.h" #endif // QT_H -#ifndef QT_NO_ACTION +#ifndef TQT_NO_ACTION class TQActionPrivate; class TQActionGroupPrivate; @@ -104,14 +104,14 @@ class Q_EXPORT TQAction : public TQObject TQ_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip ) TQ_PROPERTY( TQString statusTip READ statusTip WRITE setStatusTip ) TQ_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis ) -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQ_PROPERTY( TQKeySequence accel READ accel WRITE setAccel ) #endif TQ_PROPERTY( bool visible READ isVisible WRITE setVisible ) public: TQAction( TQObject* parent, const char* name = 0 ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAction( const TQString& menuText, TQKeySequence accel, TQObject* parent, const char* name = 0 ); TQAction( const TQIconSet& icon, const TQString& menuText, TQKeySequence accel, @@ -137,7 +137,7 @@ public: TQString statusTip() const; virtual void setWhatsThis( const TQString& ); TQString whatsThis() const; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL virtual void setAccel( const TQKeySequence& key ); TQKeySequence accel() const; #endif diff --git a/doc/html/qapplication-h.html b/doc/html/qapplication-h.html index b812dfbbc..0b0844967 100644 --- a/doc/html/qapplication-h.html +++ b/doc/html/qapplication-h.html @@ -123,7 +123,7 @@ public: Type type() const; -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE static TQStyle &style(); static void setStyle( TQStyle* ); static TQStyle* setStyle( const TQString& ); @@ -137,14 +137,14 @@ public: enum ColorSpec { NormalColor=0, CustomColor=1, ManyColor=2 }; static int colorSpec(); static void setColorSpec( int ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR static TQCursor *overrideCursor(); static void setOverrideCursor( const TQCursor &, bool replace=FALSE ); static void restoreOverrideCursor(); #endif static bool hasGlobalMouseTracking(); static void setGlobalMouseTracking( bool enable ); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE static TQPalette palette( const TQWidget* = 0 ); static void setPalette( const TQPalette &, bool informWidgets=FALSE, const char* className = 0 ); @@ -165,7 +165,7 @@ public: static TQWidget *activePopupWidget(); static TQWidget *activeModalWidget(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD static TQClipboard *clipboard(); #endif TQWidget *focusWidget() const; @@ -205,7 +205,7 @@ public: static void beep(); #ifndef TQT_NO_TRANSLATION -# ifndef QT_NO_TEXTCODEC +# ifndef TQT_NO_TEXTCODEC void setDefaultCodec( TQTextCodec * ); TQTextCodec* defaultCodec() const; # endif @@ -217,11 +217,11 @@ public: const char * key, const char * comment = 0, Encoding encoding = DefaultCodec ) const; -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQString applicationDirPath(); TQString applicationFilePath(); #endif -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE // obsolete functions static void setWinStyleHighlightColor( const TQColor &c ) { TQPalette p( palette() ); @@ -240,19 +240,19 @@ public: static void setDoubleClickInterval( int ); static int doubleClickInterval(); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT static void setWheelScrollLines( int ); static int wheelScrollLines(); #endif static void setGlobalStrut( const TQSize & ); static TQSize globalStrut(); -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT static void setLibraryPaths( const TQStringList & ); static TQStringList libraryPaths(); static void addLibraryPath( const TQString & ); static void removeLibraryPath( const TQString & ); -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT static void setStartDragTime( int ms ); static int startDragTime(); static void setStartDragDistance( int l ); @@ -286,7 +286,7 @@ public: Returns true if the process is GUI server */ bool qwsIsGUIServer(); -#ifndef QT_NO_QWS_MANAGER +#ifndef TQT_NO_QWS_MANAGER static TQWSDecoration &qwsDecoration(); static void qwsSetDecoration( TQWSDecoration *); #endif @@ -302,7 +302,7 @@ public: static void winMouseButtonUp(); #endif -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER // session management bool isSessionRestored() const; TQString sessionId() const; @@ -377,11 +377,11 @@ private: int quit_code; static TQStyle *app_style; static int app_cspec; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE static TQPalette *app_pal; #endif static TQFont *app_font; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR static TQCursor *app_cursor; #endif static TQEventLoop* eventloop; @@ -410,18 +410,18 @@ private: static bool metaComposeUnicode; TQValueList<TQTranslator*> *translators; -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER TQSessionManager *session_manager; TQString session_id; static TQString* session_key; bool is_session_restored; #endif -#if defined(Q_WS_X11) && !defined (QT_NO_STYLE ) +#if defined(Q_WS_X11) && !defined (TQT_NO_STYLE ) static void x11_initialize_style(); #endif static TQSize app_strut; -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT static TQStringList *app_libpaths; #endif static TQAsciiDict<TQPalette> *app_palettes; @@ -475,7 +475,7 @@ inline void TQApplication::setArgs(int c, char **v) } #endif -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR inline TQCursor *TQApplication::overrideCursor() { return app_cursor; @@ -510,7 +510,7 @@ inline bool TQApplication::inPopupMode() const { return popupWidgets != 0; } -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER inline bool TQApplication::isSessionRestored() const { return is_session_restored; @@ -542,7 +542,7 @@ inline bool TQApplication::sendSpontaneousEvent( TQObject *receiver, TQEvent *ev inline TQString TQApplication::translate( const char *, const char *sourceText, const char *, Encoding encoding ) const { -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC if ( encoding == UnicodeUTF8 ) return TQString::fromUtf8( sourceText ); else diff --git a/doc/html/qasyncimageio-h.html b/doc/html/qasyncimageio-h.html index 99783715f..9c76aa4e4 100644 --- a/doc/html/qasyncimageio-h.html +++ b/doc/html/qasyncimageio-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqimage.h" #endif // QT_H -#ifndef QT_NO_ASYNC_IMAGE_IO +#ifndef TQT_NO_ASYNC_IMAGE_IO #if __GNUC__ - 0 > 3 #pragma GCC system_header @@ -142,7 +142,7 @@ private: TQImageDecoderPrivate *d; }; -#endif // QT_NO_ASYNC_IMAGE_IO +#endif // TQT_NO_ASYNC_IMAGE_IO #endif // TQASYNCIMAGEIO_H diff --git a/doc/html/qasyncio-h.html b/doc/html/qasyncio-h.html index 627fae60e..845733896 100644 --- a/doc/html/qasyncio-h.html +++ b/doc/html/qasyncio-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqtimer.h" #endif // QT_H -#ifndef QT_NO_ASYNC_IO +#ifndef TQT_NO_ASYNC_IO class TQIODevice; @@ -151,7 +151,7 @@ private slots: void tryToPump(); }; -#endif // QT_NO_ASYNC_IO +#endif // TQT_NO_ASYNC_IO #endif diff --git a/doc/html/qaxbase-h.html b/doc/html/qaxbase-h.html index a03cd20f3..d1a91eda7 100644 --- a/doc/html/qaxbase-h.html +++ b/doc/html/qaxbase-h.html @@ -172,7 +172,7 @@ inline TQString TQAxBase::generateDocumentation() return qax_generateDocumentation(this, d); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM inline TQDataStream &operator >>( TQDataStream &s, TQAxBase &c ) { TQAxBase::PropertyBag bag; @@ -195,7 +195,7 @@ inline TQDataStream &operator <<( TQDataStream &s, const TQAxBase return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM #endif // TQAXBASE_H diff --git a/doc/html/qbig5codec-h.html b/doc/html/qbig5codec-h.html index 1e299b39c..1ca433ad7 100644 --- a/doc/html/qbig5codec-h.html +++ b/doc/html/qbig5codec-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS class TQBig5Codec : public TQTextCodec { public: diff --git a/doc/html/qbitarray-h.html b/doc/html/qbitarray-h.html index b87c63dd0..2b4af25b1 100644 --- a/doc/html/qbitarray-h.html +++ b/doc/html/qbitarray-h.html @@ -197,7 +197,7 @@ inline TQBitVal &TQBitVal::operator=( bool v ) /***************************************************************************** TQBitArray stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBitArray & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBitArray & ); #endif diff --git a/doc/html/qbitmap-h.html b/doc/html/qbitmap-h.html index 10a5ff58d..5aa3054ae 100644 --- a/doc/html/qbitmap-h.html +++ b/doc/html/qbitmap-h.html @@ -93,14 +93,14 @@ public: TQBitmap( int w, int h, const uchar *bits, bool isXbitmap=FALSE ); TQBitmap( const TQSize &, const uchar *bits, bool isXbitmap=FALSE ); TQBitmap( const TQBitmap & ); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQBitmap( const TQString &fileName, const char *format=0 ); #endif TQBitmap &operator=( const TQBitmap & ); TQBitmap &operator=( const TQPixmap & ); TQBitmap &operator=( const TQImage & ); -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION TQBitmap xForm( const TQWMatrix & ) const; #endif }; diff --git a/doc/html/qbrush-h.html b/doc/html/qbrush-h.html index 7b143b8c0..a960503bc 100644 --- a/doc/html/qbrush-h.html +++ b/doc/html/qbrush-h.html @@ -122,7 +122,7 @@ private: TQBrush stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & ); #endif diff --git a/doc/html/qbutton-h.html b/doc/html/qbutton-h.html index b649ab2f8..280669f0c 100644 --- a/doc/html/qbutton-h.html +++ b/doc/html/qbutton-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqkeysequence.h" #endif // QT_H -#ifndef QT_NO_BUTTON +#ifndef TQT_NO_BUTTON class TQButtonGroup; @@ -114,7 +114,7 @@ public: const TQPixmap *pixmap() const; virtual void setPixmap( const TQPixmap & ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence accel() const; virtual void setAccel( const TQKeySequence& ); #endif @@ -265,7 +265,7 @@ inline TQButton::ToggleType TQButton::toggleType() const } -#endif // QT_NO_BUTTON +#endif // TQT_NO_BUTTON #endif // TQBUTTON_H diff --git a/doc/html/qbuttongroup-h.html b/doc/html/qbuttongroup-h.html index 007a33d16..0c5e2c913 100644 --- a/doc/html/qbuttongroup-h.html +++ b/doc/html/qbuttongroup-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqgroupbox.h" #endif // QT_H -#ifndef QT_NO_BUTTONGROUP +#ifndef TQT_NO_BUTTONGROUP class TQButton; @@ -152,7 +152,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_BUTTONGROUP +#endif // TQT_NO_BUTTONGROUP #endif // TQBUTTONGROUP_H diff --git a/doc/html/qcanvas-h.html b/doc/html/qcanvas-h.html index 61dfb38a5..61a641b1d 100644 --- a/doc/html/qcanvas-h.html +++ b/doc/html/qcanvas-h.html @@ -95,7 +95,7 @@ body { background: #ffffff; color: black; } #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN #endif -#ifndef QT_NO_CANVAS +#ifndef TQT_NO_CANVAS class TQCanvasSprite; @@ -439,7 +439,7 @@ private: class TQM_EXPORT_CANVAS TQCanvasPixmap : public TQPixmap { public: -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQCanvasPixmap(const TQString& datafilename); #endif TQCanvasPixmap(const TQImage& image); @@ -474,7 +474,7 @@ class TQM_EXPORT_CANVAS TQCanvasPixmapArray { public: TQCanvasPixmapArray(); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQCanvasPixmapArray(const TQString& datafilenamepattern, int framecount=0); #endif // this form is deprecated @@ -483,7 +483,7 @@ public: TQCanvasPixmapArray(TQValueList<TQPixmap>, TQPointArray hotspots = TQPointArray() ); ~TQCanvasPixmapArray(); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool readPixmaps(const TQString& datafilenamepattern, int framecount=0); bool readCollisionMasks(const TQString& filenamepattern); #endif @@ -503,7 +503,7 @@ private: TQCanvasPixmapArray( const TQCanvasPixmapArray & ); TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & ); #endif -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool readPixmaps(const TQString& datafilenamepattern, int framecount, bool maskonly); #endif @@ -847,7 +847,7 @@ private: #define Q_DEFINED_QCANVAS #include "ntqwinexport.h" -#endif // QT_NO_CANVAS +#endif // TQT_NO_CANVAS #endif // TQCANVAS_H diff --git a/doc/html/qcdestyle-h.html b/doc/html/qcdestyle-h.html index 87eb3f3b4..fe453f3ee 100644 --- a/doc/html/qcdestyle-h.html +++ b/doc/html/qcdestyle-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqmotifstyle.h" #endif // QT_H -#if !defined(QT_NO_STYLE_CDE) || defined(QT_PLUGIN) +#if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_CDE @@ -117,7 +117,7 @@ public: }; -#endif // QT_NO_STYLE_CDE +#endif // TQT_NO_STYLE_CDE #endif // TQCDESTYLE_H diff --git a/doc/html/qcheckbox-h.html b/doc/html/qcheckbox-h.html index 74d2dadb6..81697bb9d 100644 --- a/doc/html/qcheckbox-h.html +++ b/doc/html/qcheckbox-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqbutton.h" #endif // QT_H -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX class Q_EXPORT TQCheckBox : public TQButton { @@ -127,7 +127,7 @@ inline void TQCheckBox::setChecked( bool check ) { setOn( check ); } -#endif // QT_NO_CHECKBOX +#endif // TQT_NO_CHECKBOX #endif // TQCHECKBOX_H diff --git a/doc/html/qclipboard-h.html b/doc/html/qclipboard-h.html index 5f87a2d04..af842b501 100644 --- a/doc/html/qclipboard-h.html +++ b/doc/html/qclipboard-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD class TQMimeSource; @@ -111,7 +111,7 @@ public: TQString text( TQCString& subtype, Mode mode ) const; void setText( const TQString &, Mode mode ); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQMimeSource *data( Mode mode ) const; void setData( TQMimeSource*, Mode mode ); @@ -126,7 +126,7 @@ public: TQString text(TQCString& subtype) const; void setText( const TQString &); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQMimeSource *data() const; void setData( TQMimeSource* ); @@ -165,7 +165,7 @@ private: #endif }; -#endif // QT_NO_CLIPBOARD +#endif // TQT_NO_CLIPBOARD #endif // TQCLIPBOARD_H diff --git a/doc/html/qcolor-h.html b/doc/html/qcolor-h.html index 4dd1737ed..ad23b063f 100644 --- a/doc/html/qcolor-h.html +++ b/doc/html/qcolor-h.html @@ -176,7 +176,7 @@ public: static void initialize(); static void cleanup(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQStringList colorNames(); #endif enum { Dirt = 0x44495254, Invalid = 0x49000000 }; @@ -257,7 +257,7 @@ inline bool TQColor::operator!=( const TQColor &c ) const TQColor stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColor & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQColor & ); #endif diff --git a/doc/html/qcolordialog-h.html b/doc/html/qcolordialog-h.html index 6705512f5..281efdaad 100644 --- a/doc/html/qcolordialog-h.html +++ b/doc/html/qcolordialog-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_COLORDIALOG +#ifndef TQT_NO_COLORDIALOG class TQColorDialogPrivate; diff --git a/doc/html/qcombobox-h.html b/doc/html/qcombobox-h.html index d12e22b0a..411a8da15 100644 --- a/doc/html/qcombobox-h.html +++ b/doc/html/qcombobox-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_COMBOBOX +#ifndef TQT_NO_COMBOBOX class TQStrList; @@ -212,7 +212,7 @@ protected: void keyPressEvent( TQKeyEvent *e ); void focusInEvent( TQFocusEvent *e ); void focusOutEvent( TQFocusEvent *e ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent *e ); #endif void styleChange( TQStyle& ); @@ -237,7 +237,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_COMBOBOX +#endif // TQT_NO_COMBOBOX #endif // TQCOMBOBOX_H diff --git a/doc/html/qcommonstyle-h.html b/doc/html/qcommonstyle-h.html index 8b9a0efaf..e09eba727 100644 --- a/doc/html/qcommonstyle-h.html +++ b/doc/html/qcommonstyle-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqstyle.h" #endif // QT_H -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE class Q_EXPORT TQCommonStyle: public TQStyle { @@ -168,7 +168,7 @@ private: -#endif // QT_NO_STYLE +#endif // TQT_NO_STYLE #endif // TQCOMMONSTYLE_H diff --git a/doc/html/qcopchannel_qws-h.html b/doc/html/qcopchannel_qws-h.html index 1c89d100a..91bfe142e 100644 --- a/doc/html/qcopchannel_qws-h.html +++ b/doc/html/qcopchannel_qws-h.html @@ -79,7 +79,7 @@ body { background: #ffffff; color: black; } #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_COP +#ifndef TQT_NO_COP class TQWSClient; class TQCopChannelPrivate; diff --git a/doc/html/qcstring-h.html b/doc/html/qcstring-h.html index d7980c3b9..18c29b776 100644 --- a/doc/html/qcstring-h.html +++ b/doc/html/qcstring-h.html @@ -141,7 +141,7 @@ public: typedef TQMemArray<char> TQByteArray; #endif -#ifndef QT_NO_COMPRESS +#ifndef TQT_NO_COMPRESS Q_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes ); Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes ); Q_EXPORT inline TQByteArray tqCompress( const TQByteArray& data) @@ -153,7 +153,7 @@ Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data ) /***************************************************************************** TQByteArray stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQByteArray & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & ); #endif @@ -190,17 +190,17 @@ public: int find( char c, int index=0, bool cs=TRUE ) const; int find( const char *str, int index=0, bool cs=TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int find( const TQRegExp &, int index=0 ) const; #endif int findRev( char c, int index=-1, bool cs=TRUE) const; int findRev( const char *str, int index=-1, bool cs=TRUE) const; -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE int findRev( const TQRegExp &, int index=-1 ) const; #endif int contains( char c, bool cs=TRUE ) const; int contains( const char *str, bool cs=TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int contains( const TQRegExp & ) const; #endif TQCString left( uint len ) const; @@ -222,7 +222,7 @@ public: TQCString &prepend( const char * ); TQCString &remove( uint index, uint len ); TQCString &replace( uint index, uint len, const char * ); -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP TQCString &replace( const TQRegExp &, const char * ); #endif TQCString &replace( char c, const char *after ); @@ -261,7 +261,7 @@ private: /***************************************************************************** TQCString stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCString & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCString & ); #endif diff --git a/doc/html/qcursor-h.html b/doc/html/qcursor-h.html index 848d624bf..05263a1da 100644 --- a/doc/html/qcursor-h.html +++ b/doc/html/qcursor-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } /* ### The fake cursor has to go first with old qdoc. */ -#ifdef QT_NO_CURSOR +#ifdef TQT_NO_CURSOR class Q_EXPORT TQCursor : public TQt { @@ -97,9 +97,9 @@ private: TQCursor(); }; -#endif // QT_NO_CURSOR +#endif // TQT_NO_CURSOR -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR struct TQCursorData; @@ -161,11 +161,11 @@ private: /***************************************************************************** TQCursor stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCursor & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCursor & ); #endif -#endif // QT_NO_CURSOR +#endif // TQT_NO_CURSOR inline void TQCursor::setPos( const TQPoint &p ) diff --git a/doc/html/qdatabrowser-h.html b/doc/html/qdatabrowser-h.html index db85474b5..779b2cda6 100644 --- a/doc/html/qdatabrowser-h.html +++ b/doc/html/qdatabrowser-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #include "ntqsqlerror.h" #endif // QT_H -#ifndef QT_NO_SQL_VIEW_WIDGETS +#ifndef TQT_NO_SQL_VIEW_WIDGETS class TQSqlForm; class TQDataBrowserPrivate; diff --git a/doc/html/qdatastream-h.html b/doc/html/qdatastream-h.html index 4043590e2..f8f5f20c2 100644 --- a/doc/html/qdatastream-h.html +++ b/doc/html/qdatastream-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM class Q_EXPORT TQDataStream // data stream class { public: @@ -225,7 +225,7 @@ inline TQDataStream &TQDataStream::operator<<( TQ_ULONG i ) { return *this << (TQ_LONG)i; } #endif -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM #endif // TQDATASTREAM_H diff --git a/doc/html/qdatatable-h.html b/doc/html/qdatatable-h.html index 529bd79c2..d53e4f3e0 100644 --- a/doc/html/qdatatable-h.html +++ b/doc/html/qdatatable-h.html @@ -93,7 +93,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_VIEW_WIDGETS +#ifndef TQT_NO_SQL_VIEW_WIDGETS class TQPainter; class TQSqlField; diff --git a/doc/html/qdataview-h.html b/doc/html/qdataview-h.html index 41d895c84..1ac5c535e 100644 --- a/doc/html/qdataview-h.html +++ b/doc/html/qdataview-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_VIEW_WIDGETS +#ifndef TQT_NO_SQL_VIEW_WIDGETS class TQSqlForm; class TQSqlRecord; diff --git a/doc/html/qdatetime-h.html b/doc/html/qdatetime-h.html index 5874cac41..3a91305da 100644 --- a/doc/html/qdatetime-h.html +++ b/doc/html/qdatetime-h.html @@ -105,7 +105,7 @@ public: int daysInYear() const; int weekNumber( int *yearNum = 0 ) const; -#ifndef QT_NO_TEXTDATE +#ifndef TQT_NO_TEXTDATE #ifndef TQT_NO_COMPAT static TQString monthName( int month ) { return shortMonthName( month ); } static TQString dayName( int weekday ) { return shortDayName( weekday ); } @@ -114,9 +114,9 @@ public: static TQString shortDayName( int weekday ); static TQString longMonthName( int month ); static TQString longDayName( int weekday ); -#endif //QT_NO_TEXTDATE -#ifndef QT_NO_TEXTSTRING -#if !defined(QT_NO_SPRINTF) +#endif //TQT_NO_TEXTDATE +#ifndef TQT_NO_TEXTSTRING +#if !defined(TQT_NO_SPRINTF) TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; @@ -137,7 +137,7 @@ public: static TQDate currentDate(); static TQDate currentDate( TQt::TimeSpec ); -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING static TQDate fromString( const TQString& s, TQt::DateFormat f = TQt::TextDate ); #endif static bool isValid( int y, int m, int d ); @@ -148,7 +148,7 @@ public: private: uint jd; friend class TQDateTime; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); #endif @@ -172,8 +172,8 @@ public: int minute() const; // 0..59 int second() const; // 0..59 int msec() const; // 0..999 -#ifndef QT_NO_DATESTRING -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_DATESTRING +#ifndef TQT_NO_SPRINTF TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; @@ -194,7 +194,7 @@ public: static TQTime currentTime(); static TQTime currentTime( TQt::TimeSpec ); -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING static TQTime fromString( const TQString& s, TQt::DateFormat f = TQt::TextDate ); #endif static bool isValid( int h, int m, int s, int ms=0 ); @@ -209,7 +209,7 @@ private: uint ds; friend class TQDateTime; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); #endif @@ -237,8 +237,8 @@ public: void setTime( const TQTime &time ) { t = time; } void setTime_t( uint secsSince1Jan1970UTC ); void setTime_t( uint secsSince1Jan1970UTC, TQt::TimeSpec ); -#ifndef QT_NO_DATESTRING -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_DATESTRING +#ifndef TQT_NO_SPRINTF TQString toString( TQt::DateFormat f = TQt::TextDate ) const; #endif TQString toString( const TQString& format ) const; @@ -259,13 +259,13 @@ public: static TQDateTime currentDateTime(); static TQDateTime currentDateTime( TQt::TimeSpec ); -#ifndef QT_NO_DATESTRING +#ifndef TQT_NO_DATESTRING static TQDateTime fromString( const TQString& s, TQt::DateFormat f = TQt::TextDate ); #endif private: TQDate d; TQTime t; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime &); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); #endif @@ -276,14 +276,14 @@ private: Date and time stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & ); Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & ); Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & ); -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM #endif // TQDATETIME_H diff --git a/doc/html/qdatetimeedit-h.html b/doc/html/qdatetimeedit-h.html index b72f5ab69..25799f4ec 100644 --- a/doc/html/qdatetimeedit-h.html +++ b/doc/html/qdatetimeedit-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqdatetime.h" #endif // QT_H -#ifndef QT_NO_DATETIMEEDIT +#ifndef TQT_NO_DATETIMEEDIT class Q_EXPORT TQDateTimeEditBase : public TQWidget { diff --git a/doc/html/qdial-h.html b/doc/html/qdial-h.html index 2244359b7..584a11277 100644 --- a/doc/html/qdial-h.html +++ b/doc/html/qdial-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqrangecontrol.h" #endif // QT_H -#ifndef QT_NO_DIAL +#ifndef TQT_NO_DIAL class TQDialPrivate; @@ -155,7 +155,7 @@ protected: void mousePressEvent( TQMouseEvent * ); void mouseReleaseEvent( TQMouseEvent * ); void mouseMoveEvent( TQMouseEvent * ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void focusInEvent( TQFocusEvent * ); @@ -184,7 +184,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_DIAL +#endif // TQT_NO_DIAL #endif diff --git a/doc/html/qdialog-h.html b/doc/html/qdialog-h.html index a49649ff9..185b3d0f9 100644 --- a/doc/html/qdialog-h.html +++ b/doc/html/qdialog-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #ifndef QT_H #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_DIALOG +#ifndef TQT_NO_DIALOG #if 0 TQ_OBJECT #endif @@ -173,7 +173,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_DIALOG +#endif // TQT_NO_DIALOG #endif // TQDIALOG_H diff --git a/doc/html/qdir-h.html b/doc/html/qdir-h.html index 25f1cff5b..f497d7558 100644 --- a/doc/html/qdir-h.html +++ b/doc/html/qdir-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR typedef TQPtrList<TQFileInfo> TQFileInfoList; typedef TQPtrListIterator<TQFileInfo> TQFileInfoListIterator; class TQStringList; @@ -282,7 +282,7 @@ struct TQDirSortItem { TQFileInfo* item; }; -#endif // QT_NO_DIR +#endif // TQT_NO_DIR #endif // TQDIR_H diff --git a/doc/html/qdirectpainter_qws-h.html b/doc/html/qdirectpainter_qws-h.html index 415442460..78ac7bdf9 100644 --- a/doc/html/qdirectpainter_qws-h.html +++ b/doc/html/qdirectpainter_qws-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #endif // QT_H #ifdef Q_WS_QWS -#ifndef QT_NO_DIRECTPAINTER +#ifndef TQT_NO_DIRECTPAINTER class Q_EXPORT TQDirectPainter : public TQPainter { public: TQDirectPainter( const TQWidget* ); diff --git a/doc/html/qdns-h.html b/doc/html/qdns-h.html index 4110a2381..bbde601d4 100644 --- a/doc/html/qdns-h.html +++ b/doc/html/qdns-h.html @@ -90,7 +90,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_DNS Q_EXPORT #endif -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS //#define Q_DNS_SYNCHRONOUS @@ -201,7 +201,7 @@ private slots: virtual void answer(); }; -#endif // QT_NO_DNS +#endif // TQT_NO_DNS #endif // TQDNS_H diff --git a/doc/html/qdockarea-h.html b/doc/html/qdockarea-h.html index 8921c786d..45e5622e3 100644 --- a/doc/html/qdockarea-h.html +++ b/doc/html/qdockarea-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #include "ntqtextstream.h" #endif // QT_H -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW class TQSplitter; class TQBoxLayout; @@ -215,7 +215,7 @@ private: // Disabled copy constructor and operator= }; -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQDockArea & ); Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & ); #endif @@ -224,7 +224,7 @@ Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & #include "ntqwinexport.h" #endif -#endif //QT_NO_MAINWINDOW +#endif //TQT_NO_MAINWINDOW

    diff --git a/doc/html/qdockwindow-h.html b/doc/html/qdockwindow-h.html index 40b54fc16..601799854 100644 --- a/doc/html/qdockwindow-h.html +++ b/doc/html/qdockwindow-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW class TQDockWindowHandle; class TQDockWindowTitleBar; @@ -179,7 +179,7 @@ public: bool eventFilter( TQObject *o, TQEvent *e ); -#ifdef QT_NO_WIDGET_TOPEXTRA +#ifdef TQT_NO_WIDGET_TOPEXTRA TQString caption() const; #endif diff --git a/doc/html/qdom-h.html b/doc/html/qdom-h.html index 042117edf..65167c05e 100644 --- a/doc/html/qdom-h.html +++ b/doc/html/qdom-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_DOM Q_EXPORT #endif -#ifndef QT_NO_DOM +#ifndef TQT_NO_DOM class TQIODevice; class TQTextStream; @@ -709,7 +709,7 @@ private: TQM_EXPORT_DOM TQTextStream& operator<<( TQTextStream&, const TQDomNode& ); -#endif //QT_NO_DOM +#endif //TQT_NO_DOM #endif // TQDOM_H diff --git a/doc/html/qdragobject-h.html b/doc/html/qdragobject-h.html index 9d7292bf6..7be03edad 100644 --- a/doc/html/qdragobject-h.html +++ b/doc/html/qdragobject-h.html @@ -88,7 +88,7 @@ class TQImageDragData; #include "ntqcolor.h" #endif // QT_H -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME class Q_EXPORT TQDragObject: public TQObject, public TQMimeSource { TQ_OBJECT @@ -96,7 +96,7 @@ public: TQDragObject( TQWidget * dragSource = 0, const char * name = 0 ); virtual ~TQDragObject(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP bool drag(); bool dragMove(); void dragCopy(); @@ -113,7 +113,7 @@ public: static void setTarget(TQWidget*); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP enum DragMode { DragDefault, DragCopy, DragMove, DragLink, DragCopyOrMove }; protected: @@ -256,7 +256,7 @@ private: typedef TQUriDrag TQUrlDrag; #endif -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP // TQDragManager is not part of the public API. It is defined in a // header file simply so different .cpp files can implement different @@ -309,7 +309,7 @@ private: #endif -#endif // QT_NO_MIME +#endif // TQT_NO_MIME #endif // TQDRAGOBJECT_H diff --git a/doc/html/qdrawutil-h.html b/doc/html/qdrawutil-h.html index 67d8a68f1..f5e4d4487 100644 --- a/doc/html/qdrawutil-h.html +++ b/doc/html/qdrawutil-h.html @@ -89,7 +89,7 @@ class TQBrush; class TQRect; class TQPixmap; -#ifndef QT_NO_DRAWUTIL +#ifndef TQT_NO_DRAWUTIL // // Standard shade drawing // @@ -160,7 +160,7 @@ Q_EXPORT void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style int x, int y, int w, int h, const TQColorGroup &g, bool enabled ); -#endif // QT_NO_DRAWUTIL +#endif // TQT_NO_DRAWUTIL #endif // TQDRAWUTIL_H diff --git a/doc/html/qeditorfactory-h.html b/doc/html/qeditorfactory-h.html index 46bc09534..5492f2303 100644 --- a/doc/html/qeditorfactory-h.html +++ b/doc/html/qeditorfactory-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_EDIT_WIDGETS +#ifndef TQT_NO_SQL_EDIT_WIDGETS class TQM_EXPORT_SQL TQEditorFactory : public TQObject { @@ -107,7 +107,7 @@ private: #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif // TQEDITORFACTORY_H diff --git a/doc/html/qerrormessage-h.html b/doc/html/qerrormessage-h.html index 8e9bb12aa..3905a72f9 100644 --- a/doc/html/qerrormessage-h.html +++ b/doc/html/qerrormessage-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_ERRORMESSAGE +#ifndef TQT_NO_ERRORMESSAGE class TQPushButton; class TQCheckBox; class TQLabel; @@ -120,7 +120,7 @@ private: #endif }; -#endif //QT_NO_ERRORMESSAGE +#endif //TQT_NO_ERRORMESSAGE #endif diff --git a/doc/html/qeucjpcodec-h.html b/doc/html/qeucjpcodec-h.html index 8a9fefe1f..3363fb071 100644 --- a/doc/html/qeucjpcodec-h.html +++ b/doc/html/qeucjpcodec-h.html @@ -111,7 +111,7 @@ body { background: #ffffff; color: black; } #include "ntqjpunicode.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP diff --git a/doc/html/qeuckrcodec-h.html b/doc/html/qeuckrcodec-h.html index 760f2b7dd..7b6d947c8 100644 --- a/doc/html/qeuckrcodec-h.html +++ b/doc/html/qeuckrcodec-h.html @@ -106,7 +106,7 @@ body { background: #ffffff; color: black; } #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_KR diff --git a/doc/html/qevent-h.html b/doc/html/qevent-h.html index 92658e8d7..49f05c9ff 100644 --- a/doc/html/qevent-h.html +++ b/doc/html/qevent-h.html @@ -237,7 +237,7 @@ protected: }; -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT class Q_EXPORT TQWheelEvent : public TQEvent { public: @@ -534,7 +534,7 @@ inline int TQIMEvent::selectionLength() const } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP // This class is rather closed at the moment. If you need to create your // own DND event objects, write to qt-bugs@trolltech.com and we'll try to @@ -623,7 +623,7 @@ public: : TQEvent(DragLeave) {} }; -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP class Q_EXPORT TQChildEvent : public TQEvent { diff --git a/doc/html/qfiledialog-h.html b/doc/html/qfiledialog-h.html index f4377df79..ac25a627d 100644 --- a/doc/html/qfiledialog-h.html +++ b/doc/html/qfiledialog-h.html @@ -101,7 +101,7 @@ class TQFileDialogTQFileListView; #pragma GCC system_header #endif -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG class Q_EXPORT TQFileIconProvider : public TQObject { diff --git a/doc/html/qfileinfo-h.html b/doc/html/qfileinfo-h.html index 850d750c0..28cba3a8d 100644 --- a/doc/html/qfileinfo-h.html +++ b/doc/html/qfileinfo-h.html @@ -100,7 +100,7 @@ public: TQFileInfo(); TQFileInfo( const TQString &file ); TQFileInfo( const TQFile & ); -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQFileInfo( const TQDir &, const TQString &fileName ); #endif TQFileInfo( const TQFileInfo & ); @@ -110,7 +110,7 @@ public: void setFile( const TQString &file ); void setFile( const TQFile & ); -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR void setFile( const TQDir &, const TQString &fileName ); #endif bool exists() const; @@ -120,16 +120,16 @@ public: TQString filePath() const; TQString fileName() const; -#ifndef QT_NO_DIR //### +#ifndef TQT_NO_DIR //### TQString absFilePath() const; #endif TQString baseName( bool complete = FALSE ) const; TQString extension( bool complete = TRUE ) const; -#ifndef QT_NO_DIR //### +#ifndef TQT_NO_DIR //### TQString dirPath( bool absPath = FALSE ) const; #endif -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQDir dir( bool absPath = FALSE ) const; #endif bool isReadable() const; @@ -137,7 +137,7 @@ public: bool isExecutable() const; bool isHidden() const; -#ifndef QT_NO_DIR //### +#ifndef TQT_NO_DIR //### bool isRelative() const; bool convertToAbs(); #endif diff --git a/doc/html/qfont-h.html b/doc/html/qfont-h.html index d9316433a..76f0b23c8 100644 --- a/doc/html/qfont-h.html +++ b/doc/html/qfont-h.html @@ -217,14 +217,14 @@ public: TQString toString() const; bool fromString(const TQString &); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQString substitute(const TQString &); static TQStringList substitutes(const TQString &); static TQStringList substitutions(); static void insertSubstitution(const TQString&, const TQString &); static void insertSubstitutions(const TQString&, const TQStringList &); static void removeSubstitution(const TQString &); -#endif //QT_NO_STRINGLIST +#endif //TQT_NO_STRINGLIST static void initialize(); static void cleanup(); #ifndef Q_WS_QWS @@ -373,10 +373,10 @@ private: friend class TQTextLayout; friend class TQTextItem; friend class TQGLContext; -#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE) +#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE) friend TQt::HANDLE qt_xft_handle(const TQFont &font); #endif -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & ); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & ); #endif @@ -399,7 +399,7 @@ inline void TQFont::setBold( bool enable ) TQFont stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & ); #endif diff --git a/doc/html/qfontdatabase-h.html b/doc/html/qfontdatabase-h.html index a86c217a2..565b48b2e 100644 --- a/doc/html/qfontdatabase-h.html +++ b/doc/html/qfontdatabase-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -#ifndef QT_NO_FONTDATABASE +#ifndef TQT_NO_FONTDATABASE class TQFontStylePrivate; /* Don't touch! */ struct TQtFontStyle; @@ -258,7 +258,7 @@ inline int TQFontDatabase::weight( const TQString &family, #endif // TQT_NO_COMPAT -#endif // QT_NO_FONTDATABASE +#endif // TQT_NO_FONTDATABASE #endif // TQFONTDATABASE_H diff --git a/doc/html/qfontdialog-h.html b/doc/html/qfontdialog-h.html index d3adb41b7..e0dbac877 100644 --- a/doc/html/qfontdialog-h.html +++ b/doc/html/qfontdialog-h.html @@ -79,7 +79,7 @@ body { background: #ffffff; color: black; } #include "ntqwindowdefs.h" -#ifndef QT_NO_FONTDIALOG +#ifndef TQT_NO_FONTDIALOG // // W A R N I N G diff --git a/doc/html/qframe-h.html b/doc/html/qframe-h.html index d672f40b0..8d1943fe5 100644 --- a/doc/html/qframe-h.html +++ b/doc/html/qframe-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_FRAME +#ifndef TQT_NO_FRAME class Q_EXPORT TQFrame : public TQWidget { @@ -202,7 +202,7 @@ inline int TQFrame::frameWidth() const { return fwidth; } -#endif // QT_NO_FRAME +#endif // TQT_NO_FRAME #endif // TQFRAME_H diff --git a/doc/html/qftp-h.html b/doc/html/qftp-h.html index 21d9a29b3..b81ee5c2c 100644 --- a/doc/html/qftp-h.html +++ b/doc/html/qftp-h.html @@ -89,7 +89,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_FTP Q_EXPORT #endif -#ifndef QT_NO_NETWORKPROTOCOL_FTP +#ifndef TQT_NO_NETWORKPROTOCOL_FTP class TQSocket; @@ -233,7 +233,7 @@ protected slots: void error( int ); }; -#endif // QT_NO_NETWORKPROTOCOL_FTP +#endif // TQT_NO_NETWORKPROTOCOL_FTP #endif // TQFTP_H diff --git a/doc/html/qgb18030codec-h.html b/doc/html/qgb18030codec-h.html index cd1ab4d03..c6cf889e4 100644 --- a/doc/html/qgb18030codec-h.html +++ b/doc/html/qgb18030codec-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_CN diff --git a/doc/html/qgfx_qws-h.html b/doc/html/qgfx_qws-h.html index ecaee5af2..c3e3009ea 100644 --- a/doc/html/qgfx_qws-h.html +++ b/doc/html/qgfx_qws-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } class TQScreenCursor; -#if !defined( QT_NO_IMAGE_16_BIT ) || !defined( QT_NO_QWS_DEPTH_16 ) +#if !defined( TQT_NO_IMAGE_16_BIT ) || !defined( TQT_NO_QWS_DEPTH_16 ) # ifndef QT_QWS_DEPTH16_RGB # define QT_QWS_DEPTH16_RGB 565 # endif @@ -147,7 +147,7 @@ inline void qt_conv16ToRgb( ushort c, int& r, int& g, int& b ) const int SourceSolid=0; const int SourcePixmap=1; -#ifndef QT_NO_QWS_CURSOR +#ifndef TQT_NO_QWS_CURSOR extern bool qt_sw_cursor; @@ -213,7 +213,7 @@ protected: extern TQScreenCursor * qt_screencursor; -#endif // QT_NO_QWS_CURSOR +#endif // TQT_NO_QWS_CURSOR struct fb_cmap; @@ -306,7 +306,7 @@ public: protected: - // Only used without QT_NO_QWS_REPEATER, but included so that + // Only used without TQT_NO_QWS_REPEATER, but included so that // it's binary compatible regardless. int * screen_optype; int * screen_lastop; @@ -407,7 +407,7 @@ public: virtual void blt( int,int,int,int,int,int )=0; virtual void scroll( int,int,int,int,int,int )=0; -#if !defined(QT_NO_MOVIE) || !defined(QT_NO_TRANSFORMATIONS) || !defined(QT_NO_PIXMAP_TRANSFORMATION) +#if !defined(TQT_NO_MOVIE) || !defined(TQT_NO_TRANSFORMATIONS) || !defined(TQT_NO_PIXMAP_TRANSFORMATION) virtual void stretchBlt( int,int,int,int,int,int )=0; #endif virtual void tiledBlt( int,int,int,int )=0; diff --git a/doc/html/qgfxdriverfactory_qws-h.html b/doc/html/qgfxdriverfactory_qws-h.html index de7f7b1eb..e3e741b98 100644 --- a/doc/html/qgfxdriverfactory_qws-h.html +++ b/doc/html/qgfxdriverfactory_qws-h.html @@ -83,7 +83,7 @@ class TQScreen; class Q_EXPORT TQGfxDriverFactory { public: -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQStringList keys(); #endif static TQScreen *create( const TQString&, int ); diff --git a/doc/html/qgfxdriverplugin_qws-h.html b/doc/html/qgfxdriverplugin_qws-h.html index 88c190d91..76022fa1e 100644 --- a/doc/html/qgfxdriverplugin_qws-h.html +++ b/doc/html/qgfxdriverplugin_qws-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT class TQScreen; class TQGfxDriverPluginPrivate; @@ -92,7 +92,7 @@ public: TQGfxDriverPlugin(); ~TQGfxDriverPlugin(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST virtual TQStringList keys() const = 0; #endif virtual TQScreen* create( const TQString& driver, int displayId ) = 0; @@ -101,7 +101,7 @@ private: TQGfxDriverPluginPrivate *d; }; -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT #endif // TQGFXDRIVERPLUGIN_QWS_H diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html index 9c4aba67b..c12d11349 100644 --- a/doc/html/qglobal-h.html +++ b/doc/html/qglobal-h.html @@ -319,7 +319,7 @@ body { background: #ffffff; color: black; } /* ??? */ # define Q_BROKEN_TEMPLATE_SPECIALIZATION /* no template classes in TQVariant */ -# define QT_NO_TEMPLATE_VARIANT +# define TQT_NO_TEMPLATE_VARIANT /* Wcc does not fill in functions needed by valuelists, maps, and valuestacks implicitly */ # define Q_FULL_TEMPLATE_INSTANTIATION @@ -327,9 +327,9 @@ body { background: #ffffff; color: black; } # define Q_FULL_TEMPLATE_INSTANTIATION_MEMCMP /* these are not useful to our customers */ # define QT_QWS_NO_SHM -# define QT_NO_QWS_MULTIPROCESS -# define QT_NO_SQL -# define QT_NO_QWS_CURSOR +# define TQT_NO_QWS_MULTIPROCESS +# define TQT_NO_SQL +# define TQT_NO_QWS_CURSOR # endif #elif defined(__GNUC__) @@ -615,7 +615,7 @@ body { background: #ffffff; color: black; } #elif defined(Q_OS_UNIX) # if defined(TQWS) # define Q_WS_QWS -# define QT_NO_QWS_IM +# define TQT_NO_QWS_IM # elif defined(Q_OS_MACX) # define Q_WS_MACX # else @@ -811,28 +811,28 @@ class TQDataStream; // prune to local config #include "ntqmodules.h" #ifndef TQT_MODULE_DIALOGS -# define QT_NO_DIALOG +# define TQT_NO_DIALOG #endif #ifndef TQT_MODULE_WORKSPACE -# define QT_NO_WORKSPACE +# define TQT_NO_WORKSPACE #endif #ifndef TQT_MODULE_NETWORK -#define QT_NO_NETWORK +#define TQT_NO_NETWORK #endif #ifndef TQT_MODULE_CANVAS -# define QT_NO_CANVAS +# define TQT_NO_CANVAS #endif #ifndef TQT_MODULE_TABLE -#define QT_NO_TABLE +#define TQT_NO_TABLE #endif #ifndef TQT_MODULE_XML -# define QT_NO_XML +# define TQT_NO_XML #endif #ifndef TQT_MODULE_OPENGL -# define QT_NO_OPENGL +# define TQT_NO_OPENGL #endif #if !defined(TQT_MODULE_SQL) -# define QT_NO_SQL +# define TQT_NO_SQL #endif #if defined(Q_WS_MAC9) @@ -857,8 +857,8 @@ class TQDataStream; # endif #endif -#if !defined(Q_WS_QWS) && !defined(QT_NO_COP) -# define QT_NO_COP +#if !defined(Q_WS_QWS) && !defined(TQT_NO_COP) +# define TQT_NO_COP #endif #ifndef QT_H @@ -971,14 +971,14 @@ Q_EXPORT int qWinVersion(); // Debugging and error handling // -#if !defined(QT_NO_CHECK) +#if !defined(TQT_NO_CHECK) # define QT_CHECK_STATE // check state of objects etc. # define QT_CHECK_RANGE // check range of indexes etc. # define QT_CHECK_NULL // check null pointers # define QT_CHECK_MATH // check math functions #endif -#if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG) +#if !defined(TQT_NO_DEBUG) && !defined(QT_DEBUG) # define QT_DEBUG // display debug messages # if !defined(TQT_NO_COMPAT) // compatibility with TQt 2 # if !defined(NO_DEBUG) && !defined(DEBUG) @@ -1102,13 +1102,13 @@ Q_EXPORT const char *tqInstallPathSysconf(); /* Avoid some particularly useless warnings from some stupid compilers. To get ALL C++ compiler warnings, define QT_CC_WARNINGS or comment out - the line "#define QT_NO_WARNINGS" + the line "#define TQT_NO_WARNINGS" */ #if !defined(QT_CC_WARNINGS) -# define QT_NO_WARNINGS +# define TQT_NO_WARNINGS #endif -#if defined(QT_NO_WARNINGS) +#if defined(TQT_NO_WARNINGS) # if defined(Q_CC_MSVC) # pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data # pragma warning(disable: 4275) // non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier' diff --git a/doc/html/qgrid-h.html b/doc/html/qgrid-h.html index 6dba57a43..2336a3595 100644 --- a/doc/html/qgrid-h.html +++ b/doc/html/qgrid-h.html @@ -77,7 +77,7 @@ body { background: #ffffff; color: black; } #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_GRID +#ifndef TQT_NO_GRID class TQGridLayout; @@ -108,7 +108,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_GRID +#endif // TQT_NO_GRID #endif // TQGRID_H diff --git a/doc/html/qgridview-h.html b/doc/html/qgridview-h.html index be41e1c28..d9a15c7e8 100644 --- a/doc/html/qgridview-h.html +++ b/doc/html/qgridview-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqscrollview.h" #endif // QT_H -#ifndef QT_NO_GRIDVIEW +#ifndef TQT_NO_GRIDVIEW class TQGridViewPrivate; @@ -169,7 +169,7 @@ inline TQSize TQGridView::gridSize() const -#endif // QT_NO_GRIDVIEW +#endif // TQT_NO_GRIDVIEW #endif // TQTABLEVIEW_H diff --git a/doc/html/qgroupbox-h.html b/doc/html/qgroupbox-h.html index 037c2ab83..4fcbefa4f 100644 --- a/doc/html/qgroupbox-h.html +++ b/doc/html/qgroupbox-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_GROUPBOX +#ifndef TQT_NO_GROUPBOX class TQAccel; @@ -98,7 +98,7 @@ class Q_EXPORT TQGroupBox : public TQFrame TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation DESIGNABLE false ) TQ_PROPERTY( int columns READ columns WRITE setColumns DESIGNABLE false ) TQ_PROPERTY( bool flat READ isFlat WRITE setFlat ) -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX TQ_PROPERTY( bool checkable READ isCheckable WRITE setCheckable ) TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) #endif @@ -137,13 +137,13 @@ public: bool isFlat() const; void setFlat( bool b ); bool isCheckable() const; -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX void setCheckable( bool b ); #endif bool isChecked() const; void setEnabled(bool on); -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX public slots: void setChecked( bool b ); @@ -168,13 +168,13 @@ private: void calculateFrame(); void insertWid( TQWidget* ); void setTextSpacer(); -#ifndef QT_NO_CHECKBOX +#ifndef TQT_NO_CHECKBOX void updateCheckBoxGeometry(); #endif TQString str; int align; int lenvisible; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel * accel; #endif TQGroupBoxPrivate * d; @@ -196,7 +196,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_GROUPBOX +#endif // TQT_NO_GROUPBOX #endif // TQGROUPBOX_H diff --git a/doc/html/qhbox-h.html b/doc/html/qhbox-h.html index f0b13c9fd..0693f024b 100644 --- a/doc/html/qhbox-h.html +++ b/doc/html/qhbox-h.html @@ -78,7 +78,7 @@ body { background: #ffffff; color: black; } #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_HBOX +#ifndef TQT_NO_HBOX #include "ntqframe.h" @@ -107,7 +107,7 @@ private: #endif }; -#endif // QT_NO_HBOX +#endif // TQT_NO_HBOX #endif // TQHBOX_H diff --git a/doc/html/qhbuttongroup-h.html b/doc/html/qhbuttongroup-h.html index 75771fc02..01b6a600a 100644 --- a/doc/html/qhbuttongroup-h.html +++ b/doc/html/qhbuttongroup-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqbuttongroup.h" #endif // QT_H -#ifndef QT_NO_HBUTTONGROUP +#ifndef TQT_NO_HBUTTONGROUP class Q_EXPORT TQHButtonGroup : public TQButtonGroup { @@ -99,7 +99,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_HBUTTONGROUP +#endif // TQT_NO_HBUTTONGROUP #endif // TQHBUTTONGROUP_H diff --git a/doc/html/qheader-h.html b/doc/html/qheader-h.html index 7c7e7dacc..f9a1e31ad 100644 --- a/doc/html/qheader-h.html +++ b/doc/html/qheader-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqiconset.h" // conversion TQPixmap->TQIconset #endif // QT_H -#ifndef QT_NO_HEADER +#ifndef TQT_NO_HEADER class TQShowEvent; class TQHeaderData; @@ -250,7 +250,7 @@ inline bool TQHeader::tracking() const { return trackingIsOn; } extern Q_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition -#endif // QT_NO_HEADER +#endif // TQT_NO_HEADER #endif // TQHEADER_H diff --git a/doc/html/qhgroupbox-h.html b/doc/html/qhgroupbox-h.html index 0a5c3a914..14a1adeb5 100644 --- a/doc/html/qhgroupbox-h.html +++ b/doc/html/qhgroupbox-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqgroupbox.h" #endif // QT_H -#ifndef QT_NO_HGROUPBOX +#ifndef TQT_NO_HGROUPBOX class Q_EXPORT TQHGroupBox : public TQGroupBox { @@ -98,7 +98,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_HGROUPBOX +#endif // TQT_NO_HGROUPBOX #endif // TQHGROUPBOX_H diff --git a/doc/html/qhostaddress-h.html b/doc/html/qhostaddress-h.html index e5b8c31e0..cae9d608c 100644 --- a/doc/html/qhostaddress-h.html +++ b/doc/html/qhostaddress-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_NETWORK Q_EXPORT #endif -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK class TQHostAddressPrivate; typedef struct { @@ -101,7 +101,7 @@ public: TQHostAddress( TQ_UINT32 ip4Addr ); TQHostAddress( TQ_UINT8 *ip6Addr ); TQHostAddress(const Q_IPV6ADDR &ip6Addr); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQHostAddress(const TQString &address); #endif TQHostAddress( const TQHostAddress & ); @@ -111,7 +111,7 @@ public: void setAddress( TQ_UINT32 ip4Addr ); void setAddress( TQ_UINT8 *ip6Addr ); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST bool setAddress( const TQString& address ); #endif bool isIp4Addr() const; // obsolete @@ -122,7 +122,7 @@ public: bool isIPv6Address() const; Q_IPV6ADDR toIPv6Address() const; -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_SPRINTF TQString toString() const; #endif @@ -133,7 +133,7 @@ private: TQHostAddressPrivate* d; }; -#endif //QT_NO_NETWORK +#endif //TQT_NO_NETWORK #endif diff --git a/doc/html/qhttp-h.html b/doc/html/qhttp-h.html index 62acd87bc..b27a2345c 100644 --- a/doc/html/qhttp-h.html +++ b/doc/html/qhttp-h.html @@ -91,7 +91,7 @@ body { background: #ffffff; color: black; } #define TQM_TEMPLATE_EXTERN_HTTP Q_TEMPLATE_EXTERN #endif -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef TQT_NO_NETWORKPROTOCOL_HTTP class TQSocket; class TQTimerEvent; diff --git a/doc/html/qiconset-h.html b/doc/html/qiconset-h.html index 26d28f044..86d97955c 100644 --- a/doc/html/qiconset-h.html +++ b/doc/html/qiconset-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqpixmap.h" #endif // QT_H -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET class TQIconFactory; class TQIconSetPrivate; @@ -164,7 +164,7 @@ private: uint unused : 31; }; -#endif // QT_NO_ICONSET +#endif // TQT_NO_ICONSET #endif diff --git a/doc/html/qiconview-h.html b/doc/html/qiconview-h.html index ebe8b0356..e03f1b077 100644 --- a/doc/html/qiconview-h.html +++ b/doc/html/qiconview-h.html @@ -89,7 +89,7 @@ body { background: #ffffff; color: black; } #include "ntqpicture.h" #endif // QT_H -#ifndef QT_NO_ICONVIEW +#ifndef TQT_NO_ICONVIEW class TQIconView; class TQPainter; @@ -106,7 +106,7 @@ class TQIconViewItemLineEdit; class TQStringList; class TQIconDragPrivate; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP class Q_EXPORT TQIconDragItem { @@ -165,7 +165,7 @@ public: TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text ); TQIconViewItem( TQIconView *parent, const TQString &text, const TQPixmap &icon ); TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon ); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture ); TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPicture &picture ); #endif @@ -177,7 +177,7 @@ public: virtual TQString text() const; virtual TQPixmap *pixmap() const; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE virtual TQPicture *picture() const; #endif virtual TQString key() const; @@ -220,7 +220,7 @@ public: virtual bool acceptDrop( const TQMimeSource *mime ) const; -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT void rename(); #endif @@ -228,7 +228,7 @@ public: virtual void setText( const TQString &text ); virtual void setPixmap( const TQPixmap &icon ); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE virtual void setPicture( const TQPicture &icon ); #endif virtual void setText( const TQString &text, bool recalc, bool redraw = TRUE ); @@ -239,13 +239,13 @@ public: static int RTTI; protected: -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT virtual void removeRenameBox(); #endif virtual void calcRect( const TQString &text_ = TQString::null ); virtual void paintItem( TQPainter *p, const TQColorGroup &cg ); virtual void paintFocus( TQPainter *p, const TQColorGroup &cg ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> &lst ); #endif virtual void dragEntered(); @@ -258,11 +258,11 @@ protected: private: void init( TQIconViewItem *after = 0 -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE , TQPicture *pic = 0 #endif ); -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT void renameItem(); void cancelRenameItem(); #endif @@ -272,7 +272,7 @@ private: TQString itemText, itemKey; TQString tmpText; TQPixmap *itemIcon; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQPicture *itemPic; #endif TQIconViewItem *prev, *next; @@ -284,7 +284,7 @@ private: uint dirty : 1; uint wordWrapDirty : 1; TQRect itemRect, itemTextRect, itemIconRect; -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT TQIconViewItemLineEdit *renameBox; #endif TQRect oldRect; @@ -446,7 +446,7 @@ signals: void mouseButtonClicked( int button, TQIconViewItem* item, const TQPoint& pos ); void contextMenuRequested( TQIconViewItem* item, const TQPoint &pos ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> &lst ); #endif void moved(); @@ -471,7 +471,7 @@ protected: void contentsMouseDoubleClickEvent( TQMouseEvent *e ); void contentsContextMenuEvent( TQContextMenuEvent *e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void contentsDragEnterEvent( TQDragEnterEvent *e ); void contentsDragMoveEvent( TQDragMoveEvent *e ); void contentsDragLeaveEvent( TQDragLeaveEvent *e ); @@ -485,7 +485,7 @@ protected: void enterEvent( TQEvent *e ); virtual void drawRubber( TQPainter *p ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual TQDragObject *dragObject(); virtual void startDrag(); #endif @@ -503,7 +503,7 @@ protected: private: void contentsMousePressEventEx( TQMouseEvent *e ); virtual void drawDragShapes( const TQPoint &pnt ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void initDragEnter( TQDropEvent *e ); #endif void drawContents( TQPainter* ); @@ -534,7 +534,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_ICONVIEW +#endif // TQT_NO_ICONVIEW #endif // TQICONVIEW_H diff --git a/doc/html/qimage-h.html b/doc/html/qimage-h.html index 7f441e87e..27e0f3f68 100644 --- a/doc/html/qimage-h.html +++ b/doc/html/qimage-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #endif // QT_H class TQImageDataMisc; // internal -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT class Q_EXPORT TQImageTextKeyLang { public: TQImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { } @@ -98,7 +98,7 @@ public: bool operator== (const TQImageTextKeyLang& other) const { return key==other.key && lang==other.lang; } }; -#endif //QT_NO_IMAGE_TEXT +#endif //TQT_NO_IMAGE_TEXT class Q_EXPORT TQImage @@ -111,7 +111,7 @@ public: Endian bitOrder=IgnoreEndian ); TQImage( const TQSize&, int depth, int numColors=0, Endian bitOrder=IgnoreEndian ); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQImage( const TQString &fileName, const char* format=0 ); TQImage( const char * const xpm[] ); TQImage( const TQByteArray &data ); @@ -135,7 +135,7 @@ public: TQImage copy() const; TQImage copy(int x, int y, int w, int h, int conversion_flags=0) const; TQImage copy(const TQRect&) const; -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME static TQImage fromMimeSource( const TQString& abs_name ); #endif bool isNull() const { return data->bits == 0; } @@ -179,7 +179,7 @@ public: void invertPixels( bool invertAlpha = TRUE ); TQImage convertDepth( int ) const; -#ifndef QT_NO_IMAGE_TRUECOLOR +#ifndef TQT_NO_IMAGE_TRUECOLOR TQImage convertDepthWithPalette( int, TQRgb* p, int pc, int cf=0 ) const; #endif TQImage convertDepth( int, int conversion_flags ) const; @@ -190,11 +190,11 @@ public: ScaleMin, ScaleMax }; -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE TQImage smoothScale( int w, int h, ScaleMode mode=ScaleFree ) const; TQImage smoothScale( const TQSize& s, ScaleMode mode=ScaleFree ) const; #endif -#ifndef QT_NO_IMAGE_TRANSFORMATION +#ifndef TQT_NO_IMAGE_TRANSFORMATION TQImage scale( int w, int h, ScaleMode mode=ScaleFree ) const; TQImage scale( const TQSize& s, ScaleMode mode=ScaleFree ) const; TQImage scaleWidth( int w ) const; @@ -202,13 +202,13 @@ public: TQImage xForm( const TQWMatrix &matrix ) const; #endif -#ifndef QT_NO_IMAGE_DITHER_TO_1 +#ifndef TQT_NO_IMAGE_DITHER_TO_1 TQImage createAlphaMask( int conversion_flags=0 ) const; #endif -#ifndef QT_NO_IMAGE_HEURISTIC_MASK +#ifndef TQT_NO_IMAGE_HEURISTIC_MASK TQImage createHeuristicMask( bool clipTight=TRUE ) const; #endif -#ifndef QT_NO_IMAGE_MIRROR +#ifndef TQT_NO_IMAGE_MIRROR TQImage mirror() const; TQImage mirror(bool horizontally, bool vertically) const; #endif @@ -217,11 +217,11 @@ public: static Endian systemBitOrder(); static Endian systemByteOrder(); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO static const char* imageFormat( const TQString &fileName ); static TQStrList inputFormats(); static TQStrList outputFormats(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQStringList inputFormatList(); static TQStringList outputFormatList(); #endif @@ -233,7 +233,7 @@ public: int quality=-1 ) const; bool save( TQIODevice * device, const char* format, int quality=-1 ) const; -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO bool valid( int x, int y ) const; int pixelIndex( int x, int y ) const; @@ -247,7 +247,7 @@ public: void setDotsPerMeterY(int); TQPoint offset() const; void setOffset(const TQPoint&); -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT TQValueList<TQImageTextKeyLang> textList() const; TQStringList textLanguages() const; TQStringList textKeys() const; @@ -274,15 +274,15 @@ private: int dpmx; // dots per meter X (or 0) int dpmy; // dots per meter Y (or 0) TQPoint offset; // offset in pixels -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT TQImageDataMisc* misc; // less common stuff #endif bool ctbl_mine; // this allocated ctbl } *data; -#ifndef QT_NO_IMAGE_TEXT +#ifndef TQT_NO_IMAGE_TEXT TQImageDataMisc& misc() const; #endif -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool doImageIO( TQImageIO* io, int quality ) const; #endif friend Q_EXPORT void bitBlt( TQImage* dst, int dx, int dy, @@ -293,12 +293,12 @@ private: // TQImage stream functions -#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO) +#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO) Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQImage & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQImage & ); #endif -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO class TQIODevice; typedef void (*image_io_handler)( TQImageIO * ); // image IO handler @@ -368,7 +368,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif //QT_NO_IMAGEIO +#endif //TQT_NO_IMAGEIO Q_EXPORT void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src, int sx=0, int sy=0, int sw=-1, int sh=-1, diff --git a/doc/html/qimageformatplugin-h.html b/doc/html/qimageformatplugin-h.html index cdb02f1cc..d5e6ebf65 100644 --- a/doc/html/qimageformatplugin-h.html +++ b/doc/html/qimageformatplugin-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_IMAGEFORMATPLUGIN +#ifndef TQT_NO_IMAGEFORMATPLUGIN class TQImageFormat; class TQImageFormatPluginPrivate; @@ -99,7 +99,7 @@ public: private: TQImageFormatPluginPrivate *d; }; -#endif // QT_NO_IMAGEFORMATPLUGIN +#endif // TQT_NO_IMAGEFORMATPLUGIN #endif // TQIMAGEFORMATPLUGIN_H diff --git a/doc/html/qinputdialog-h.html b/doc/html/qinputdialog-h.html index aa18888bb..3989529ac 100644 --- a/doc/html/qinputdialog-h.html +++ b/doc/html/qinputdialog-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqlineedit.h" #endif // QT_H -#ifndef QT_NO_INPUTDIALOG +#ifndef TQT_NO_INPUTDIALOG class TQSpinBox; class TQComboBox; @@ -137,7 +137,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_INPUTDIALOG +#endif // TQT_NO_INPUTDIALOG #endif // TQINPUTDIALOG_H diff --git a/doc/html/qjiscodec-h.html b/doc/html/qjiscodec-h.html index d676a002a..319b1ae95 100644 --- a/doc/html/qjiscodec-h.html +++ b/doc/html/qjiscodec-h.html @@ -111,7 +111,7 @@ body { background: #ffffff; color: black; } #include "ntqjpunicode.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP diff --git a/doc/html/qkbddriverfactory_qws-h.html b/doc/html/qkbddriverfactory_qws-h.html index 224b846f1..88fdfede0 100644 --- a/doc/html/qkbddriverfactory_qws-h.html +++ b/doc/html/qkbddriverfactory_qws-h.html @@ -83,7 +83,7 @@ class TQWSKeyboardHandler; class Q_EXPORT TQKbdDriverFactory { public: -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQStringList keys(); #endif static TQWSKeyboardHandler *create( const TQString&, const TQString& ); diff --git a/doc/html/qkbddriverplugin_qws-h.html b/doc/html/qkbddriverplugin_qws-h.html index 360432c8e..fa2ab5621 100644 --- a/doc/html/qkbddriverplugin_qws-h.html +++ b/doc/html/qkbddriverplugin_qws-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT class TQWSKeyboardHandler; class TQKbdDriverPluginPrivate; @@ -92,7 +92,7 @@ public: TQKbdDriverPlugin(); ~TQKbdDriverPlugin(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST virtual TQStringList keys() const = 0; #endif virtual TQWSKeyboardHandler* create( const TQString& driver, const TQString &device ) = 0; @@ -101,7 +101,7 @@ private: TQKbdDriverPluginPrivate *d; }; -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT #endif // TQKBDDRIVERPLUGIN_QWS_H diff --git a/doc/html/qkeyboard_qws-h.html b/doc/html/qkeyboard_qws-h.html index d8fe72e3c..86ab07795 100644 --- a/doc/html/qkeyboard_qws-h.html +++ b/doc/html/qkeyboard_qws-h.html @@ -79,7 +79,7 @@ body { background: #ffffff; color: black; } #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_QWS_KEYBOARD +#ifndef TQT_NO_QWS_KEYBOARD class TQWSKeyboardHandler : public TQObject { TQ_OBJECT public: diff --git a/doc/html/qkeysequence-h.html b/doc/html/qkeysequence-h.html index 783cc9595..e0aeeb31b 100644 --- a/doc/html/qkeysequence-h.html +++ b/doc/html/qkeysequence-h.html @@ -84,12 +84,12 @@ body { background: #ffffff; color: black; } #endif // QT_H #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL /***************************************************************************** TQKeySequence stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM class TQKeySequence; Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQKeySequence & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQKeySequence & ); @@ -140,7 +140,7 @@ public: TQKeySequence( int ) {} }; -#endif //QT_NO_ACCEL +#endif //TQT_NO_ACCEL #endif diff --git a/doc/html/qlabel-h.html b/doc/html/qlabel-h.html index 0382c9675..a82c4ebfe 100644 --- a/doc/html/qlabel-h.html +++ b/doc/html/qlabel-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_LABEL +#ifndef TQT_NO_LABEL class TQSimpleRichText; class TQLabelPrivate; @@ -107,10 +107,10 @@ public: TQString text() const { return ltext; } TQPixmap *pixmap() const { return lpixmap; } -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQPicture *picture() const { return lpicture; } #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE TQMovie *movie() const; #endif @@ -124,13 +124,13 @@ public: bool autoResize() const { return autoresize; } virtual void setAutoResize( bool ); -#ifndef QT_NO_IMAGE_SMOOTHSCALE +#ifndef TQT_NO_IMAGE_SMOOTHSCALE bool hasScaledContents() const; void setScaledContents( bool ); #endif TQSize sizeHint() const; TQSize minimumSizeHint() const; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL virtual void setBuddy( TQWidget * ); TQWidget *buddy() const; #endif @@ -141,10 +141,10 @@ public: public slots: virtual void setText( const TQString &); virtual void setPixmap( const TQPixmap & ); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE virtual void setPicture( const TQPicture & ); #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE virtual void setMovie( const TQMovie & ); #endif virtual void setNum( int ); @@ -157,11 +157,11 @@ protected: void resizeEvent( TQResizeEvent* ); private slots: -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void acceleratorSlot(); void buddyDied(); #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE void movieUpdated(const TQRect&); void movieResized(const TQSize&); #endif @@ -173,13 +173,13 @@ private: TQSize sizeForWidth( int w ) const; TQString ltext; TQPixmap *lpixmap; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE TQPicture *lpicture; #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE TQMovie * lmovie; #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQWidget * lbuddy; #endif ushort align; @@ -187,10 +187,10 @@ private: uint autoresize:1; uint scaledcontents :1; TextFormat textformat; -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT TQSimpleRichText* doc; #endif -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel * accel; #endif TQLabelPrivate* d; @@ -205,7 +205,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_LABEL +#endif // TQT_NO_LABEL #endif // TQLABEL_H diff --git a/doc/html/qlayout-h.html b/doc/html/qlayout-h.html index 2cf3c4f4c..3df55a9b3 100644 --- a/doc/html/qlayout-h.html +++ b/doc/html/qlayout-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #include <limits.h> -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT #if 0 TQ_OBJECT @@ -243,7 +243,7 @@ public: void setResizeMode( ResizeMode ); ResizeMode resizeMode() const; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR virtual void setMenuBar( TQMenuBar *w ); TQMenuBar *menuBar() const { return menubar; } #endif @@ -306,7 +306,7 @@ private: uint autoResizeMode : 1; TQRect rect; TQLayoutData *extraData; -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR TQMenuBar *menubar; #endif @@ -505,7 +505,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_LAYOUT +#endif // TQT_NO_LAYOUT #endif // TQLAYOUT_H diff --git a/doc/html/qlcdnumber-h.html b/doc/html/qlcdnumber-h.html index 3937bbd90..9d9f541c7 100644 --- a/doc/html/qlcdnumber-h.html +++ b/doc/html/qlcdnumber-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqbitarray.h" #endif // QT_H -#ifndef QT_NO_LCDNUMBER +#ifndef TQT_NO_LCDNUMBER class TQLCDNumberPrivate; @@ -177,7 +177,7 @@ inline int TQLCDNumber::numDigits() const { return ndigits; } -#endif // QT_NO_LCDNUMBER +#endif // TQT_NO_LCDNUMBER #endif // TQLCDNUMBER_H diff --git a/doc/html/qlibrary-h.html b/doc/html/qlibrary-h.html index ef328a11e..4c480fe9e 100644 --- a/doc/html/qlibrary-h.html +++ b/doc/html/qlibrary-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_LIBRARY +#ifndef TQT_NO_LIBRARY class TQLibraryPrivate; @@ -118,7 +118,7 @@ private: // Disabled copy constructor and operator= #define Q_DEFINED_QLIBRARY #include "ntqwinexport.h" -#endif //QT_NO_LIBRARY +#endif //TQT_NO_LIBRARY #endif //TQLIBRARY_H diff --git a/doc/html/qlineedit-h.html b/doc/html/qlineedit-h.html index 903577e40..db6bbda57 100644 --- a/doc/html/qlineedit-h.html +++ b/doc/html/qlineedit-h.html @@ -87,7 +87,7 @@ class TQPopupMenu; #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_LINEEDIT +#ifndef TQT_NO_LINEEDIT class TQTextParagraph; class TQTextCursor; @@ -201,7 +201,7 @@ public slots: virtual void setSelection( int, int ); virtual void setCursorPosition( int ); virtual void setAlignment( int flag ); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD virtual void cut(); virtual void copy() const; virtual void paste(); @@ -228,7 +228,7 @@ protected: void focusOutEvent( TQFocusEvent * ); void resizeEvent( TQResizeEvent * ); void drawContents( TQPainter * ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dragEnterEvent( TQDragEnterEvent * ); void dragMoveEvent( TQDragMoveEvent *e ); void dragLeaveEvent( TQDragLeaveEvent *e ); @@ -262,7 +262,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_LINEEDIT +#endif // TQT_NO_LINEEDIT #endif // TQLINEEDIT_H diff --git a/doc/html/qlistbox-h.html b/doc/html/qlistbox-h.html index 23bc02a32..4401f72ec 100644 --- a/doc/html/qlistbox-h.html +++ b/doc/html/qlistbox-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqpixmap.h" #endif // QT_H -#ifndef QT_NO_LISTBOX +#ifndef TQT_NO_LISTBOX class TQListBoxPrivate; @@ -466,7 +466,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_LISTBOX +#endif // TQT_NO_LISTBOX #endif // TQLISTBOX_H diff --git a/doc/html/qlistview-h.html b/doc/html/qlistview-h.html index 7959b5d41..650325241 100644 --- a/doc/html/qlistview-h.html +++ b/doc/html/qlistview-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqscrollview.h" #endif // QT_H -#ifndef QT_NO_LISTVIEW +#ifndef TQT_NO_LISTVIEW class TQPixmap; @@ -222,7 +222,7 @@ protected: virtual void activate(); bool activatedPos( TQPoint & ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void dropped( TQDropEvent *e ); #endif virtual void dragEntered(); @@ -428,7 +428,7 @@ signals: void expanded( TQListViewItem *item ); void collapsed( TQListViewItem *item ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dropped( TQDropEvent *e ); #endif void itemRenamed( TQListViewItem *item, int col, const TQString & ); @@ -440,7 +440,7 @@ protected: void contentsMouseMoveEvent( TQMouseEvent * e ); void contentsMouseDoubleClickEvent( TQMouseEvent * e ); void contentsContextMenuEvent( TQContextMenuEvent * e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void contentsDragEnterEvent( TQDragEnterEvent *e ); void contentsDragMoveEvent( TQDragMoveEvent *e ); void contentsDragLeaveEvent( TQDragLeaveEvent *e ); @@ -636,7 +636,7 @@ private: bool isChecked( const TQListViewItem* ) const; }; -#endif // QT_NO_LISTVIEW +#endif // TQT_NO_LISTVIEW #endif // TQLISTVIEW_H diff --git a/doc/html/qlocalfs-h.html b/doc/html/qlocalfs-h.html index bf16abc20..b142b8c45 100644 --- a/doc/html/qlocalfs-h.html +++ b/doc/html/qlocalfs-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqdir.h" #endif // QT_H -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL class Q_EXPORT TQLocalFs : public TQNetworkProtocol { @@ -106,7 +106,7 @@ private: }; -#endif // QT_NO_NETWORKPROTOCOL +#endif // TQT_NO_NETWORKPROTOCOL #endif // TQLOCALFS_H diff --git a/doc/html/qmacstyle_mac-h.html b/doc/html/qmacstyle_mac-h.html index 3bfbf102e..1d156223d 100644 --- a/doc/html/qmacstyle_mac-h.html +++ b/doc/html/qmacstyle_mac-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqwindowsstyle.h" #endif // QT_H -#if defined( Q_WS_MAC ) && !defined( QT_NO_STYLE_MAC ) +#if defined( Q_WS_MAC ) && !defined( TQT_NO_STYLE_MAC ) class TQPalette; diff --git a/doc/html/qmainwindow-h.html b/doc/html/qmainwindow-h.html index 676266cee..1cf481488 100644 --- a/doc/html/qmainwindow-h.html +++ b/doc/html/qmainwindow-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #include "ntqtextstream.h" #endif // QT_H -#ifndef QT_NO_MAINWINDOW +#ifndef TQT_NO_MAINWINDOW class TQMenuBar; class TQStatusBar; @@ -106,11 +106,11 @@ public: TQMainWindow( TQWidget* parent=0, const char* name=0, WFlags f = WType_TopLevel ); ~TQMainWindow(); -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR TQMenuBar * menuBar() const; #endif TQStatusBar * statusBar() const; -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP TQToolTipGroup * toolTipGroup() const; #endif @@ -154,7 +154,7 @@ public: // compatibility stuff bool hasDockWindow( TQDockWindow *dw ); -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR void addToolBar( TQDockWindow *, Dock = DockTop, bool newLine = FALSE ); void addToolBar( TQDockWindow *, const TQString &label, Dock = DockTop, bool newLine = FALSE ); @@ -199,7 +199,7 @@ signals: void usesTextLabelChanged( bool ); void dockWindowPositionChanged( TQDockWindow * ); -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR // compatibility stuff void toolBarPositionChanged( TQToolBar * ); #endif @@ -224,11 +224,11 @@ private: void triggerLayout( bool deleteLayout = TRUE); bool dockMainWindow( TQObject *dock ); -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR virtual void setMenuBar( TQMenuBar * ); #endif virtual void setStatusBar( TQStatusBar * ); -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP virtual void setToolTipGroup( TQToolTipGroup * ); #endif @@ -244,7 +244,7 @@ private: // Disabled copy constructor and operator= #endif }; -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR inline void TQMainWindow::addToolBar( TQDockWindow *w, ToolBarDock dock, bool newLine ) { addDockWindow( w, dock, newLine ); @@ -287,12 +287,12 @@ inline void TQMainWindow::setToolBarsMovable( bool b ) } #endif -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQMainWindow & ); Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQMainWindow & ); #endif -#endif // QT_NO_MAINWINDOW +#endif // TQT_NO_MAINWINDOW #endif // TQMAINWINDOW_H diff --git a/doc/html/qmap-h.html b/doc/html/qmap-h.html index 6760d02b8..8547f2e62 100644 --- a/doc/html/qmap-h.html +++ b/doc/html/qmap-h.html @@ -611,7 +611,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate<Key,T>::Iterator TQMapPrivate&l #ifdef QT_CHECK_RANGE -# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE ) +# if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE ) # define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" ) # define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() ); # else @@ -880,7 +880,7 @@ Q_INLINE_TEMPLATES void TQMap<Key,T>::detachInternal() } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM template<class Key, class T> Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap<Key,T>& m ) { m.clear(); diff --git a/doc/html/qmenubar-h.html b/doc/html/qmenubar-h.html index 18948e42c..7a877f35f 100644 --- a/doc/html/qmenubar-h.html +++ b/doc/html/qmenubar-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqmenudata.h" #endif // QT_H -#ifndef QT_NO_MENUBAR +#ifndef TQT_NO_MENUBAR class TQPopupMenu; @@ -152,7 +152,7 @@ protected: private slots: void subActivated( int itemId ); void subHighlighted( int itemId ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void accelActivated( int itemId ); void accelDestroyed(); #endif @@ -178,7 +178,7 @@ private: int calculateRects( int max_width = -1 ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void setupAccelerators(); TQAccel *autoaccel; #endif @@ -236,7 +236,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_MENUBAR +#endif // TQT_NO_MENUBAR #endif // TQMENUBAR_H diff --git a/doc/html/qmenudata-h.html b/doc/html/qmenudata-h.html index 4e4cacd81..306b78599 100644 --- a/doc/html/qmenudata-h.html +++ b/doc/html/qmenudata-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #include "ntqfont.h" #endif // QT_H -#ifndef QT_NO_MENUDATA +#ifndef TQT_NO_MENUDATA class TQPopupMenu; class TQMenuDataData; @@ -110,7 +110,7 @@ public: TQPopupMenu *popup() const { return popup_menu; } TQWidget *widget() const { return widget_item; } TQCustomMenuItem *custom() const; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence key() const { return accel_key; } #endif TQSignal *signal() const { return signal_data; } @@ -134,7 +134,7 @@ private: TQPixmap *pixmap_data; // item pixmap TQPopupMenu *popup_menu; // item popup menu TQWidget *widget_item; // widget menu item -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence accel_key; // accelerator key (state|ascii) #endif TQSignal *signal_data; // connection @@ -231,7 +231,7 @@ public: void removeItemAt( int index ); void clear(); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence accel( int id ) const; void setAccel( const TQKeySequence& key, int id ); #endif @@ -317,7 +317,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_MENUDATA +#endif // TQT_NO_MENUDATA #endif // TQMENUDATA_H diff --git a/doc/html/qmessagebox-h.html b/doc/html/qmessagebox-h.html index 43565b157..c04813b64 100644 --- a/doc/html/qmessagebox-h.html +++ b/doc/html/qmessagebox-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_MESSAGEBOX +#ifndef TQT_NO_MESSAGEBOX class TQLabel; class TQPushButton; @@ -254,7 +254,7 @@ str)).arg(TQString::fromLatin1(tqVersion()) ); TQMessageBox::critical( 0, TQAppl "Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); tqFatal(s.ascii()); }} -#endif // QT_NO_MESSAGEBOX +#endif // TQT_NO_MESSAGEBOX #endif // TQMESSAGEBOX_H diff --git a/doc/html/qmetaobject-h.html b/doc/html/qmetaobject-h.html index 6232c916a..cebbf68c1 100644 --- a/doc/html/qmetaobject-h.html +++ b/doc/html/qmetaobject-h.html @@ -98,7 +98,7 @@ struct TQMetaData // - member function meta data Access access; // - access permission }; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES struct TQMetaEnum // enumerator meta data { // for properties const char *name; // - enumerator name @@ -113,7 +113,7 @@ struct TQMetaEnum // enumerator meta data }; #endif -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES class Q_EXPORT TQMetaProperty // property meta data { @@ -167,7 +167,7 @@ public: inline bool TQMetaProperty::testFlags( uint f ) const { return (flags & (uint)f) != (uint)0; } -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES struct TQClassInfo // class info meta data { @@ -181,13 +181,13 @@ public: TQMetaObject( const char * const class_name, TQMetaObject *superclass, const TQMetaData * const slot_data, int n_slots, const TQMetaData * const signal_data, int n_signals, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES const TQMetaProperty *const prop_data, int n_props, const TQMetaEnum *const enum_data, int n_enums, #endif const TQClassInfo *const class_info, int n_info ); -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES TQMetaObject( const char * const class_name, TQMetaObject *superclass, const TQMetaData * const slot_data, int n_slots, const TQMetaData * const signal_data, int n_signals, @@ -227,7 +227,7 @@ public: const TQClassInfo *classInfo( int index, bool super = FALSE ) const; const char *classInfo( const char* name, bool super = FALSE ) const; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES const TQMetaProperty *property( int index, bool super = FALSE ) const; int findProperty( const char *name, bool super = FALSE ) const; int indexOfProperty( const TQMetaProperty*, bool super = FALSE ) const; @@ -243,12 +243,12 @@ public: static TQMetaObject *new_metaobject( const char *, TQMetaObject *, const TQMetaData *const, int, const TQMetaData *const, int, -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES const TQMetaProperty *const prop_data, int n_props, const TQMetaEnum *const enum_data, int n_enums, #endif const TQClassInfo *const class_info, int n_info ); -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES static TQMetaObject *new_metaobject( const char *, TQMetaObject *, const TQMetaData *const, int, const TQMetaData *const, int, @@ -278,7 +278,7 @@ private: TQMemberDict *signalDict; // signal dictionary int signaloffset; int slotoffset; -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES int propertyoffset; public: bool tqt_static_property( TQObject* o, int id, int f, TQVariant* v); @@ -299,7 +299,7 @@ inline int TQMetaObject::slotOffset() const inline int TQMetaObject::signalOffset() const { return signaloffset; } -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES inline int TQMetaObject::propertyOffset() const { return propertyoffset; } #endif diff --git a/doc/html/qmime-h.html b/doc/html/qmime-h.html index 5c8e9a901..2cf765a57 100644 --- a/doc/html/qmime-h.html +++ b/doc/html/qmime-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqmap.h" #endif // QT_H -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME class TQImageDrag; class TQTextDrag; @@ -231,7 +231,7 @@ public: #endif // Q_WS_MAC -#endif // QT_NO_MIME +#endif // TQT_NO_MIME #endif // TQMIME_H diff --git a/doc/html/qmotifplusstyle-h.html b/doc/html/qmotifplusstyle-h.html index ea191b9e9..f7ec03a7e 100644 --- a/doc/html/qmotifplusstyle-h.html +++ b/doc/html/qmotifplusstyle-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqmotifstyle.h" #endif // QT_H -#if !defined(QT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN) +#if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_MOTIFPLUS @@ -155,7 +155,7 @@ private: }; -#endif // QT_NO_STYLE_MOTIFPLUS +#endif // TQT_NO_STYLE_MOTIFPLUS #endif // TQMOTIFPLUSSTYLE_H diff --git a/doc/html/qmotifstyle-h.html b/doc/html/qmotifstyle-h.html index a1e9f797b..1f2cea8af 100644 --- a/doc/html/qmotifstyle-h.html +++ b/doc/html/qmotifstyle-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqcommonstyle.h" #endif // QT_H -#if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN) +#if !defined(TQT_NO_STYLE_MOTIF) || defined(QT_PLUGIN) class TQPalette; @@ -167,7 +167,7 @@ private: #endif }; -#endif // QT_NO_STYLE_MOTIF +#endif // TQT_NO_STYLE_MOTIF #endif // TQMOTIFSTYLE_H diff --git a/doc/html/qmousedriverfactory_qws-h.html b/doc/html/qmousedriverfactory_qws-h.html index f6560af8a..9695846a0 100644 --- a/doc/html/qmousedriverfactory_qws-h.html +++ b/doc/html/qmousedriverfactory_qws-h.html @@ -83,7 +83,7 @@ class TQWSMouseHandler; class Q_EXPORT TQMouseDriverFactory { public: -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQStringList keys(); #endif static TQWSMouseHandler *create( const TQString&, const TQString & ); diff --git a/doc/html/qmousedriverplugin_qws-h.html b/doc/html/qmousedriverplugin_qws-h.html index 049b198c0..e2e54f53e 100644 --- a/doc/html/qmousedriverplugin_qws-h.html +++ b/doc/html/qmousedriverplugin_qws-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_COMPONENT class TQWSMouseHandler; class TQMouseDriverPluginPrivate; @@ -92,7 +92,7 @@ public: TQMouseDriverPlugin(); ~TQMouseDriverPlugin(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST virtual TQStringList keys() const = 0; #endif virtual TQWSMouseHandler* create( const TQString& driver, const TQString &device ) = 0; @@ -101,7 +101,7 @@ private: TQMouseDriverPluginPrivate *d; }; -#endif // QT_NO_COMPONENT +#endif // TQT_NO_COMPONENT #endif // TQMOUSEDRIVERPLUGIN_QWS_H diff --git a/doc/html/qmovie-h.html b/doc/html/qmovie-h.html index f7838ce70..c40495763 100644 --- a/doc/html/qmovie-h.html +++ b/doc/html/qmovie-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqpixmap.h" // ### remove or keep for users' convenience? #endif // QT_H -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE class TQDataSource; class TQObject; @@ -151,7 +151,7 @@ private: TQMoviePrivate *d; }; -#endif // QT_NO_MOVIE +#endif // TQT_NO_MOVIE #endif diff --git a/doc/html/qmultilineedit-h.html b/doc/html/qmultilineedit-h.html index f4ed57349..74a310115 100644 --- a/doc/html/qmultilineedit-h.html +++ b/doc/html/qmultilineedit-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqtextedit.h" #endif // QT_H -#ifndef QT_NO_MULTILINEEDIT +#ifndef TQT_NO_MULTILINEEDIT class TQMultiLineEditCommand; class TQValidator; @@ -172,7 +172,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_MULTILINEEDIT +#endif // TQT_NO_MULTILINEEDIT #endif // TQMULTILINED_H diff --git a/doc/html/qnetworkprotocol-h.html b/doc/html/qnetworkprotocol-h.html index dae446c04..060a24447 100644 --- a/doc/html/qnetworkprotocol-h.html +++ b/doc/html/qnetworkprotocol-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL #if __GNUC__ - 0 > 3 #pragma GCC system_header @@ -275,7 +275,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_NETWORKPROTOCOL +#endif // TQT_NO_NETWORKPROTOCOL #endif // TQNETWORKPROTOCOL_H diff --git a/doc/html/qobject-h.html b/doc/html/qobject-h.html index 386e8c747..e1e15e885 100644 --- a/doc/html/qobject-h.html +++ b/doc/html/qobject-h.html @@ -94,7 +94,7 @@ class TQMetaProperty; class TQPostEventList; class TQSenderObjectList; class TQObjectPrivate; -#ifndef QT_NO_USERDATA +#ifndef TQT_NO_USERDATA class TQObjectUserData; #endif struct TQUObject; @@ -168,22 +168,22 @@ public: void dumpObjectTree(); void dumpObjectInfo(); -#ifndef QT_NO_PROPERTIES +#ifndef TQT_NO_PROPERTIES virtual bool setProperty( const char *name, const TQVariant& value ); virtual TQVariant property( const char *name ) const; -#endif // QT_NO_PROPERTIES +#endif // TQT_NO_PROPERTIES #ifdef TQT_NO_TRANSLATION static TQString tr( const char *sourceText, const char * = 0); -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC static TQString trUtf8( const char *sourceText, const char * = 0); #endif #endif //TQT_NO_TRANSLATION -#ifndef QT_NO_USERDATA +#ifndef TQT_NO_USERDATA static uint registerUserData(); void setUserData( uint id, TQObjectUserData* data); TQObjectUserData* userData( uint id ) const; -#endif // QT_NO_USERDATA +#endif // TQT_NO_USERDATA signals: void destroyed(); @@ -253,7 +253,7 @@ private: // Disabled copy constructor and operator= }; -#ifndef QT_NO_USERDATA +#ifndef TQT_NO_USERDATA class Q_EXPORT TQObjectUserData { public: virtual ~TQObjectUserData(); @@ -285,7 +285,7 @@ inline bool TQObject::disconnect( const TQObject *receiver, const char *member ) inline TQString TQObject::tr( const char *sourceText, const char * ) { return TQString::fromLatin1( sourceText ); } -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC inline TQString TQObject::trUtf8( const char *sourceText, const char * ) { return TQString::fromUtf8( sourceText ); } diff --git a/doc/html/qpainter-h.html b/doc/html/qpainter-h.html index 58e4dfd00..b3ec77851 100644 --- a/doc/html/qpainter-h.html +++ b/doc/html/qpainter-h.html @@ -172,7 +172,7 @@ public: bool hasViewXForm() const; bool hasWorldXForm() const; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS void setViewXForm( bool ); // set xform on/off TQRect window() const; // get window void setWindow( const TQRect & ); // set window @@ -253,7 +253,7 @@ public: int index=0, int npoints=-1 ); void drawConvexPolygon( const TQPointArray &, int index=0, int npoints=-1 ); -#ifndef QT_NO_BEZIER +#ifndef TQT_NO_BEZIER void drawCubicBezier( const TQPointArray &, int index=0 ); #endif void drawPixmap( int x, int y, const TQPixmap &, @@ -275,7 +275,7 @@ public: void drawTiledPixmap( const TQRect &, const TQPixmap &, const TQPoint & ); void drawTiledPixmap( const TQRect &, const TQPixmap & ); -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE void drawPicture( const TQPicture & ); void drawPicture( int x, int y, const TQPicture & ); void drawPicture( const TQPoint &, const TQPicture & ); @@ -338,7 +338,7 @@ private: void updateFont(); void updatePen(); void updateBrush(); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS void updateXForm(); void updateInvXForm(); #endif @@ -380,7 +380,7 @@ private: bool block_ext; // for temporary blocking of external devices // Transformations -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQCOORD wx, wy, ww, wh; TQCOORD vx, vy, vw, vh; TQWMatrix wxmat; @@ -535,7 +535,7 @@ inline const TQPoint &TQPainter::brushOrigin() const inline bool TQPainter::hasViewXForm() const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS return testf(VxF); #else return xlatex || xlatey; @@ -544,7 +544,7 @@ inline bool TQPainter::hasViewXForm() const inline bool TQPainter::hasWorldXForm() const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS return testf(WxF); #else return xlatex || xlatey; @@ -553,7 +553,7 @@ inline bool TQPainter::hasWorldXForm() const inline double TQPainter::translationX() const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS return worldMatrix().dx(); #else return xlatex; @@ -562,7 +562,7 @@ inline double TQPainter::translationX() const inline double TQPainter::translationY() const { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS return worldMatrix().dy(); #else return xlatey; @@ -602,7 +602,7 @@ inline void TQPainter::setBrushOrigin( const TQPoint &p ) setBrushOrigin( p.x(), p.y() ); } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS inline void TQPainter::setWindow( const TQRect &r ) { setWindow( r.x(), r.y(), r.width(), r.height() ); diff --git a/doc/html/qpair-h.html b/doc/html/qpair-h.html index 615108d77..7ae8495d4 100644 --- a/doc/html/qpair-h.html +++ b/doc/html/qpair-h.html @@ -125,7 +125,7 @@ Q_INLINE_TEMPLATES TQPair<T1, T2> qMakePair( const T1& x, const T2& return TQPair<T1, T2>( x, y ); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM template <class T1, class T2> inline TQDataStream& operator>>( TQDataStream& s, TQPair<T1, T2>& p ) { diff --git a/doc/html/qpalette-h.html b/doc/html/qpalette-h.html index 81a216319..6d36bf14a 100644 --- a/doc/html/qpalette-h.html +++ b/doc/html/qpalette-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #include "ntqbrush.h" // TQColor->TQBrush conversion #endif // QT_H -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE class TQColorGroupPrivate; @@ -213,15 +213,15 @@ private: TQColorGroup/TQPalette stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColorGroup & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQColorGroup & ); Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPalette & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPalette & ); -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM -#endif // QT_NO_PALETTE +#endif // TQT_NO_PALETTE #endif // TQPALETTE_H diff --git a/doc/html/qpen-h.html b/doc/html/qpen-h.html index 534c7bcd0..f7b0cf46b 100644 --- a/doc/html/qpen-h.html +++ b/doc/html/qpen-h.html @@ -130,7 +130,7 @@ private: /***************************************************************************** TQPen stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & ); #endif diff --git a/doc/html/qpicture-h.html b/doc/html/qpicture-h.html index ebcfba189..d357c5321 100644 --- a/doc/html/qpicture-h.html +++ b/doc/html/qpicture-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqbuffer.h" #endif // QT_H -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE class Q_EXPORT TQPicture : public TQPaintDevice // picture class { @@ -158,7 +158,7 @@ inline const char* TQPicture::data() const Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPicture & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPicture & ); -#endif // QT_NO_PICTURE +#endif // TQT_NO_PICTURE #endif // TQPICTURE_H diff --git a/doc/html/qpixmap-h.html b/doc/html/qpixmap-h.html index bdf236a2e..385bd696f 100644 --- a/doc/html/qpixmap-h.html +++ b/doc/html/qpixmap-h.html @@ -104,7 +104,7 @@ public: TQPixmap( const TQImage& image ); TQPixmap( int w, int h, int depth = -1, Optimization = DefaultOptim ); TQPixmap( const TQSize &, int depth = -1, Optimization = DefaultOptim ); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQPixmap( const TQString& fileName, const char *format=0, ColorMode mode=Auto ); TQPixmap( const TQString& fileName, const char *format, @@ -138,17 +138,17 @@ public: bool selfMask() const; bool hasAlpha() const; bool hasAlphaChannel() const; -#ifndef QT_NO_IMAGE_HEURISTIC_MASK +#ifndef TQT_NO_IMAGE_HEURISTIC_MASK TQBitmap createHeuristicMask( bool clipTight = TRUE ) const; #endif -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME static TQPixmap fromMimeSource( const TQString& abs_name ); #endif static TQPixmap grabWindow( WId, int x=0, int y=0, int w=-1, int h=-1 ); static TQPixmap grabWidget( TQWidget * widget, int x=0, int y=0, int w=-1, int h=-1 ); -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION TQPixmap xForm( const TQWMatrix & ) const; static TQWMatrix trueMatrix( const TQWMatrix &, int w, int h ); #endif @@ -156,7 +156,7 @@ public: TQImage convertToImage() const; bool convertFromImage( const TQImage &, ColorMode mode=Auto ); bool convertFromImage( const TQImage &, int conversion_flags ); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO static const char* imageFormat( const TQString &fileName ); bool load( const TQString& fileName, const char *format=0, ColorMode mode=Auto ); @@ -268,7 +268,7 @@ protected: #endif } *data; private: -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool doImageIO( TQImageIO* io, int quality ) const; #endif TQPixmap( int w, int h, int depth, bool, Optimization ); @@ -365,7 +365,7 @@ inline bool TQPixmap::isMultiCellPixmap() const TQPixmap stream functions *****************************************************************************/ -#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO) +#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO) Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPixmap & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & ); #endif @@ -374,7 +374,7 @@ Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & TQPixmap (and TQImage) helper functions *****************************************************************************/ -#ifndef QT_NO_PIXMAP_TRANSFORMATION +#ifndef TQT_NO_PIXMAP_TRANSFORMATION # define QT_XFORM_TYPE_MSBFIRST 0 # define QT_XFORM_TYPE_LSBFIRST 1 # if defined(Q_WS_WIN) diff --git a/doc/html/qplatinumstyle-h.html b/doc/html/qplatinumstyle-h.html index 28ea36524..420dc72a1 100644 --- a/doc/html/qplatinumstyle-h.html +++ b/doc/html/qplatinumstyle-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqwindowsstyle.h" #endif // QT_H -#if !defined(QT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN) +#if !defined(TQT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN) class TQPalette; @@ -148,7 +148,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_STYLE_PLATINUM +#endif // TQT_NO_STYLE_PLATINUM #endif // TQPLATINUMSTYLE_H diff --git a/doc/html/qpngio-h.html b/doc/html/qpngio-h.html index 3dd8321f4..912d1c5a5 100644 --- a/doc/html/qpngio-h.html +++ b/doc/html/qpngio-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqimage.h" #endif // QT_H -#ifndef QT_NO_IMAGEIO_PNG +#ifndef TQT_NO_IMAGEIO_PNG void qInitPngIO(); @@ -138,7 +138,7 @@ private: int alignx; }; -#endif // QT_NO_IMAGEIO_PNG +#endif // TQT_NO_IMAGEIO_PNG #endif // TQPNGIO_H diff --git a/doc/html/qpoint-h.html b/doc/html/qpoint-h.html index 7bf09fc25..f1e7d8442 100644 --- a/doc/html/qpoint-h.html +++ b/doc/html/qpoint-h.html @@ -135,7 +135,7 @@ private: /***************************************************************************** TQPoint stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPoint & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPoint & ); #endif diff --git a/doc/html/qpointarray-h.html b/doc/html/qpointarray-h.html index 79941c3e8..fa7642845 100644 --- a/doc/html/qpointarray-h.html +++ b/doc/html/qpointarray-h.html @@ -121,7 +121,7 @@ public: void makeEllipse( int x, int y, int w, int h ); void makeArc( int x, int y, int w, int h, int a1, int a2, const TQWMatrix& ); -#ifndef QT_NO_BEZIER +#ifndef TQT_NO_BEZIER TQPointArray cubicBezier() const; #endif void* shortPoints( int index = 0, int nPoints = -1 ) const; @@ -136,7 +136,7 @@ protected: /***************************************************************************** TQPointArray stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPointArray & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPointArray & ); #endif diff --git a/doc/html/qpopupmenu-h.html b/doc/html/qpopupmenu-h.html index 0c7c64ffc..796e3dcf3 100644 --- a/doc/html/qpopupmenu-h.html +++ b/doc/html/qpopupmenu-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqmenudata.h" #endif // QT_H -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU class TQPopupMenuPrivate; class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData @@ -157,7 +157,7 @@ protected: private slots: void subActivated( int itemId ); void subHighlighted( int itemId ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void accelActivated( int itemId ); void accelDestroyed(); #endif @@ -191,12 +191,12 @@ private: TQSize updateSize(bool force_recalc=FALSE, bool do_resize=TRUE); void updateRow( int row ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL void updateAccel( TQWidget * ); void enableAccel( bool ); #endif TQPopupMenuPrivate *d; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQAccel *autoaccel; #endif @@ -231,7 +231,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_POPUPMENU +#endif // TQT_NO_POPUPMENU #endif // TQPOPUPMENU_H diff --git a/doc/html/qprinter-h.html b/doc/html/qprinter-h.html index ed1dad1a5..f5ecfcb07 100644 --- a/doc/html/qprinter-h.html +++ b/doc/html/qprinter-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER #if defined(B0) #undef B0 // Terminal hang-up. We assume that you do not want that. @@ -315,7 +315,7 @@ inline bool TQPrinter::collateCopies() const { return usercolcopies; } -#endif // QT_NO_PRINTER +#endif // TQT_NO_PRINTER #endif // TQPRINTER_H diff --git a/doc/html/qprocess-h.html b/doc/html/qprocess-h.html index 7ad8847c6..67a39f400 100644 --- a/doc/html/qprocess-h.html +++ b/doc/html/qprocess-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqdir.h" #endif // QT_H -#ifndef QT_NO_PROCESS +#ifndef TQT_NO_PROCESS class TQProcessPrivate; class TQMembuf; @@ -103,7 +103,7 @@ public: void clearArguments(); virtual void setArguments( const TQStringList& args ); virtual void addArgument( const TQString& arg ); -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQDir workingDirectory() const; virtual void setWorkingDirectory( const TQDir& dir ); #endif @@ -182,7 +182,7 @@ private slots: private: TQProcessPrivate *d; -#ifndef QT_NO_DIR +#ifndef TQT_NO_DIR TQDir workingDir; #endif TQStringList _arguments; @@ -209,7 +209,7 @@ private: #endif }; -#endif // QT_NO_PROCESS +#endif // TQT_NO_PROCESS #endif // TQPROCESS_H diff --git a/doc/html/qprogressbar-h.html b/doc/html/qprogressbar-h.html index fa4efc722..d7facb641 100644 --- a/doc/html/qprogressbar-h.html +++ b/doc/html/qprogressbar-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_PROGRESSBAR +#ifndef TQT_NO_PROGRESSBAR class TQProgressBarPrivate; @@ -180,7 +180,7 @@ inline bool TQProgressBar::percentageVisible() const return percentage_visible; } -#endif // QT_NO_PROGRESSBAR +#endif // TQT_NO_PROGRESSBAR #endif // TQPROGRESSBAR_H diff --git a/doc/html/qprogressdialog-h.html b/doc/html/qprogressdialog-h.html index b18795a3c..68f68de08 100644 --- a/doc/html/qprogressdialog-h.html +++ b/doc/html/qprogressdialog-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqprogressbar.h" // ### remove or keep for users' convenience? #endif // QT_H -#ifndef QT_NO_PROGRESSDIALOG +#ifndef TQT_NO_PROGRESSDIALOG class TQPushButton; class TQTimer; @@ -172,7 +172,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_PROGRESSDIALOG +#endif // TQT_NO_PROGRESSDIALOG #endif // TQPROGRESSDIALOG_H diff --git a/doc/html/qpushbutton-h.html b/doc/html/qpushbutton-h.html index d6f2550ee..d3c85b509 100644 --- a/doc/html/qpushbutton-h.html +++ b/doc/html/qpushbutton-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_PUSHBUTTON +#ifndef TQT_NO_PUSHBUTTON class TQPushButtonPrivate; class TQPopupMenu; @@ -102,7 +102,7 @@ class Q_EXPORT TQPushButton : public TQButton public: TQPushButton( TQWidget *parent, const char* name=0 ); TQPushButton( const TQString &text, TQWidget *parent, const char* name=0 ); -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET TQPushButton( const TQIconSet& icon, const TQString &text, TQWidget *parent, const char* name=0 ); #endif ~TQPushButton(); @@ -133,11 +133,11 @@ public: } bool isMenuButton() const { return hasMenuArrow; } -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU void setPopup( TQPopupMenu* popup ); TQPopupMenu* popup() const; #endif -#ifndef QT_NO_ICONSET +#ifndef TQT_NO_ICONSET void setIconSet( const TQIconSet& ); TQIconSet* iconSet() const; #endif @@ -155,7 +155,7 @@ protected: void resizeEvent( TQResizeEvent * ); void updateMask(); private slots: -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU void popupPressed(); #endif private: @@ -180,7 +180,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_PUSHBUTTON +#endif // TQT_NO_PUSHBUTTON #endif // TQPUSHBUTTON_H diff --git a/doc/html/qradiobutton-h.html b/doc/html/qradiobutton-h.html index 61808973c..dcd55c0f9 100644 --- a/doc/html/qradiobutton-h.html +++ b/doc/html/qradiobutton-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqbutton.h" #endif // QT_H -#ifndef QT_NO_RADIOBUTTON +#ifndef TQT_NO_RADIOBUTTON class Q_EXPORT TQRadioButton : public TQButton { @@ -122,7 +122,7 @@ private: // Disabled copy constructor and operator= inline bool TQRadioButton::isChecked() const { return isOn(); } -#endif // QT_NO_RADIOBUTTON +#endif // TQT_NO_RADIOBUTTON #endif // TQRADIOBUTTON_H diff --git a/doc/html/qrangecontrol-h.html b/doc/html/qrangecontrol-h.html index 73b90d814..6d4ea8b21 100644 --- a/doc/html/qrangecontrol-h.html +++ b/doc/html/qrangecontrol-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_RANGECONTROL +#ifndef TQT_NO_RANGECONTROL class TQRangeControlPrivate; @@ -158,9 +158,9 @@ inline int TQRangeControl::pageStep() const { return page; } -#endif // QT_NO_RANGECONTROL +#endif // TQT_NO_RANGECONTROL -#ifndef QT_NO_SPINWIDGET +#ifndef TQT_NO_SPINWIDGET class TQSpinWidgetPrivate; class Q_EXPORT TQSpinWidget : public TQWidget @@ -201,7 +201,7 @@ protected: void resizeEvent( TQResizeEvent* ev ); void mouseReleaseEvent( TQMouseEvent *e ); void mouseMoveEvent( TQMouseEvent *e ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void styleChange( TQStyle& ); @@ -225,7 +225,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_SPINWIDGET +#endif // TQT_NO_SPINWIDGET #endif // TQRANGECONTROL_H diff --git a/doc/html/qrect-h.html b/doc/html/qrect-h.html index 6f8f181e7..80cd610c2 100644 --- a/doc/html/qrect-h.html +++ b/doc/html/qrect-h.html @@ -194,7 +194,7 @@ Q_EXPORT bool operator!=( const TQRect &, const TQRect & ); /***************************************************************************** TQRect stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRect & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRect & ); #endif diff --git a/doc/html/qregexp-h.html b/doc/html/qregexp-h.html index f4e715c63..3df950356 100644 --- a/doc/html/qregexp-h.html +++ b/doc/html/qregexp-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP class TQRegExpEngine; struct TQRegExpPrivate; @@ -106,7 +106,7 @@ public: void setPattern( const TQString& pattern ); bool caseSensitive() const; void setCaseSensitive( bool sensitive ); -#ifndef QT_NO_REGEXP_WILDCARD +#ifndef TQT_NO_REGEXP_WILDCARD bool wildcard() const; void setWildcard( bool wildcard ); #endif @@ -132,7 +132,7 @@ public: int searchRev( const TQString& str, int offset, CaretMode caretMode ) const; #endif int matchedLength() const; -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE int numCaptures() const; TQStringList capturedTexts(); TQString cap( int nth = 0 ); @@ -152,7 +152,7 @@ private: TQRegExpEngine *eng; TQRegExpPrivate *priv; }; -#endif // QT_NO_REGEXP +#endif // TQT_NO_REGEXP #endif // TQREGEXP_H diff --git a/doc/html/qregion-h.html b/doc/html/qregion-h.html index c7aee76dc..f17432a4d 100644 --- a/doc/html/qregion-h.html +++ b/doc/html/qregion-h.html @@ -143,7 +143,7 @@ public: void * handle() const { return data->rgn; } #endif -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & ); friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & ); #endif @@ -204,7 +204,7 @@ private: TQRegion stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & ); #endif diff --git a/doc/html/qrtlcodec-h.html b/doc/html/qrtlcodec-h.html index d281fa4a9..9b99ec993 100644 --- a/doc/html/qrtlcodec-h.html +++ b/doc/html/qrtlcodec-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_CODEC_HEBREW +#ifndef TQT_NO_CODEC_HEBREW class Q_EXPORT TQHebrewCodec : public TQTextCodec { public: diff --git a/doc/html/qscrollbar-h.html b/doc/html/qscrollbar-h.html index 02bf7cec7..bb6fa8431 100644 --- a/doc/html/qscrollbar-h.html +++ b/doc/html/qscrollbar-h.html @@ -84,7 +84,7 @@ class TQTimer; #include "ntqrangecontrol.h" #endif // QT_H -#ifndef QT_NO_SCROLLBAR +#ifndef TQT_NO_SCROLLBAR class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl { @@ -143,7 +143,7 @@ signals: void prevPage(); protected: -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void keyPressEvent( TQKeyEvent * ); @@ -228,7 +228,7 @@ inline void TQScrollBar::setSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy } -#endif // QT_NO_SCROLLBAR +#endif // TQT_NO_SCROLLBAR #endif // TQSCROLLBAR_H diff --git a/doc/html/qscrollview-h.html b/doc/html/qscrollview-h.html index 434897146..967f37e7d 100644 --- a/doc/html/qscrollview-h.html +++ b/doc/html/qscrollview-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqscrollbar.h" #endif // QT_H -#ifndef QT_NO_SCROLLVIEW +#ifndef TQT_NO_SCROLLVIEW class TQScrollViewData; @@ -98,7 +98,7 @@ class Q_EXPORT TQScrollView : public TQFrame TQ_PROPERTY( int contentsHeight READ contentsHeight ) TQ_PROPERTY( int contentsX READ contentsX ) TQ_PROPERTY( int contentsY READ contentsY ) -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP TQ_PROPERTY( bool dragAutoScroll READ dragAutoScroll WRITE setDragAutoScroll ) #endif @@ -178,7 +178,7 @@ public: bool isHorizontalSliderPressed(); bool isVerticalSliderPressed(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void setDragAutoScroll( bool b ); bool dragAutoScroll() const; #endif @@ -212,13 +212,13 @@ protected: virtual void contentsMouseReleaseEvent( TQMouseEvent* ); virtual void contentsMouseDoubleClickEvent( TQMouseEvent* ); virtual void contentsMouseMoveEvent( TQMouseEvent* ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void contentsDragEnterEvent( TQDragEnterEvent * ); virtual void contentsDragMoveEvent( TQDragMoveEvent * ); virtual void contentsDragLeaveEvent( TQDragLeaveEvent * ); virtual void contentsDropEvent( TQDropEvent * ); #endif -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT virtual void contentsWheelEvent( TQWheelEvent * ); #endif virtual void contentsContextMenuEvent( TQContextMenuEvent * ); @@ -230,13 +230,13 @@ protected: virtual void viewportMouseReleaseEvent( TQMouseEvent* ); virtual void viewportMouseDoubleClickEvent( TQMouseEvent* ); virtual void viewportMouseMoveEvent( TQMouseEvent* ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void viewportDragEnterEvent( TQDragEnterEvent * ); virtual void viewportDragMoveEvent( TQDragMoveEvent * ); virtual void viewportDragLeaveEvent( TQDragLeaveEvent * ); virtual void viewportDropEvent( TQDropEvent * ); #endif -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT virtual void viewportWheelEvent( TQWheelEvent * ); #endif virtual void viewportContextMenuEvent( TQContextMenuEvent * ); @@ -259,7 +259,7 @@ protected: void mouseReleaseEvent( TQMouseEvent * ); void mouseDoubleClickEvent( TQMouseEvent * ); void mouseMoveEvent( TQMouseEvent * ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void contextMenuEvent( TQContextMenuEvent * ); @@ -282,7 +282,7 @@ private slots: void hbarIsReleased(); void vbarIsPressed(); void vbarIsReleased(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void doDragAutoScroll(); void startDragAutoScroll(); void stopDragAutoScroll(); @@ -300,7 +300,7 @@ public: }; -#endif // QT_NO_SCROLLVIEW +#endif // TQT_NO_SCROLLVIEW #endif // TQSCROLLVIEW_H diff --git a/doc/html/qserversocket-h.html b/doc/html/qserversocket-h.html index 0d02f3224..36ce1f7b6 100644 --- a/doc/html/qserversocket-h.html +++ b/doc/html/qserversocket-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqhostaddress.h" #include "ntqsocketdevice.h" // ### remove or keep for users' convenience? #endif // QT_H -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) #define TQM_EXPORT_NETWORK @@ -126,7 +126,7 @@ private: void init( const TQHostAddress & address, TQ_UINT16 port, int backlog ); }; -#endif // QT_NO_NETWORK +#endif // TQT_NO_NETWORK #endif // TQSERVERSOCKET_H diff --git a/doc/html/qsessionmanager-h.html b/doc/html/qsessionmanager-h.html index 1f59a3764..6a5921861 100644 --- a/doc/html/qsessionmanager-h.html +++ b/doc/html/qsessionmanager-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqstring.h" #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_SESSIONMANAGER +#ifndef TQT_NO_SESSIONMANAGER class TQSessionManagerData; @@ -131,7 +131,7 @@ private: TQSessionManagerData* d; }; -#endif // QT_NO_SESSIONMANAGER +#endif // TQT_NO_SESSIONMANAGER #endif // TQSESSIONMANAGER_H diff --git a/doc/html/qsettings-h.html b/doc/html/qsettings-h.html index 70419ed37..9c77f7ef5 100644 --- a/doc/html/qsettings-h.html +++ b/doc/html/qsettings-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_SETTINGS +#ifndef TQT_NO_SETTINGS class TQSettingsPrivate; @@ -191,7 +191,7 @@ private: friend class TQApplication; }; -#endif // QT_NO_SETTINGS +#endif // TQT_NO_SETTINGS #endif // TQSETTINGS_H diff --git a/doc/html/qsgistyle-h.html b/doc/html/qsgistyle-h.html index e5a314bef..d7c063f5f 100644 --- a/doc/html/qsgistyle-h.html +++ b/doc/html/qsgistyle-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqwidget.h" #endif // QT_H -#if !defined(QT_NO_STYLE_SGI) || defined(QT_PLUGIN) +#if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_SGI @@ -164,7 +164,7 @@ private: }; -#endif // QT_NO_STYLE_SGI +#endif // TQT_NO_STYLE_SGI #endif // TQSGISTYLE_H diff --git a/doc/html/qsignal-h.html b/doc/html/qsignal-h.html index 2ccc58664..f2fd71e50 100644 --- a/doc/html/qsignal-h.html +++ b/doc/html/qsignal-h.html @@ -99,24 +99,24 @@ public: #ifndef TQT_NO_COMPAT bool isBlocked() const { return TQObject::signalsBlocked(); } void block( bool b ) { TQObject::blockSignals( b ); } -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT void setParameter( int value ); int parameter() const; #endif #endif -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT void setValue( const TQVariant &value ); TQVariant value() const; #endif signals: -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT void signal( const TQVariant& ); #endif void intSignal( int ); private: -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT TQVariant val; #endif private: // Disabled copy constructor and operator= diff --git a/doc/html/qsignalmapper-h.html b/doc/html/qsignalmapper-h.html index a2607504d..f0e574ddd 100644 --- a/doc/html/qsignalmapper-h.html +++ b/doc/html/qsignalmapper-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #ifndef QT_H #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_SIGNALMAPPER +#ifndef TQT_NO_SIGNALMAPPER class TQSignalMapperData; struct TQSignalMapperRec; @@ -110,7 +110,7 @@ private slots: void removeMapping(); }; -#endif // QT_NO_SIGNALMAPPER +#endif // TQT_NO_SIGNALMAPPER #endif // TQSIGNALMAPPER_H diff --git a/doc/html/qsimplerichtext-h.html b/doc/html/qsimplerichtext-h.html index ec8eb7f46..3db84db39 100644 --- a/doc/html/qsimplerichtext-h.html +++ b/doc/html/qsimplerichtext-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqregion.h" #endif // QT_H -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT class TQPainter; class TQWidget; @@ -135,7 +135,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_RICHTEXT +#endif // TQT_NO_RICHTEXT #endif // TQSIMPLERICHTEXT_H diff --git a/doc/html/qsizegrip-h.html b/doc/html/qsizegrip-h.html index 53d49eccb..fa1f1234e 100644 --- a/doc/html/qsizegrip-h.html +++ b/doc/html/qsizegrip-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_SIZEGRIP +#ifndef TQT_NO_SIZEGRIP class Q_EXPORT TQSizeGrip: public TQWidget { @@ -106,7 +106,7 @@ private: TQWidget *tlw; }; -#endif //QT_NO_SIZEGRIP +#endif //TQT_NO_SIZEGRIP #endif diff --git a/doc/html/qsjiscodec-h.html b/doc/html/qsjiscodec-h.html index 2e36feb9b..c209770df 100644 --- a/doc/html/qsjiscodec-h.html +++ b/doc/html/qsjiscodec-h.html @@ -111,7 +111,7 @@ body { background: #ffffff; color: black; } #include "ntqjpunicode.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP diff --git a/doc/html/qslider-h.html b/doc/html/qslider-h.html index 27aa31775..bca498b70 100644 --- a/doc/html/qslider-h.html +++ b/doc/html/qslider-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqrangecontrol.h" #endif // QT_H -#ifndef QT_NO_SLIDER +#ifndef TQT_NO_SLIDER struct TQSliderPrivate; @@ -164,7 +164,7 @@ protected: void mousePressEvent( TQMouseEvent * ); void mouseReleaseEvent( TQMouseEvent * ); void mouseMoveEvent( TQMouseEvent * ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void focusInEvent( TQFocusEvent *e ); @@ -230,7 +230,7 @@ inline void TQSlider::setSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::S TQWidget::setSizePolicy( hor, ver, hfw ); } -#endif // QT_NO_SLIDER +#endif // TQT_NO_SLIDER #endif // TQSLIDER_H diff --git a/doc/html/qsocket-h.html b/doc/html/qsocket-h.html index 8c38e4b3a..fcdddeb8e 100644 --- a/doc/html/qsocket-h.html +++ b/doc/html/qsocket-h.html @@ -89,7 +89,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_NETWORK Q_EXPORT #endif -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK class TQSocketPrivate; class TQSocketDevice; @@ -118,7 +118,7 @@ public: TQSocketDevice *socketDevice(); virtual void setSocketDevice( TQSocketDevice * ); -#ifndef QT_NO_DNS +#ifndef TQT_NO_DNS virtual void connectToHost( const TQString &host, TQ_UINT16 port ); #endif TQString peerName() const; @@ -188,7 +188,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif //QT_NO_NETWORK +#endif //TQT_NO_NETWORK #endif // TQSOCKET_H diff --git a/doc/html/qsocketdevice-h.html b/doc/html/qsocketdevice-h.html index ec25468a1..697e1abe0 100644 --- a/doc/html/qsocketdevice-h.html +++ b/doc/html/qsocketdevice-h.html @@ -88,7 +88,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_NETWORK Q_EXPORT #endif -#ifndef QT_NO_NETWORK +#ifndef TQT_NO_NETWORK class TQSocketDevicePrivate; @@ -202,7 +202,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_NETWORK +#endif // TQT_NO_NETWORK #endif // TQSOCKETDEVICE_H diff --git a/doc/html/qsound-h.html b/doc/html/qsound-h.html index 11bd98d6b..7f9c5e886 100644 --- a/doc/html/qsound-h.html +++ b/doc/html/qsound-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_SOUND +#ifndef TQT_NO_SOUND class TQSoundData; @@ -156,7 +156,7 @@ protected: int decLoop(TQSound*); }; -#endif // QT_NO_SOUND +#endif // TQT_NO_SOUND #endif diff --git a/doc/html/qspinbox-h.html b/doc/html/qspinbox-h.html index b8b9053c7..d74e72159 100644 --- a/doc/html/qspinbox-h.html +++ b/doc/html/qspinbox-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqrangecontrol.h" #endif // QT_H -#ifndef QT_NO_SPINBOX +#ifndef TQT_NO_SPINBOX class TQLineEdit; class TQValidator; @@ -171,7 +171,7 @@ protected: bool eventFilter( TQObject* obj, TQEvent* ev ); void resizeEvent( TQResizeEvent* ev ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent * ); #endif void leaveEvent( TQEvent* ); @@ -203,7 +203,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_SPINBOX +#endif // TQT_NO_SPINBOX #endif // TQSPINBOX_H diff --git a/doc/html/qsplashscreen-h.html b/doc/html/qsplashscreen-h.html index 94257eb2d..f4670f7f1 100644 --- a/doc/html/qsplashscreen-h.html +++ b/doc/html/qsplashscreen-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_SPLASHSCREEN +#ifndef TQT_NO_SPLASHSCREEN class TQSplashScreenPrivate; class Q_EXPORT TQSplashScreen : public TQWidget @@ -112,7 +112,7 @@ private: TQSplashScreenPrivate *d; }; -#endif //QT_NO_SPLASHSCREEN +#endif //TQT_NO_SPLASHSCREEN #endif diff --git a/doc/html/qsplitter-h.html b/doc/html/qsplitter-h.html index 8e81dbb2b..3e17e13a3 100644 --- a/doc/html/qsplitter-h.html +++ b/doc/html/qsplitter-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqvaluelist.h" #endif // QT_H -#ifndef QT_NO_SPLITTER +#ifndef TQT_NO_SPLITTER class TQSplitterHandle; class TQSplitterPrivate; @@ -183,7 +183,7 @@ private: Orientation orient; friend class TQSplitterHandle; -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM friend Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); friend Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); #endif @@ -195,12 +195,12 @@ private: #endif }; -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& ); Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& ); #endif -#endif // QT_NO_SPLITTER +#endif // TQT_NO_SPLITTER #endif // TQSPLITTER_H diff --git a/doc/html/qsql-h.html b/doc/html/qsql-h.html index e60370c4e..86dde02e7 100644 --- a/doc/html/qsql-h.html +++ b/doc/html/qsql-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQM_EXPORT_SQL TQSql { diff --git a/doc/html/qsqlcursor-h.html b/doc/html/qsqlcursor-h.html index dad0b5863..577df0e67 100644 --- a/doc/html/qsqlcursor-h.html +++ b/doc/html/qsqlcursor-h.html @@ -89,7 +89,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlDatabase; class TQSqlCursorPrivate; @@ -191,7 +191,7 @@ private: -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/doc/html/qsqldatabase-h.html b/doc/html/qsqldatabase-h.html index 0df9a9860..83dd396f2 100644 --- a/doc/html/qsqldatabase-h.html +++ b/doc/html/qsqldatabase-h.html @@ -89,7 +89,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlError; class TQSqlDriver; @@ -186,7 +186,7 @@ private: }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/doc/html/qsqldriver-h.html b/doc/html/qsqldriver-h.html index 629a07584..1c221ab33 100644 --- a/doc/html/qsqldriver-h.html +++ b/doc/html/qsqldriver-h.html @@ -94,7 +94,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlDriverExtension; @@ -156,7 +156,7 @@ private: #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/doc/html/qsqldriverplugin-h.html b/doc/html/qsqldriverplugin-h.html index e9935ce22..963731623 100644 --- a/doc/html/qsqldriverplugin-h.html +++ b/doc/html/qsqldriverplugin-h.html @@ -82,8 +82,8 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_SQL -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_SQL +#ifndef TQT_NO_COMPONENT class TQSqlDriver; class TQSqlDriverPluginPrivate; @@ -102,8 +102,8 @@ private: TQSqlDriverPluginPrivate *d; }; -#endif // QT_NO_COMPONENT -#endif // QT_NO_SQL +#endif // TQT_NO_COMPONENT +#endif // TQT_NO_SQL #endif // TQSQLDRIVERPLUGIN_H diff --git a/doc/html/qsqleditorfactory-h.html b/doc/html/qsqleditorfactory-h.html index 7ce6e30d2..2f6a63cdb 100644 --- a/doc/html/qsqleditorfactory-h.html +++ b/doc/html/qsqleditorfactory-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_EDIT_WIDGETS +#ifndef TQT_NO_SQL_EDIT_WIDGETS class TQSqlField; @@ -108,7 +108,7 @@ private: #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif // TQSQLEDITORFACTORY_H diff --git a/doc/html/qsqlerror-h.html b/doc/html/qsqlerror-h.html index 537511ffb..0dda255a7 100644 --- a/doc/html/qsqlerror-h.html +++ b/doc/html/qsqlerror-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQM_EXPORT_SQL TQSqlError { @@ -124,7 +124,7 @@ private: int errorNumber; }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/doc/html/qsqlfield-h.html b/doc/html/qsqlfield-h.html index b3707d4a1..c4fec20bf 100644 --- a/doc/html/qsqlfield-h.html +++ b/doc/html/qsqlfield-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlFieldPrivate { @@ -185,7 +185,7 @@ private: }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/doc/html/qsqlform-h.html b/doc/html/qsqlform-h.html index 597b21a52..87cac2b77 100644 --- a/doc/html/qsqlform-h.html +++ b/doc/html/qsqlform-h.html @@ -87,7 +87,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL_FORM +#ifndef TQT_NO_SQL_FORM class TQSqlField; class TQSqlRecord; @@ -139,7 +139,7 @@ private: #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif // TQSQLFORM_H diff --git a/doc/html/qsqlindex-h.html b/doc/html/qsqlindex-h.html index 0d399dc5a..18fe46b21 100644 --- a/doc/html/qsqlindex-h.html +++ b/doc/html/qsqlindex-h.html @@ -91,7 +91,7 @@ body { background: #ffffff; color: black; } #define TQM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlCursor; @@ -130,7 +130,7 @@ private: #define Q_DEFINED_QSQLINDEX #include "ntqwinexport.h" -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/doc/html/qsqlpropertymap-h.html b/doc/html/qsqlpropertymap-h.html index ea8a05617..7d7439983 100644 --- a/doc/html/qsqlpropertymap-h.html +++ b/doc/html/qsqlpropertymap-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_SQL_FORM +#ifndef TQT_NO_SQL_FORM class TQWidget; class TQSqlPropertyMapPrivate; @@ -109,7 +109,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_SQL_FORM +#endif // TQT_NO_SQL_FORM #endif // TQSQLPROPERTYMAP_H diff --git a/doc/html/qsqlquery-h.html b/doc/html/qsqlquery-h.html index 503102071..9d3161d16 100644 --- a/doc/html/qsqlquery-h.html +++ b/doc/html/qsqlquery-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #include "ntqsql.h" #endif // QT_H -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlDriver; class TQSqlResult; @@ -164,7 +164,7 @@ private: }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/doc/html/qsqlrecord-h.html b/doc/html/qsqlrecord-h.html index 69917fcc3..430200fca 100644 --- a/doc/html/qsqlrecord-h.html +++ b/doc/html/qsqlrecord-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqsqlfield.h" #endif // QT_H -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlRecordPrivate; @@ -172,7 +172,7 @@ public: }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/doc/html/qsqlresult-h.html b/doc/html/qsqlresult-h.html index 7846bc640..50980a7b3 100644 --- a/doc/html/qsqlresult-h.html +++ b/doc/html/qsqlresult-h.html @@ -90,7 +90,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlDriver; class TQSql; @@ -146,7 +146,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif diff --git a/doc/html/qsqlselectcursor-h.html b/doc/html/qsqlselectcursor-h.html index 7641c4423..be80501b7 100644 --- a/doc/html/qsqlselectcursor-h.html +++ b/doc/html/qsqlselectcursor-h.html @@ -86,7 +86,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_SQL Q_EXPORT #endif -#ifndef QT_NO_SQL +#ifndef TQT_NO_SQL class TQSqlSelectCursorPrivate; @@ -135,7 +135,7 @@ private: TQSqlSelectCursorPrivate * d; }; -#endif // QT_NO_SQL +#endif // TQT_NO_SQL #endif // TQSQLSELECTCURSOR_H diff --git a/doc/html/qstatusbar-h.html b/doc/html/qstatusbar-h.html index c73341abd..c7ba0b143 100644 --- a/doc/html/qstatusbar-h.html +++ b/doc/html/qstatusbar-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_STATUSBAR +#ifndef TQT_NO_STATUSBAR class TQStatusBarPrivate; @@ -127,7 +127,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_STATUSBAR +#endif // TQT_NO_STATUSBAR #endif // TQSTATUSBAR_H diff --git a/doc/html/qstring-h.html b/doc/html/qstring-h.html index d71af1745..272e62586 100644 --- a/doc/html/qstring-h.html +++ b/doc/html/qstring-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqcstring.h" #endif // QT_H -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII #include <limits.h> #endif @@ -237,7 +237,7 @@ public: #else ushort &unicode() { return ucs; } #endif -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII // like all ifdef'd code this is undocumented operator char() const { return latin1(); } #endif @@ -441,7 +441,7 @@ public: TQString( const TQString & ); // impl-shared copy TQString( const TQByteArray& ); // deep copy TQString( const TQChar* unicode, uint length ); // deep copy -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString( const char *str ); // deep copy #endif #ifndef TQT_NO_STL @@ -488,7 +488,7 @@ public: TQString arg( const TQString& a1, const TQString& a2, const TQString& a3, const TQString& a4 ) const; -#ifndef QT_NO_SPRINTF +#ifndef TQT_NO_SPRINTF TQString &sprintf( const char* format, ... ) #if defined(Q_CC_GNU) && !defined(__INSURE__) __attribute__ ((format (printf, 2, 3))) @@ -499,29 +499,29 @@ public: int find( TQChar c, int index=0, bool cs=TRUE ) const; int find( char c, int index=0, bool cs=TRUE ) const; int find( const TQString &str, int index=0, bool cs=TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int find( const TQRegExp &, int index=0 ) const; #endif -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII int find( const char* str, int index=0 ) const; #endif int findRev( TQChar c, int index=-1, bool cs=TRUE) const; int findRev( char c, int index=-1, bool cs=TRUE) const; int findRev( const TQString &str, int index=-1, bool cs=TRUE) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int findRev( const TQRegExp &, int index=-1 ) const; #endif -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII int findRev( const char* str, int index=-1 ) const; #endif int contains( TQChar c, bool cs=TRUE ) const; int contains( char c, bool cs=TRUE ) const { return contains(TQChar(c), cs); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII int contains( const char* str, bool cs=TRUE ) const; #endif int contains( const TQString &str, bool cs=TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP int contains( const TQRegExp & ) const; #endif @@ -534,11 +534,11 @@ public: }; TQString section( TQChar sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const; TQString section( char sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const; -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString section( const char *in_sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const; #endif TQString section( const TQString &in_sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP TQString section( const TQRegExp &reg, int start, int end = 0xffffffff, int flags = SectionDefault ) const; #endif @@ -556,7 +556,7 @@ public: TQString simplifyWhiteSpace() const; TQString &insert( uint index, const TQString & ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &insert( uint index, const TQByteArray & ); TQString &insert( uint index, const char * ); #endif @@ -566,21 +566,21 @@ public: TQString &append( char ); TQString &append( TQChar ); TQString &append( const TQString & ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &append( const TQByteArray & ); TQString &append( const char * ); #endif -#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII) +#if !defined(TQT_NO_STL) && !defined(TQT_NO_CAST_ASCII) TQString &append( const std::string& ); #endif TQString &prepend( char ); TQString &prepend( TQChar ); TQString &prepend( const TQString & ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &prepend( const TQByteArray & ); TQString &prepend( const char * ); #endif -#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII) +#if !defined(TQT_NO_STL) && !defined(TQT_NO_CAST_ASCII) TQString &prepend( const std::string& ); #endif TQString &remove( uint index, uint len ); @@ -594,10 +594,10 @@ public: TQString &remove( TQChar c ); TQString &remove( char c ) { return remove( TQChar(c) ); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &remove( const char * ); #endif -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP TQString &remove( const TQRegExp & ); #endif TQString &replace( uint index, uint len, const TQString & ); @@ -625,7 +625,7 @@ public: TQString &replace( const TQString &, const TQString & ); TQString &replace( const TQString &, const TQString &, bool ); #endif -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE TQString &replace( const TQRegExp &, const TQString & ); #endif TQString &replace( TQChar, TQChar ); @@ -663,11 +663,11 @@ public: void setExpand( uint index, TQChar c ); TQString &operator+=( const TQString &str ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &operator+=( const TQByteArray &str ); TQString &operator+=( const char *str ); #endif -#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII) +#if !defined(TQT_NO_STL) && !defined(TQT_NO_CAST_ASCII) TQString &operator+=( const std::string& ); #endif TQString &operator+=( TQChar c ); @@ -722,7 +722,7 @@ public: static int localeAwareCompare( const TQString& s1, const TQString& s2 ) { return s1.localeAwareCompare( s2 ); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif @@ -767,7 +767,7 @@ private: void checkSimpleText() const; void grow( uint newLength ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQString &insertHelper( uint index, const char *s, uint len=UINT_MAX ); TQString &operatorPlusEqHelper( const char *s, uint len2=UINT_MAX ); #endif @@ -860,7 +860,7 @@ public: /***************************************************************************** TQString stream functions *****************************************************************************/ -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & ); #endif @@ -898,7 +898,7 @@ inline TQString TQString::section( TQChar sep, int start, int end, int flags ) c inline TQString TQString::section( char sep, int start, int end, int flags ) const { return section(TQChar(sep), start, end, flags); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString TQString::section( const char *in_sep, int start, int end, int flags ) const { return section(TQString(in_sep), start, end, flags); } #endif @@ -927,7 +927,7 @@ inline bool TQString::isEmpty() const inline TQString TQString::copy() const { return TQString( *this ); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::insert( uint index, const char *s ) { return insertHelper( index, s ); } @@ -947,12 +947,12 @@ inline TQString &TQString::prepend( TQChar c ) inline TQString &TQString::prepend( char c ) { return insert(0,c); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::prepend( const TQByteArray & s ) { return insert(0,s); } #endif -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::operator+=( const TQByteArray &s ) { int pos = s.find( 0 ); @@ -963,7 +963,7 @@ inline TQString &TQString::operator+=( const TQByteArray &s ) inline TQString &TQString::append( const TQString & s ) { return operator+=(s); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::append( const TQByteArray &s ) { return operator+=(s); } @@ -980,7 +980,7 @@ inline TQString &TQString::append( char c ) #ifndef TQT_NO_STL inline TQString &TQString::operator=( const std::string& str ) { return operator=(str.c_str()); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline TQString &TQString::operator+=( const std::string& s ) { return operator+=(s.c_str()); } inline TQString &TQString::append( const std::string& s ) @@ -1037,7 +1037,7 @@ inline int TQString::find( char c, int index, bool cs ) const inline int TQString::findRev( char c, int index, bool cs ) const { return findRev( TQChar(c), index, cs ); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII inline int TQString::find( const char* str, int index ) const { return find(TQString::fromAscii(str), index); } @@ -1056,7 +1056,7 @@ Q_EXPORT bool operator<=( const TQString &s1, const TQString &s2 ); Q_EXPORT bool operator==( const TQString &s1, const TQString &s2 ); Q_EXPORT bool operator>( const TQString &s1, const TQString &s2 ); Q_EXPORT bool operator>=( const TQString &s1, const TQString &s2 ); -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII Q_EXPORT bool operator!=( const TQString &s1, const char *s2 ); Q_EXPORT bool operator<( const TQString &s1, const char *s2 ); Q_EXPORT bool operator<=( const TQString &s1, const char *s2 ); @@ -1078,7 +1078,7 @@ Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString return tmp; } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII Q_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 ) { TQString tmp( s1 ); diff --git a/doc/html/qstringlist-h.html b/doc/html/qstringlist-h.html index 1ef2b1942..90b19186b 100644 --- a/doc/html/qstringlist-h.html +++ b/doc/html/qstringlist-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqstrlist.h" #endif // QT_H -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST class TQRegExp; template <class T> class TQDeepCopy; @@ -101,7 +101,7 @@ public: TQStringList( const TQStringList& l ) : TQValueList<TQString>(l) { } TQStringList( const TQValueList<TQString>& l ) : TQValueList<TQString>(l) { } TQStringList( const TQString& i ) { append(i); } -#ifndef QT_NO_CAST_ASCII +#ifndef TQT_NO_CAST_ASCII TQStringList( const char* i ) { append(i); } #endif @@ -111,19 +111,19 @@ public: static TQStringList split( const TQString &sep, const TQString &str, bool allowEmptyEntries = FALSE ); static TQStringList split( const TQChar &sep, const TQString &str, bool allowEmptyEntries = FALSE ); -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP static TQStringList split( const TQRegExp &sep, const TQString &str, bool allowEmptyEntries = FALSE ); #endif TQString join( const TQString &sep ) const; TQStringList grep( const TQString &str, bool cs = TRUE ) const; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP TQStringList grep( const TQRegExp &expr ) const; #endif TQStringList& gres( const TQString &before, const TQString &after, bool cs = TRUE ); -#ifndef QT_NO_REGEXP_CAPTURE +#ifndef TQT_NO_REGEXP_CAPTURE TQStringList& gres( const TQRegExp &expr, const TQString &after ); #endif @@ -132,13 +132,13 @@ protected: friend class TQDeepCopy< TQStringList >; }; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM class TQDataStream; extern Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQStringList& ); extern Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQStringList& ); #endif -#endif // QT_NO_STRINGLIST +#endif // TQT_NO_STRINGLIST #endif // TQSTRINGLIST_H diff --git a/doc/html/qstrlist-h.html b/doc/html/qstrlist-h.html index 88f998a87..5de07fcf5 100644 --- a/doc/html/qstrlist-h.html +++ b/doc/html/qstrlist-h.html @@ -104,7 +104,7 @@ private: void deleteItem( TQPtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; } int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) { return qstrcmp((const char*)s1, (const char*)s2); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQDataStream &read( TQDataStream &s, TQPtrCollection::Item &d ) { s >> (char *&)d; return s; } TQDataStream &write( TQDataStream &s, TQPtrCollection::Item d ) const diff --git a/doc/html/qstyle-h.html b/doc/html/qstyle-h.html index aca71350f..8f8fa19da 100644 --- a/doc/html/qstyle-h.html +++ b/doc/html/qstyle-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE class TQPopupMenu; class TQStylePrivate; @@ -788,7 +788,7 @@ private: #endif }; -#endif // QT_NO_STYLE +#endif // TQT_NO_STYLE #endif // TQSTYLE_H diff --git a/doc/html/qstylefactory-h.html b/doc/html/qstylefactory-h.html index 8d53bab19..daa18ddc8 100644 --- a/doc/html/qstylefactory-h.html +++ b/doc/html/qstylefactory-h.html @@ -79,7 +79,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE class TQString; class TQStyle; @@ -87,13 +87,13 @@ class TQStyle; class Q_EXPORT TQStyleFactory { public: -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST static TQStringList keys(); #endif static TQStyle *create( const TQString& ); }; -#endif //QT_NO_STYLE +#endif //TQT_NO_STYLE #endif //TQSTYLEFACTORY_H diff --git a/doc/html/qstyleplugin-h.html b/doc/html/qstyleplugin-h.html index 693344111..a80b1ea81 100644 --- a/doc/html/qstyleplugin-h.html +++ b/doc/html/qstyleplugin-h.html @@ -82,8 +82,8 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_STYLE -#ifndef QT_NO_COMPONENT +#ifndef TQT_NO_STYLE +#ifndef TQT_NO_COMPONENT class TQStyle; class TQStylePluginPrivate; @@ -102,8 +102,8 @@ private: TQStylePluginPrivate *d; }; -#endif // QT_NO_COMPONENT -#endif // QT_NO_STYLE +#endif // TQT_NO_COMPONENT +#endif // TQT_NO_STYLE #endif // TQSTYLEPLUGIN_H diff --git a/doc/html/qstylesheet-h.html b/doc/html/qstylesheet-h.html index 9149f6bac..0cfa5e2ef 100644 --- a/doc/html/qstylesheet-h.html +++ b/doc/html/qstylesheet-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_RICHTEXT +#ifndef TQT_NO_RICHTEXT class TQStyleSheet; class TQTextDocument; @@ -237,7 +237,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList<TQStyleSheetItem::ListS // MOC_SKIP_END #endif -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM class TQTextCustomItem; #endif @@ -257,7 +257,7 @@ public: void insert( TQStyleSheetItem* item); -#ifndef QT_NO_TEXTCUSTOMITEM +#ifndef TQT_NO_TEXTCUSTOMITEM virtual TQTextCustomItem* tag( const TQString& name, const TQMap<TQString, TQString> &attr, const TQString& context, @@ -284,7 +284,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_RICHTEXT +#endif // TQT_NO_RICHTEXT #endif // TQSTYLESHEET_H diff --git a/doc/html/qtabbar-h.html b/doc/html/qtabbar-h.html index 30892ea3a..6ea01f854 100644 --- a/doc/html/qtabbar-h.html +++ b/doc/html/qtabbar-h.html @@ -80,7 +80,7 @@ body { background: #ffffff; color: black; } #include "ntqptrlist.h" #endif // QT_H -#ifndef QT_NO_TABBAR +#ifndef TQT_NO_TABBAR class TQTabBar; class TQIconSet; @@ -217,7 +217,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_TABBAR +#endif // TQT_NO_TABBAR #endif // TQTABBAR_H diff --git a/doc/html/qtabdialog-h.html b/doc/html/qtabdialog-h.html index 01a7efd56..94b665495 100644 --- a/doc/html/qtabdialog-h.html +++ b/doc/html/qtabdialog-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_TABDIALOG +#ifndef TQT_NO_TABDIALOG class TQTabBar; class TQTab; @@ -177,7 +177,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TABDIALOG +#endif // TQT_NO_TABDIALOG #endif // TQTABDIALOG_H diff --git a/doc/html/qtable-h.html b/doc/html/qtable-h.html index 4342bfdc5..fc5a000d7 100644 --- a/doc/html/qtable-h.html +++ b/doc/html/qtable-h.html @@ -90,7 +90,7 @@ body { background: #ffffff; color: black; } #endif // QT_H -#ifndef QT_NO_TABLE +#ifndef TQT_NO_TABLE #if !defined( TQT_MODULE_TABLE ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_TABLE ) #define TQM_EXPORT_TABLE @@ -458,7 +458,7 @@ protected: void showEvent( TQShowEvent *e ); void paintEvent( TQPaintEvent *e ); void setEditMode( EditMode mode, int row, int col ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void contentsDragEnterEvent( TQDragEnterEvent *e ); virtual void contentsDragMoveEvent( TQDragMoveEvent *e ); virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e ); @@ -499,7 +499,7 @@ signals: void selectionChanged(); void valueChanged( int row, int col ); void contextMenuRequested( int row, int col, const TQPoint &pos ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dropped( TQDropEvent *e ); #endif @@ -595,7 +595,7 @@ private: #define Q_DEFINED_QTABLE #include "ntqwinexport.h" -#endif // QT_NO_TABLE +#endif // TQT_NO_TABLE #endif // TABLE_H diff --git a/doc/html/qtabwidget-h.html b/doc/html/qtabwidget-h.html index 8b634d5e5..3c7bbef5c 100644 --- a/doc/html/qtabwidget-h.html +++ b/doc/html/qtabwidget-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_TABWIDGET +#ifndef TQT_NO_TABWIDGET class TQTabBar; class TQTabWidgetData; @@ -193,7 +193,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TABWIDGET +#endif // TQT_NO_TABWIDGET #endif // TQTABWIDGET_H diff --git a/doc/html/qtextbrowser-h.html b/doc/html/qtextbrowser-h.html index 03611096b..c69ef81eb 100644 --- a/doc/html/qtextbrowser-h.html +++ b/doc/html/qtextbrowser-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #include "ntqtextedit.h" #endif // QT_H -#ifndef QT_NO_TEXTBROWSER +#ifndef TQT_NO_TEXTBROWSER class TQTextBrowserData; @@ -138,7 +138,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TEXTBROWSER +#endif // TQT_NO_TEXTBROWSER #endif // TQTEXTBROWSER_H diff --git a/doc/html/qtextcodec-h.html b/doc/html/qtextcodec-h.html index 9f3afed79..8cdc20e77 100644 --- a/doc/html/qtextcodec-h.html +++ b/doc/html/qtextcodec-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC class TQTextCodec; class TQIODevice; @@ -103,10 +103,10 @@ class Q_EXPORT TQTextCodec { public: virtual ~TQTextCodec(); -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS static TQTextCodec* loadCharmap(TQIODevice*); static TQTextCodec* loadCharmapFile(TQString filename); -#endif //QT_NO_CODECS +#endif //TQT_NO_CODECS static TQTextCodec* codecForMib(int mib); static TQTextCodec* codecForName(const char* hint, int accuracy=0); static TQTextCodec* codecForContent(const char* chars, int len); @@ -166,7 +166,7 @@ inline void TQTextCodec::setCodecForTr(TQTextCodec *c) { cftr = c; } inline TQTextCodec* TQTextCodec::codecForCStrings() { return cfcs; } inline void TQTextCodec::setCodecForCStrings(TQTextCodec *c) { cfcs = c; } -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC #endif // TQTEXTCODEC_H diff --git a/doc/html/qtextcodecplugin-h.html b/doc/html/qtextcodecplugin-h.html index 5a5c5189b..bf98ff129 100644 --- a/doc/html/qtextcodecplugin-h.html +++ b/doc/html/qtextcodecplugin-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_TEXTCODECPLUGIN +#ifndef TQT_NO_TEXTCODECPLUGIN class TQTextCodec; class TQTextCodecPluginPrivate; @@ -102,7 +102,7 @@ public: private: TQTextCodecPluginPrivate *d; }; -#endif // QT_NO_TEXTCODECPLUGIN +#endif // TQT_NO_TEXTCODECPLUGIN #endif // TQTEXTCODECPLUGIN_H diff --git a/doc/html/qtextedit-h.html b/doc/html/qtextedit-h.html index 40fc37c83..011cc9074 100644 --- a/doc/html/qtextedit-h.html +++ b/doc/html/qtextedit-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #include "ntqptrlist.h" #endif // QT_H -#ifndef QT_NO_TEXTEDIT +#ifndef TQT_NO_TEXTEDIT // uncomment below to enable optimization mode - also uncomment the // optimDoAutoScroll() private slot since moc ignores #ifdefs.. #define QT_TEXTEDIT_OPTIMIZATION @@ -281,7 +281,7 @@ public: int paragraphLength( int para ) const; TQStyleSheet* styleSheet() const; -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQMimeSourceFactory* mimeSourceFactory() const; #endif TQBrush paper() const; @@ -344,7 +344,7 @@ public: public slots: void setEnabled( bool ); -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME virtual void setMimeSourceFactory( TQMimeSourceFactory* factory ); #endif virtual void setStyleSheet( TQStyleSheet* styleSheet ); @@ -378,7 +378,7 @@ public slots: virtual void redo(); virtual void cut(); virtual void paste(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD virtual void pasteSubType( const TQCString &subtype ); #endif virtual void clear(); @@ -465,13 +465,13 @@ protected: void contentsMouseMoveEvent( TQMouseEvent *e ); void contentsMouseReleaseEvent( TQMouseEvent *e ); void contentsMouseDoubleClickEvent( TQMouseEvent *e ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void contentsWheelEvent( TQWheelEvent *e ); #endif void imStartEvent( TQIMEvent * ); void imComposeEvent( TQIMEvent * ); void imEndEvent( TQIMEvent * ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void contentsDragEnterEvent( TQDragEnterEvent *e ); void contentsDragMoveEvent( TQDragMoveEvent *e ); void contentsDragLeaveEvent( TQDragLeaveEvent *e ); @@ -538,11 +538,11 @@ private: void makeParagVisible( TQTextParagraph *p ); void normalCopy(); void copyToClipboard(); -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQCString pickSpecial(TQMimeSource* ms, bool always_ask, const TQPoint&); TQTextDrag *dragObject( TQWidget *parent = 0 ) const; #endif -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD void pasteSpecial(const TQPoint&); #endif void setFontInternal( const TQFont &f ); @@ -590,7 +590,7 @@ private slots: #endif // QT_TEXTEDIT_OPTIMIZATION private: -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD void pasteSubType( const TQCString &subtype, TQMimeSource *m ); #endif @@ -645,7 +645,7 @@ inline void TQTextEdit::setCurrentFont( const TQFont &f ) TQTextEdit::setFontInternal( f ); } -#endif //QT_NO_TEXTEDIT +#endif //TQT_NO_TEXTEDIT #endif //TQTEXTVIEW_H diff --git a/doc/html/qtextstream-h.html b/doc/html/qtextstream-h.html index bc0ff79c4..4240a2c90 100644 --- a/doc/html/qtextstream-h.html +++ b/doc/html/qtextstream-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include <stdio.h> #endif // QT_H -#ifndef QT_NO_TEXTSTREAM +#ifndef TQT_NO_TEXTSTREAM class TQTextCodec; class TQTextDecoder; @@ -96,7 +96,7 @@ public: UnicodeReverse, RawUnicode, UnicodeUTF8 }; void setEncoding( Encoding ); -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC void setCodec( TQTextCodec* ); TQTextCodec *codec(); #endif @@ -370,7 +370,7 @@ Q_EXPORT inline TQTSManip qSetPrecision( int p ) return TQTSManip(func,p); } -#endif // QT_NO_TEXTSTREAM +#endif // TQT_NO_TEXTSTREAM #endif // TQTEXTSTREAM_H diff --git a/doc/html/qtextview-h.html b/doc/html/qtextview-h.html index 2df7bb889..31d593a6e 100644 --- a/doc/html/qtextview-h.html +++ b/doc/html/qtextview-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqtextedit.h" #endif // QT_H -#ifndef QT_NO_TEXTVIEW +#ifndef TQT_NO_TEXTVIEW class Q_EXPORT TQTextView : public TQTextEdit { @@ -106,7 +106,7 @@ private: #endif }; -#endif //QT_NO_TEXTVIEW +#endif //TQT_NO_TEXTVIEW #endif //TQTEXTVIEW_H diff --git a/doc/html/qtoolbar-h.html b/doc/html/qtoolbar-h.html index 30f473e08..b2cab845a 100644 --- a/doc/html/qtoolbar-h.html +++ b/doc/html/qtoolbar-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqdockwindow.h" #endif // QT_H -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR class TQMainWindow; class TQButton; @@ -148,7 +148,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TOOLBAR +#endif // TQT_NO_TOOLBAR #endif // TQTOOLBAR_H diff --git a/doc/html/qtoolbox-h.html b/doc/html/qtoolbox-h.html index 9121717c4..eb46a0d6e 100644 --- a/doc/html/qtoolbox-h.html +++ b/doc/html/qtoolbox-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include <ntqiconset.h> #endif // QT_H -#ifndef QT_NO_TOOLBOX +#ifndef TQT_NO_TOOLBOX class TQToolBoxPrivate; class TQWidgetList; @@ -158,7 +158,7 @@ inline int TQToolBox::addItem( TQWidget *item, const TQIconSet &iconSet, inline int TQToolBox::insertItem( int index, TQWidget *item, const TQString &label ) { return insertItem( index, item, TQIconSet(), label ); } -#endif // QT_NO_TOOLBOX +#endif // TQT_NO_TOOLBOX #endif diff --git a/doc/html/qtoolbutton-h.html b/doc/html/qtoolbutton-h.html index d38695ae4..162d2b8ef 100644 --- a/doc/html/qtoolbutton-h.html +++ b/doc/html/qtoolbutton-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_TOOLBUTTON +#ifndef TQT_NO_TOOLBUTTON class TQToolButtonPrivate; class TQToolBar; @@ -118,7 +118,7 @@ public: Under = BelowIcon // obsolete }; TQToolButton( TQWidget * parent, const char* name=0 ); -#ifndef QT_NO_TOOLBAR +#ifndef TQT_NO_TOOLBAR TQToolButton( const TQIconSet& s, const TQString &textLabel, const TQString& grouptext, TQObject * receiver, const char* slot, @@ -145,7 +145,7 @@ public: bool usesTextLabel() const { return utl; } TQString textLabel() const { return tl; } -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU void setPopup( TQPopupMenu* popup ); TQPopupMenu* popup() const; @@ -191,7 +191,7 @@ protected: bool eventFilter( TQObject *o, TQEvent *e ); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE void paletteChange( const TQPalette & ); #endif @@ -223,7 +223,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_TOOLBUTTON +#endif // TQT_NO_TOOLBUTTON #endif // TQTOOLBUTTON_H diff --git a/doc/html/qtooltip-h.html b/doc/html/qtooltip-h.html index 23fe67975..f62e44569 100644 --- a/doc/html/qtooltip-h.html +++ b/doc/html/qtooltip-h.html @@ -79,7 +79,7 @@ body { background: #ffffff; color: black; } #include "ntqwidget.h" #endif // QT_H -#ifndef QT_NO_TOOLTIP +#ifndef TQT_NO_TOOLTIP #if __GNUC__ - 0 > 3 #pragma GCC system_header @@ -180,7 +180,7 @@ private: }; -#endif // QT_NO_TOOLTIP +#endif // TQT_NO_TOOLTIP #endif // TQTOOLTIP_H diff --git a/doc/html/qtsciicodec-h.html b/doc/html/qtsciicodec-h.html index 297a64b5d..55180b4f0 100644 --- a/doc/html/qtsciicodec-h.html +++ b/doc/html/qtsciicodec-h.html @@ -108,7 +108,7 @@ body { background: #ffffff; color: black; } #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS class Q_EXPORT TQTsciiCodec : public TQTextCodec { public: diff --git a/doc/html/qurl-h.html b/doc/html/qurl-h.html index 100707f11..9c0834e1c 100644 --- a/doc/html/qurl-h.html +++ b/doc/html/qurl-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_URL +#ifndef TQT_NO_URL class TQUrlPrivate; @@ -161,7 +161,7 @@ private: }; -#endif //QT_NO_URL +#endif //TQT_NO_URL #endif diff --git a/doc/html/qurloperator-h.html b/doc/html/qurloperator-h.html index d99c2b60b..af8880690 100644 --- a/doc/html/qurloperator-h.html +++ b/doc/html/qurloperator-h.html @@ -85,7 +85,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" // TQString->TQStringList conversion #endif // QT_H -#ifndef QT_NO_NETWORKPROTOCOL +#ifndef TQT_NO_NETWORKPROTOCOL class TQUrlInfo; class TQUrlOperatorPrivate; @@ -160,7 +160,7 @@ private: TQUrlOperatorPrivate *d; }; -#endif // QT_NO_NETWORKPROTOCOL +#endif // TQT_NO_NETWORKPROTOCOL #endif // TQURLOPERATOR_H diff --git a/doc/html/quuid-h.html b/doc/html/quuid-h.html index 26fbb3424..0c4d14331 100644 --- a/doc/html/quuid-h.html +++ b/doc/html/quuid-h.html @@ -137,7 +137,7 @@ struct Q_EXPORT TQUuid { memcpy( this, &uuid, sizeof(TQUuid) ); } -#ifndef QT_NO_QUUID_STRING +#ifndef TQT_NO_QUUID_STRING TQUuid( const TQString & ); TQUuid( const char * ); TQString toString() const; @@ -222,7 +222,7 @@ struct Q_EXPORT TQUuid uchar data4[ 8 ]; }; -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQUuid & ); Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQUuid & ); #endif diff --git a/doc/html/qvalidator-h.html b/doc/html/qvalidator-h.html index d135ff869..81c50a770 100644 --- a/doc/html/qvalidator-h.html +++ b/doc/html/qvalidator-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqregexp.h" // TQString->TQRegExp conversion #endif // QT_H -#ifndef QT_NO_VALIDATOR +#ifndef TQT_NO_VALIDATOR class Q_EXPORT TQValidator : public TQObject @@ -136,7 +136,7 @@ private: int b, t; }; -#ifndef QT_NO_REGEXP +#ifndef TQT_NO_REGEXP class Q_EXPORT TQDoubleValidator : public TQValidator { @@ -197,10 +197,10 @@ private: TQRegExp r; }; -#endif // QT_NO_REGEXP +#endif // TQT_NO_REGEXP -#endif // QT_NO_VALIDATOR +#endif // TQT_NO_VALIDATOR #endif // TQVALIDATOR_H diff --git a/doc/html/qvaluelist-h.html b/doc/html/qvaluelist-h.html index beb84cf20..91debfeb9 100644 --- a/doc/html/qvaluelist-h.html +++ b/doc/html/qvaluelist-h.html @@ -430,7 +430,7 @@ Q_INLINE_TEMPLATES void TQValueListPrivate<T>::clear() } #ifdef QT_CHECK_RANGE -# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE ) +# if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE ) # define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) tqWarning( "TQValueList: Warning invalid element" ) # define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() ); # else @@ -670,7 +670,7 @@ Q_INLINE_TEMPLATES void TQValueList<T>::detachInternal() sh->deref(); sh = new TQValueListPrivate<T>( *sh ); } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM template <class T> Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList<T>& l ) { @@ -697,7 +697,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, cons s << *it; return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM #define Q_DEFINED_QVALUELIST #define Q_DEFINED_QVALUELIST diff --git a/doc/html/qvaluevector-h.html b/doc/html/qvaluevector-h.html index 4739420ba..fdec18cf3 100644 --- a/doc/html/qvaluevector-h.html +++ b/doc/html/qvaluevector-h.html @@ -576,7 +576,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector<T>::iterator TQValueVector< } -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM template<class T> Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector<T>& v ) { @@ -604,7 +604,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, cons s << *it; return s; } -#endif // QT_NO_DATASTREAM +#endif // TQT_NO_DATASTREAM #define Q_DEFINED_QVALUEVECTOR #include "ntqwinexport.h" diff --git a/doc/html/qvariant-h.html b/doc/html/qvariant-h.html index 76f80d092..b4e7f021b 100644 --- a/doc/html/qvariant-h.html +++ b/doc/html/qvariant-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_VARIANT +#ifndef TQT_NO_VARIANT class TQString; class TQCString; class TQFont; @@ -110,7 +110,7 @@ class TQKeySequence; class TQPen; // Some headers rejected after TQVariant declaration for GCC 2.7.* compatibility class TQVariant; -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT template <class T> class TQValueList; template <class T> class TQValueListConstIterator; template <class T> class TQValueListNode; @@ -162,13 +162,13 @@ public: TQVariant(); ~TQVariant(); TQVariant( const TQVariant& ); -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM TQVariant( TQDataStream& s ); #endif TQVariant( const TQString& ); TQVariant( const TQCString& ); TQVariant( const char* ); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQVariant( const TQStringList& ); #endif TQVariant( const TQFont& ); @@ -191,11 +191,11 @@ public: TQVariant( const TQDateTime& ); TQVariant( const TQByteArray& ); TQVariant( const TQBitArray& ); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQVariant( const TQKeySequence& ); #endif TQVariant( const TQPen& ); -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT TQVariant( const TQValueList<TQVariant>& ); TQVariant( const TQMap<TQString,TQVariant>& ); #endif @@ -225,7 +225,7 @@ public: const TQString toString() const; const TQCString toCString() const; -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST const TQStringList toStringList() const; #endif const TQFont toFont() const; @@ -248,7 +248,7 @@ public: const TQDateTime toDateTime() const; const TQByteArray toByteArray() const; const TQBitArray toBitArray() const; -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL const TQKeySequence toKeySequence() const; #endif const TQPen toPen() const; @@ -258,13 +258,13 @@ public: TQ_ULLONG toULongLong( bool * ok=0 ) const; bool toBool() const; double toDouble( bool * ok=0 ) const; -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT const TQValueList<TQVariant> toList() const; const TQMap<TQString,TQVariant> toMap() const; #endif TQSizePolicy toSizePolicy() const; -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT TQValueListConstIterator<TQString> stringListBegin() const; TQValueListConstIterator<TQString> stringListEnd() const; TQValueListConstIterator<TQVariant> listBegin() const; @@ -275,7 +275,7 @@ public: #endif TQString& asString(); TQCString& asCString(); -#ifndef QT_NO_STRINGLIST +#ifndef TQT_NO_STRINGLIST TQStringList& asStringList(); #endif TQFont& asFont(); @@ -298,7 +298,7 @@ public: TQDateTime& asDateTime(); TQByteArray& asByteArray(); TQBitArray& asBitArray(); -#ifndef QT_NO_ACCEL +#ifndef TQT_NO_ACCEL TQKeySequence& asKeySequence(); #endif TQPen& asPen(); @@ -308,13 +308,13 @@ public: TQ_ULLONG& asULongLong(); bool& asBool(); double& asDouble(); -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT TQValueList<TQVariant>& asList(); TQMap<TQString,TQVariant>& asMap(); #endif TQSizePolicy& asSizePolicy(); -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM void load( TQDataStream& ); void save( TQDataStream& ) const; #endif @@ -370,7 +370,7 @@ inline bool TQVariant::isValid() const return (d->typ != Invalid); } -#ifndef QT_NO_TEMPLATE_VARIANT +#ifndef TQT_NO_TEMPLATE_VARIANT inline TQValueListConstIterator<TQString> TQVariant::stringListBegin() const { if ( d->typ != StringList ) @@ -421,14 +421,14 @@ inline TQMapConstIterator<TQString,TQVariant> TQVariant::mapFind( const TQ } #endif -#ifndef QT_NO_DATASTREAM +#ifndef TQT_NO_DATASTREAM Q_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant& p ); Q_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant& p ); Q_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant::Type& p ); Q_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant::Type p ); #endif -#endif //QT_NO_VARIANT +#endif //TQT_NO_VARIANT #endif // TQVARIANT_H diff --git a/doc/html/qvbox-h.html b/doc/html/qvbox-h.html index 6a1652f28..90e2468c7 100644 --- a/doc/html/qvbox-h.html +++ b/doc/html/qvbox-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqhbox.h" #endif // QT_H -#ifndef QT_NO_VBOX +#ifndef TQT_NO_VBOX class Q_EXPORT TQVBox : public TQHBox { @@ -96,7 +96,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_VBOX +#endif // TQT_NO_VBOX #endif // TQVBOX_H diff --git a/doc/html/qvbuttongroup-h.html b/doc/html/qvbuttongroup-h.html index ab0693b92..949fce9ba 100644 --- a/doc/html/qvbuttongroup-h.html +++ b/doc/html/qvbuttongroup-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqbuttongroup.h" #endif // QT_H -#ifndef QT_NO_VBUTTONGROUP +#ifndef TQT_NO_VBUTTONGROUP class Q_EXPORT TQVButtonGroup : public TQButtonGroup { @@ -100,7 +100,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_VBUTTONGROUP +#endif // TQT_NO_VBUTTONGROUP #endif // TQVBUTTONGROUP_H diff --git a/doc/html/qvgroupbox-h.html b/doc/html/qvgroupbox-h.html index cffc1cddc..91c4c0824 100644 --- a/doc/html/qvgroupbox-h.html +++ b/doc/html/qvgroupbox-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqgroupbox.h" #endif // QT_H -#ifndef QT_NO_VGROUPBOX +#ifndef TQT_NO_VGROUPBOX class Q_EXPORT TQVGroupBox : public TQGroupBox { @@ -99,7 +99,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_VGROUPBOX +#endif // TQT_NO_VGROUPBOX #endif // TQVGROUPBOX_H diff --git a/doc/html/qwerty-example.html b/doc/html/qwerty-example.html index 6f356d8ce..5f6350856 100644 --- a/doc/html/qwerty-example.html +++ b/doc/html/qwerty-example.html @@ -85,7 +85,7 @@ private: void rebuildCodecList(); TQMenuBar *m; TQMultiLineEdit *e; -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER TQPrinter printer; #endif TQPopupMenu *save_as; @@ -147,7 +147,7 @@ enum { Uni = 0, MBug = 1, Lat1 = 2, Local = 3, Guess = 4, Codec = 5 }; save_as = new TQPopupMenu(); file->insertItem( "Sa&ve As", save_as ); file->insertItem( "Add &Encoding", this, SLOT(addEncoding()) ); -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER file->insertSeparator(); file->insertItem( "&Print...", this, SLOT(print()), ALT+Key_P ); #endif @@ -165,7 +165,7 @@ enum { Uni = 0, MBug = 1, Lat1 = 2, Local = 3, Guess = 4, Codec = 5 }; edit->insertItem( "To &Uppercase", this, SLOT(toUpper()), ALT+Key_U ); edit->insertItem( "To &Lowercase", this, SLOT(toLower()), ALT+Key_L ); -#ifndef QT_NO_FONTDIALOG +#ifndef TQT_NO_FONTDIALOG edit->insertSeparator(); edit->insertItem( "&Select Font" , this, SLOT(font()), ALT+Key_T ); #endif @@ -191,7 +191,7 @@ Editor::~Editor() void Editor::font() { -#ifndef QT_NO_FONTDIALOG +#ifndef TQT_NO_FONTDIALOG bool ok; TQFont f = TQFontDialog::getFont( &ok, e->font() ); if ( ok ) { @@ -243,7 +243,7 @@ void Editor::newDoc() void Editor::load() { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) load( fn, -1 ); @@ -291,7 +291,7 @@ void Editor::load( const TQString& fileName, in void Editor::openAsEncoding( int code ) { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG //storing filename (proper save) is left as an exercise... TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) @@ -301,7 +301,7 @@ void Editor::openAsEncoding( int code ) bool Editor::save() { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG //storing filename (proper save) is left as an exercise... TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) @@ -312,7 +312,7 @@ bool Editor::save() void Editor::saveAsEncoding( int code ) { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG //storing filename (proper save) is left as an exercise... TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) @@ -322,7 +322,7 @@ void Editor::saveAsEncoding( int code ) void Editor::addEncoding() { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG TQString fn = TQFileDialog::getOpenFileName( TQString::null, "*.map", this ); if ( !fn.isEmpty() ) { TQFile f(fn); @@ -376,7 +376,7 @@ bool Editor::saveAs( const TQString< void Editor::print() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER if ( printer.setup(this) ) { // opens printer dialog printer.setFullPage(TRUE); // we'll set our own margins TQPainter p; diff --git a/doc/html/qwhatsthis-h.html b/doc/html/qwhatsthis-h.html index 81016f3d2..96714f6d9 100644 --- a/doc/html/qwhatsthis-h.html +++ b/doc/html/qwhatsthis-h.html @@ -79,7 +79,7 @@ body { background: #ffffff; color: black; } #include "ntqobject.h" #endif // QT_H -#ifndef QT_NO_WHATSTHIS +#ifndef TQT_NO_WHATSTHIS #include "ntqcursor.h" @@ -112,7 +112,7 @@ public: static void display( const TQString& text, const TQPoint& pos = TQCursor::pos(), TQWidget* w = 0 ); }; -#endif // QT_NO_WHATSTHIS +#endif // TQT_NO_WHATSTHIS #endif // TQWHATSTHIS_H diff --git a/doc/html/qwidget-h.html b/doc/html/qwidget-h.html index 228e554c8..a39ba25ed 100644 --- a/doc/html/qwidget-h.html +++ b/doc/html/qwidget-h.html @@ -138,11 +138,11 @@ class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice TQ_PROPERTY( bool ownPalette READ ownPalette ) TQ_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont ) TQ_PROPERTY( bool ownFont READ ownFont ) -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQ_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor ) TQ_PROPERTY( bool ownCursor READ ownCursor ) #endif -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQ_PROPERTY( TQString caption READ caption WRITE setCaption ) TQ_PROPERTY( TQPixmap icon READ icon WRITE setIcon ) TQ_PROPERTY( TQString iconText READ iconText WRITE setIconText ) @@ -176,7 +176,7 @@ public: WId winId() const; void setName( const char *name ); -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE // GUI style setting TQStyle &style() const; @@ -267,7 +267,7 @@ public: const TQPixmap * erasePixmap() const; virtual void setErasePixmap( const TQPixmap & ); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE const TQColorGroup & colorGroup() const; const TQPalette & palette() const; bool ownPalette() const; @@ -293,13 +293,13 @@ public: TQFontMetrics fontMetrics() const; TQFontInfo fontInfo() const; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR const TQCursor &cursor() const; bool ownCursor() const; virtual void setCursor( const TQCursor & ); virtual void unsetCursor(); #endif -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQString caption() const; const TQPixmap *icon() const; TQString iconText() const; @@ -317,7 +317,7 @@ public: virtual void setBackgroundPixmap( const TQPixmap & ); // obsolete, use setErasePixmap() public slots: -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA virtual void setCaption( const TQString &); virtual void setIcon( const TQPixmap & ); virtual void setIconText( const TQString &); @@ -354,7 +354,7 @@ public: // Grab functions void grabMouse(); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR void grabMouse( const TQCursor & ); #endif void releaseMouse(); @@ -437,7 +437,7 @@ public slots: virtual void adjustSize(); public: -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT TQLayout * layout() const { return lay_out; } #endif void updateGeometry(); @@ -514,7 +514,7 @@ protected: virtual void mouseReleaseEvent( TQMouseEvent * ); virtual void mouseDoubleClickEvent( TQMouseEvent * ); virtual void mouseMoveEvent( TQMouseEvent * ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT virtual void wheelEvent( TQWheelEvent * ); #endif virtual void keyPressEvent( TQKeyEvent * ); @@ -533,7 +533,7 @@ protected: virtual void imEndEvent( TQIMEvent * ); virtual void tabletEvent( TQTabletEvent * ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP virtual void dragEnterEvent( TQDragEnterEvent * ); virtual void dragMoveEvent( TQDragMoveEvent * ); virtual void dragLeaveEvent( TQDragLeaveEvent * ); @@ -562,11 +562,11 @@ protected: // Misc. protected functions -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE virtual void styleChange( TQStyle& ); #endif virtual void enabledChange( bool oldEnabled ); -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE virtual void paletteChange( const TQPalette & ); #endif virtual void fontChange( const TQFont & ); @@ -632,7 +632,7 @@ private: friend class TQDragManager; #endif -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT void setLayout( TQLayout *l ); #endif void setWinId( WId ); @@ -676,11 +676,11 @@ private: uint im_enabled : 1; TQRect crect; TQColor bg_col; -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE TQPalette pal; #endif TQFont fnt; -#ifndef QT_NO_LAYOUT +#ifndef TQT_NO_LAYOUT TQLayout *lay_out; #endif TQWExtra *extra; @@ -705,7 +705,7 @@ private: TQRegion paintableRegion() const; void updateGraphicsContext( TQGfx *qgfx_qws, bool clip_children ) const; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR void updateCursor( const TQRegion &r ) const; #endif @@ -737,7 +737,7 @@ private: // Disabled copy constructor and operator= #endif public: // obsolete functions to dissappear or to become inline in 3.0 -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE void setPalette( const TQPalette &p, bool ) { setPalette( p ); } #endif void setFont( const TQFont &f, bool ) { setFont( f ); } @@ -817,7 +817,7 @@ inline void TQWidget::setBaseSize( const TQSize &s ) inline const TQColor &TQWidget::eraseColor() const { return bg_col; } -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE inline const TQPalette &TQWidget::palette() const { return pal; } #endif @@ -924,7 +924,7 @@ inline void TQWidget::constPolish() const that->setWState(WState_Polished); // be on the safe side... } } -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR inline bool TQWidget::ownCursor() const { return testWState( WState_OwnCursor ); @@ -934,7 +934,7 @@ inline bool TQWidget::ownFont() const { return own_font; } -#ifndef QT_NO_PALETTE +#ifndef TQT_NO_PALETTE inline bool TQWidget::ownPalette() const { return own_palette; @@ -965,7 +965,7 @@ class TQMacDndExtra; #endif struct Q_EXPORT TQTLWExtra { -#ifndef QT_NO_WIDGET_TOPEXTRA +#ifndef TQT_NO_WIDGET_TOPEXTRA TQString caption; // widget caption TQString iconText; // widget icon text TQPixmap *icon; // widget icon @@ -995,7 +995,7 @@ struct Q_EXPORT TQTLWExtra { uint is_moved: 1; uint resizer : 4; #endif -#if defined(Q_WS_QWS) && !defined ( QT_NO_QWS_MANAGER ) +#if defined(Q_WS_QWS) && !defined ( TQT_NO_QWS_MANAGER ) TQRegion decor_allocated_region; // decoration allocated region TQWSManager *qwsManager; #endif @@ -1018,7 +1018,7 @@ struct Q_EXPORT TQWExtra { TQ_INT16 maxw, maxh; // maximum size TQPixmap *bg_pix; // background pixmap TQWidget *focus_proxy; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR TQCursor *curs; #endif TQTLWExtra *topextra; // only useful for TLWs @@ -1049,7 +1049,7 @@ struct Q_EXPORT TQWExtra { #endif char bg_mode; // background mode char bg_mode_visual; // visual background mode -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE TQStyle* style; #endif TQRect micro_focus_hint; // micro focus hint diff --git a/doc/html/qwidgetfactory-h.html b/doc/html/qwidgetfactory-h.html index 3bd1805bb..8c65ecc7e 100644 --- a/doc/html/qwidgetfactory-h.html +++ b/doc/html/qwidgetfactory-h.html @@ -123,7 +123,7 @@ private: void createListViewColumn( TQListView *lv, const TQString& txt, const TQPixmap& pix, bool clickable, bool resizable ); -#ifndef QT_NO_TABLE +#ifndef TQT_NO_TABLE void createTableColumnOrRow( TQTable *table, const TQString& txt, const TQPixmap& pix, const TQString& field, bool isRow ); diff --git a/doc/html/qwidgetplugin-h.html b/doc/html/qwidgetplugin-h.html index 09d9ab346..d63cabbe7 100644 --- a/doc/html/qwidgetplugin-h.html +++ b/doc/html/qwidgetplugin-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqstringlist.h" #include "ntqiconset.h" #endif // QT_H -#ifndef QT_NO_WIDGETPLUGIN +#ifndef TQT_NO_WIDGETPLUGIN #ifdef Q_WS_WIN #ifdef QT_PLUGIN @@ -152,7 +152,7 @@ public: }; #endif // QT_CONTAINER_CUSTOM_WIDGETS -#endif // QT_NO_WIDGETPLUGIN +#endif // TQT_NO_WIDGETPLUGIN #endif // TQWIDGETPLUGIN_H diff --git a/doc/html/qwidgetstack-h.html b/doc/html/qwidgetstack-h.html index d0c2c2ce3..14034c379 100644 --- a/doc/html/qwidgetstack-h.html +++ b/doc/html/qwidgetstack-h.html @@ -83,7 +83,7 @@ body { background: #ffffff; color: black; } #include "ntqptrdict.h" #endif // QT_H -#ifndef QT_NO_WIDGETSTACK +#ifndef TQT_NO_WIDGETSTACK class TQWidgetStackPrivate; @@ -143,7 +143,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_WIDGETSTACK +#endif // TQT_NO_WIDGETSTACK #endif // TQWIDGETSTACK_H diff --git a/doc/html/qwindowsstyle-h.html b/doc/html/qwindowsstyle-h.html index e5e01863a..7c39d881f 100644 --- a/doc/html/qwindowsstyle-h.html +++ b/doc/html/qwindowsstyle-h.html @@ -81,7 +81,7 @@ body { background: #ffffff; color: black; } #include "ntqcommonstyle.h" #endif // QT_H -#if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN) +#if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN) #if defined(QT_PLUGIN) #define Q_EXPORT_STYLE_WINDOWS @@ -166,7 +166,7 @@ private: #endif }; -#endif // QT_NO_STYLE_WINDOWS +#endif // TQT_NO_STYLE_WINDOWS #endif // TQWINDOWSSTYLE_H diff --git a/doc/html/qwindowsystem_qws-h.html b/doc/html/qwindowsystem_qws-h.html index 3476c9846..b88d5282c 100644 --- a/doc/html/qwindowsystem_qws-h.html +++ b/doc/html/qwindowsystem_qws-h.html @@ -177,7 +177,7 @@ private: TQWSWindowData *d; }; -#ifndef QT_NO_SOUND +#ifndef TQT_NO_SOUND class TQWSSoundServer; #ifdef QT_USE_OLD_QWS_SOUND class TQWSSoundServerData; @@ -211,7 +211,7 @@ private: class TQWSMouseHandler; struct TQWSCommandStruct; -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS class TQWSServer : public TQWSServerSocket #else class TQWSServer : public TQObject @@ -238,13 +238,13 @@ public: static void processKeyEvent(int unicode, int keycode, int modifiers, bool isPress, bool autoRepeat); -#ifndef QT_NO_QWS_IM +#ifndef TQT_NO_QWS_IM enum IMState { IMStart, IMCompose, IMEnd }; void sendIMEvent( IMState state, const TQString& txt, int cpos, int selLen ); #endif -#ifndef QT_NO_QWS_KEYBOARD +#ifndef TQT_NO_QWS_KEYBOARD typedef struct KeyMap { int key_code; ushort unicode; @@ -270,7 +270,7 @@ public: static void setKeyboardFilter( KeyboardFilter *f ); #endif -#ifndef QT_NO_QWS_IM +#ifndef TQT_NO_QWS_IM static void setCurrentInputMethod( TQWSInputMethod *im ); static void resetInputMethod(); static void setMicroFocus( int x, int y ); @@ -285,7 +285,7 @@ public: static void setDesktopBackground( const TQColor & ); static TQWSMouseHandler *mouseHandler(); static void setMouseHandler(TQWSMouseHandler*); -#ifndef QT_NO_QWS_KEYBOARD +#ifndef TQT_NO_QWS_KEYBOARD static TQWSKeyboardHandler* keyboardHandler(); static void setKeyboardHandler(TQWSKeyboardHandler* kh); #endif @@ -296,7 +296,7 @@ public: void openMouse(); void closeMouse(); -#ifndef QT_NO_QWS_KEYBOARD +#ifndef TQT_NO_QWS_KEYBOARD void openKeyboard(); void closeKeyboard(); #endif @@ -316,7 +316,7 @@ public: static TQPtrList<TQWSInternalWindowInfo> * windowList(); void sendPropertyNotifyEvent( int property, int state ); -#ifndef QT_NO_QWS_PROPERTIES +#ifndef TQT_NO_QWS_PROPERTIES TQWSPropertyManager *manager() { return &propertyManager; } @@ -330,7 +330,7 @@ public: static void beginDisplayReconfigure(); static void endDisplayReconfigure(); -#ifndef QT_NO_QWS_CURSOR +#ifndef TQT_NO_QWS_CURSOR static void setCursorVisible( bool ); static bool isCursorVisible(); #endif @@ -342,13 +342,13 @@ public: signals: void windowEvent( TQWSWindow *w, TQWSServer::WindowEvent e ); -#ifndef QT_NO_COP +#ifndef TQT_NO_COP void newChannel( const TQString& channel); void removedChannel(const TQString& channel); #endif private: -#ifndef QT_NO_COP +#ifndef TQT_NO_COP static void sendTQCopEvent( TQWSClient *c, const TQCString &ch, const TQCString &msg, const TQByteArray &data, bool response = FALSE ); @@ -360,7 +360,7 @@ private: void destroy_region( const TQWSRegionDestroyCommand * ); void name_region( const TQWSRegionNameCommand * ); void set_identity( const TQWSIdentifyCommand * ); -#ifndef QT_NO_QWS_IM +#ifndef TQT_NO_QWS_IM void set_micro_focus( const TQWSSetMicroFocusCommand * ); void reset_im( const TQWSResetIMCommand * ); static void sendKeyEventUnfiltered(int unicode, int keycode, @@ -374,7 +374,7 @@ private: static TQImage *bgImage; void sendMaxWindowRectEvents(); -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS void newConnection( int socket ); #endif void invokeIdentify( const TQWSIdentifyCommand *cmd, TQWSClient *client ); @@ -384,35 +384,35 @@ private: void invokeRegionMove( const TQWSRegionMoveCommand *cmd, TQWSClient *client ); void invokeRegionDestroy( const TQWSRegionDestroyCommand *cmd, TQWSClient *client ); void invokeSetAltitude( const TQWSChangeAltitudeCommand *cmd, TQWSClient *client ); -#ifndef QT_NO_QWS_PROPERTIES +#ifndef TQT_NO_QWS_PROPERTIES void invokeAddProperty( TQWSAddPropertyCommand *cmd ); void invokeSetProperty( TQWSSetPropertyCommand *cmd ); void invokeRemoveProperty( TQWSRemovePropertyCommand *cmd ); void invokeGetProperty( TQWSGetPropertyCommand *cmd, TQWSClient *client ); -#endif //QT_NO_QWS_PROPERTIES +#endif //TQT_NO_QWS_PROPERTIES void invokeSetSelectionOwner( TQWSSetSelectionOwnerCommand *cmd ); void invokeConvertSelection( TQWSConvertSelectionCommand *cmd ); void invokeSetFocus( const TQWSRequestFocusCommand *cmd, TQWSClient *client ); void initIO(); void setFocus( TQWSWindow*, bool gain ); -#ifndef QT_NO_QWS_CURSOR +#ifndef TQT_NO_QWS_CURSOR void invokeDefineCursor( TQWSDefineCursorCommand *cmd, TQWSClient *client ); void invokeSelectCursor( TQWSSelectCursorCommand *cmd, TQWSClient *client ); #endif void invokeGrabMouse( TQWSGrabMouseCommand *cmd, TQWSClient *client ); void invokeGrabKeyboard( TQWSGrabKeyboardCommand *cmd, TQWSClient *client ); -#ifndef QT_NO_SOUND +#ifndef TQT_NO_SOUND void invokePlaySound( TQWSPlaySoundCommand *cmd, TQWSClient *client ); #endif -#ifndef QT_NO_COP +#ifndef TQT_NO_COP void invokeRegisterChannel( TQWSQCopRegisterChannelCommand *cmd, TQWSClient *client ); void invokeTQCopSend( TQWSQCopSendCommand *cmd, TQWSClient *client ); #endif void invokeRepaintRegion( TQWSRepaintRegionCommand *cmd, TQWSClient *client ); -#ifndef QT_NO_QWS_IM +#ifndef TQT_NO_QWS_IM void invokeSetMicroFocus( const TQWSSetMicroFocusCommand *cmd, TQWSClient *client ); void invokeResetIM( const TQWSResetIMCommand *cmd, @@ -433,7 +433,7 @@ private: void resetGfx(); private slots: -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS void clientClosed(); void doClient(); void deleteWindowsLater(); @@ -459,7 +459,7 @@ private: TQGfx *gfx; ClientMap client; -#ifndef QT_NO_QWS_PROPERTIES +#ifndef TQT_NO_QWS_PROPERTIES TQWSPropertyManager propertyManager; #endif struct SelectionOwner { @@ -479,7 +479,7 @@ private: TQWSWindow *mouseGrabber; bool mouseGrabbing; int swidth, sheight, sdepth; -#ifndef QT_NO_QWS_CURSOR +#ifndef TQT_NO_QWS_CURSOR bool haveviscurs; TQWSCursor *cursor; // cursor currently shown TQWSCursor *nextCursor; // cursor to show once grabbing is off @@ -489,7 +489,7 @@ private: TQRegion dirtyBackground; bool disablePainting; TQPtrList<TQWSMouseHandler> mousehandlers; -#ifndef QT_NO_QWS_KEYBOARD +#ifndef TQT_NO_QWS_KEYBOARD TQPtrList<TQWSKeyboardHandler> keyboardhandlers; #endif @@ -511,13 +511,13 @@ private: void setCursor(TQWSCursor *curs); // multimedia -#ifndef QT_NO_SOUND +#ifndef TQT_NO_SOUND TQWSSoundServer *soundserver; #endif -#ifndef QT_NO_COP +#ifndef TQT_NO_COP TQMap<TQString, TQPtrList<TQWSClient> > channels; #endif -#ifndef QT_NO_QWS_IM +#ifndef TQT_NO_QWS_IM bool microF; int microX; int microY; @@ -527,7 +527,7 @@ private: extern TQWSServer *qwsServer; //there can be only one -#ifndef QT_NO_QWS_IM +#ifndef TQT_NO_QWS_IM class TQWSInputMethod { public: @@ -600,7 +600,7 @@ private slots: void errorHandler( int ); private: int s; // XXX csocket->d->socket->socket() is this value -#ifndef QT_NO_QWS_MULTIPROCESS +#ifndef TQT_NO_QWS_MULTIPROCESS TQWSSocket *csocket; #endif TQWSCommand* command; diff --git a/doc/html/qwizard-h.html b/doc/html/qwizard-h.html index 09c902feb..cef129f1f 100644 --- a/doc/html/qwizard-h.html +++ b/doc/html/qwizard-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqdialog.h" #endif // QT_H -#ifndef QT_NO_WIZARD +#ifndef TQT_NO_WIZARD class TQHBoxLayout; class TQWizardPrivate; @@ -173,7 +173,7 @@ private: // Disabled copy constructor and operator= #endif }; -#endif // QT_NO_WIZARD +#endif // TQT_NO_WIZARD #endif // TQWIZARD_H diff --git a/doc/html/qwmatrix-h.html b/doc/html/qwmatrix-h.html index e820552a0..5c76b794c 100644 --- a/doc/html/qwmatrix-h.html +++ b/doc/html/qwmatrix-h.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; } #include "ntqregion.h" #endif // QT_H -#ifndef QT_NO_WMATRIX +#ifndef TQT_NO_WMATRIX class Q_EXPORT TQWMatrix // 2D transform matrix @@ -160,7 +160,7 @@ Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQWMatrix Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQWMatrix & ); -#endif // QT_NO_WMATRIX +#endif // TQT_NO_WMATRIX #endif // TQWMATRIX_H diff --git a/doc/html/qworkspace-h.html b/doc/html/qworkspace-h.html index ce1ba05b8..6d0470e7f 100644 --- a/doc/html/qworkspace-h.html +++ b/doc/html/qworkspace-h.html @@ -82,7 +82,7 @@ body { background: #ffffff; color: black; } #include "ntqwidgetlist.h" #endif // QT_H -#ifndef QT_NO_WORKSPACE +#ifndef TQT_NO_WORKSPACE #if !defined( TQT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE ) #define TQM_EXPORT_WORKSPACE @@ -144,7 +144,7 @@ public slots: void activatePrevWindow(); protected: -#ifndef QT_NO_STYLE +#ifndef TQT_NO_STYLE void styleChange( TQStyle& ); #endif void childEvent( TQChildEvent * ); @@ -152,7 +152,7 @@ protected: bool eventFilter( TQObject *, TQEvent * ); void showEvent( TQShowEvent *e ); void hideEvent( TQHideEvent *e ); -#ifndef QT_NO_WHEELEVENT +#ifndef TQT_NO_WHEELEVENT void wheelEvent( TQWheelEvent *e ); #endif @@ -200,7 +200,7 @@ private: // Disabled copy constructor and operator= }; -#endif // QT_NO_WORKSPACE +#endif // TQT_NO_WORKSPACE #endif // TQWORKSPACE_H diff --git a/doc/html/qwsdecoration_qws-h.html b/doc/html/qwsdecoration_qws-h.html index d8ba31521..702bfaafd 100644 --- a/doc/html/qwsdecoration_qws-h.html +++ b/doc/html/qwsdecoration_qws-h.html @@ -99,7 +99,7 @@ public: virtual void close( TQWidget * ); virtual void minimize( TQWidget * ); virtual void maximize( TQWidget * ); -#ifndef QT_NO_POPUPMENU +#ifndef TQT_NO_POPUPMENU virtual TQPopupMenu *menu(const TQWidget *, const TQPoint &); #endif virtual void paint(TQPainter *, const TQWidget *) = 0; diff --git a/doc/html/qxml-h.html b/doc/html/qxml-h.html index 1abf42c8d..b5ea5100f 100644 --- a/doc/html/qxml-h.html +++ b/doc/html/qxml-h.html @@ -91,7 +91,7 @@ body { background: #ffffff; color: black; } #define TQM_EXPORT_XML Q_EXPORT #endif -#ifndef QT_NO_XML +#ifndef TQT_NO_XML class TQXmlNamespaceSupport; class TQXmlAttributes; @@ -562,7 +562,7 @@ inline int TQXmlAttributes::count() const { return length(); } -#endif //QT_NO_XML +#endif //TQT_NO_XML #endif diff --git a/doc/html/scribble-example.html b/doc/html/scribble-example.html index 5ee6f459f..5d5066e5c 100644 --- a/doc/html/scribble-example.html +++ b/doc/html/scribble-example.html @@ -168,7 +168,7 @@ const bool no_writing = FALSE; if ((tqApp->argc() > 0) && !buffer.load(tqApp->argv()[1])) buffer.fill( colorGroup().base() ); setBackgroundMode( TQWidget::PaletteBase ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( TQt::crossCursor ); #endif } diff --git a/doc/html/showimg-example.html b/doc/html/showimg-example.html index fd1cda853..91a34091b 100644 --- a/doc/html/showimg-example.html +++ b/doc/html/showimg-example.html @@ -735,14 +735,14 @@ void ImageViewer::rot180() void ImageViewer::copy() { -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQApplication::clipboard()->setImage(image); // Less information loss #endif } void ImageViewer::paste() { -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQImage p = TQApplication::clipboard()->image(); if ( !p.isNull() ) { filename = "pasted"; diff --git a/doc/html/sql-driver.html b/doc/html/sql-driver.html index 6c984250c..f523502f3 100644 --- a/doc/html/sql-driver.html +++ b/doc/html/sql-driver.html @@ -218,7 +218,7 @@ make that makes programs linked to these libraries segfault on exit. This only happens if the TQOCI8 driver is compiled as a plugin. To work around this problem, either compile the driver into the TQt libray -itself, or configure TQt with the option '-DQT_NO_LIBRARY_UNLOAD'. +itself, or configure TQt with the option '-DTQT_NO_LIBRARY_UNLOAD'. For Oracle 9, it is possible to link to the static OCI library by using "LIBS+=$ORACLE_HOME/lib/libclntst9.a".

    How to build the plugin on Windows diff --git a/doc/html/themes-example.html b/doc/html/themes-example.html index 93ee95927..08b483a8e 100644 --- a/doc/html/themes-example.html +++ b/doc/html/themes-example.html @@ -59,7 +59,7 @@ during runtime using the pulldown menu. #include <ntqpalette.h> -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS #include <ntqwindowsstyle.h> @@ -146,7 +146,7 @@ private: #include "wood.h" -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS #include "ntqapplication.h" #include "ntqcombobox.h" @@ -1573,7 +1573,7 @@ void NorwegianWoodStyle::drawSemicircleButton( ntqpalette.h> -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS #include <ntqwindowsstyle.h> @@ -1642,7 +1642,7 @@ private: #include "metal.h" -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS #include "ntqapplication.h" #include "ntqcombobox.h" @@ -2227,7 +2227,7 @@ private: connect( styleMapper, SIGNAL( mapped( const TQString& ) ), this, SLOT( makeStyle( const TQString& ) ) ); TQStringList list = TQStyleFactory::keys(); list.sort(); -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS list.insert(list.begin(), "Norwegian Wood"); list.insert(list.begin(), "Metal"); #endif @@ -2261,7 +2261,7 @@ private: help->insertItem( "&About", this, SLOT(about()), Key_F1); help->insertItem( "About &TQt", this, SLOT(aboutTQt())); -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS tqApp->setStyle( new NorwegianWoodStyle ); #endif } @@ -2269,11 +2269,11 @@ private: void Themes::makeStyle(const TQString &style) { if(style == "Norwegian Wood") { -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS tqApp->setStyle( new NorwegianWoodStyle ); #endif } else if( style == "Metal" ) { -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS tqApp->setStyle( new MetalStyle ); #endif } else { diff --git a/doc/i18n.doc b/doc/i18n.doc index 81e26bc44..27d0641ac 100644 --- a/doc/i18n.doc +++ b/doc/i18n.doc @@ -251,7 +251,7 @@ Example of QT_TRANSLATE_NOOP(): \endcode If you disable the const char* to QString automatic conversion -by compiling your software with the macro QT_NO_CAST_ASCII +by compiling your software with the macro TQT_NO_CAST_ASCII defined, you'll be very likely to catch any strings you are missing. See QString::fromLatin1() for more information. Disabling the conversion can make programming a bit cumbersome. diff --git a/doc/man/man1/tqvfb.1 b/doc/man/man1/tqvfb.1 index acf02e152..25d0ea556 100644 --- a/doc/man/man1/tqvfb.1 +++ b/doc/man/man1/tqvfb.1 @@ -59,7 +59,7 @@ master process via named pipes. The virtual framebuffer is a development tool only. No security issues have been considered in the virtual framebuffer design. It should be avoided in a production -environment; QT_NO_QWS_VFB should always be defined in +environment; TQT_NO_QWS_VFB should always be defined in production libraries. .SH "AUTHORS" .LP diff --git a/doc/man/man3/tqapplication.3qt b/doc/man/man3/tqapplication.3qt index 3f85a39fa..a01de9e42 100644 --- a/doc/man/man3/tqapplication.3qt +++ b/doc/man/man3/tqapplication.3qt @@ -509,7 +509,7 @@ This application object must be constructed before any paint devices (including .PP Note that \fIargc\fR and \fIargv\fR might be changed. TQt removes command line arguments that it recognizes. The modified \fIargc\fR and \fIargv\fR can also be accessed later with \fCqApp->argc()\fR and \fCqApp->argv()\fR. The documentation for argv() contains a detailed description of how to process command line arguments. .PP -Qt debugging options (not available if TQt was compiled with the QT_NO_DEBUG flag defined): +Qt debugging options (not available if TQt was compiled with the TQT_NO_DEBUG flag defined): .TP -nograb, tells TQt that it must never grab the mouse or the keyboard. .TP @@ -1930,7 +1930,7 @@ In debug mode, this function calls tqFatal() with a message if the computer is t .SH "void tqSystemWarning ( const char * msg, int code )" Prints the message \fImsg\fR and uses \fIcode\fR to get a system specific error message. When \fIcode\fR is -1 (the default), the system's last error code will be used if possible. Use this method to handle failures in platform specific API calls. .PP -This function does nothing when TQt is built with \fCQT_NO_DEBUG\fR defined. +This function does nothing when TQt is built with \fCTQT_NO_DEBUG\fR defined. .SH "const char * tqVersion ()" Returns the TQt version number as a string, for example, "2.3.0" or" 3.0.5". .PP diff --git a/doc/man/man3/tqstring.3qt b/doc/man/man3/tqstring.3qt index 7097b922c..074d0d3c8 100644 --- a/doc/man/man3/tqstring.3qt +++ b/doc/man/man3/tqstring.3qt @@ -696,7 +696,7 @@ Constructs a string that is a deep copy of \fIstr\fR, interpreted as a classic C .PP If \fIstr\fR is 0, then a null string is created. .PP -This is a cast constructor, but it is perfectly safe: converting a Latin-1 \fCconst char *\fR to QString preserves all the information. You can disable this constructor by defining \fCQT_NO_CAST_ASCII\fR when you compile your applications. You can also make QString objects by using setLatin1(), fromLatin1(), fromLocal8Bit(), and fromUtf8(). Or whatever encoding is appropriate for the 8-bit data you have. +This is a cast constructor, but it is perfectly safe: converting a Latin-1 \fCconst char *\fR to QString preserves all the information. You can disable this constructor by defining \fCTQT_NO_CAST_ASCII\fR when you compile your applications. You can also make QString objects by using setLatin1(), fromLatin1(), fromLocal8Bit(), and fromUtf8(). Or whatever encoding is appropriate for the 8-bit data you have. .PP See also isNull() and fromAscii(). .SH "QString::QString ( const std::string & str )" @@ -1158,7 +1158,7 @@ Returns the Unicode string decoded from the first \fIlen\fR bytes of \fIascii\fR .PP If a codec has been set using QTextCodec::codecForCStrings(), it is used to convert the string from 8-bit characters to Unicode. Otherwise, this function does the same as fromLatin1(). .PP -This is the same as the QString(const char*) constructor, but you can make that constructor invisible if you compile with the define \fCQT_NO_CAST_ASCII\fR, in which case you can explicitly create a QString from 8-bit ASCII text using this function. +This is the same as the QString(const char*) constructor, but you can make that constructor invisible if you compile with the define \fCTQT_NO_CAST_ASCII\fR, in which case you can explicitly create a QString from 8-bit ASCII text using this function. .PP .nf .br diff --git a/doc/porting2.doc b/doc/porting2.doc index f0affd51f..66fb4ee89 100644 --- a/doc/porting2.doc +++ b/doc/porting2.doc @@ -241,10 +241,10 @@ This change has been made to avoid collisions with other namespaces.

    Debug vs. Release

    The Q_ASSERT macro is now a null expression if the QT_CHECK_STATE flag -is not set (i.e. if the QT_NO_CHECK flag is defined). +is not set (i.e. if the TQT_NO_CHECK flag is defined).

    The debug() function now outputs nothing if TQt was compiled with -the QT_NO_DEBUG macro defined. +the TQT_NO_DEBUG macro defined.

    QString

    diff --git a/doc/porting3.doc b/doc/porting3.doc index 08322dd59..a85decf3b 100644 --- a/doc/porting3.doc +++ b/doc/porting3.doc @@ -157,8 +157,8 @@ previously disabled, please check these macro variables: \list \i \c DEBUG becomes \c QT_DEBUG -\i \c NO_DEBUG becomes \c QT_NO_DEBUG -\i \c NO_CHECK becomes \c QT_NO_CHECK +\i \c NO_DEBUG becomes \c TQT_NO_DEBUG +\i \c NO_CHECK becomes \c TQT_NO_CHECK \i \c CHECK_STATE becomes \c QT_CHECK_STATE \i \c CHECK_RANGE becomes \c QT_CHECK_RANGE \i \c CHECK_NULL becomes \c QT_CHECK_NULL diff --git a/doc/sql-driver.doc b/doc/sql-driver.doc index 02cd05cae..00f479c22 100644 --- a/doc/sql-driver.doc +++ b/doc/sql-driver.doc @@ -256,7 +256,7 @@ Note that some versions of the OCI client libraries contain a bug that makes programs linked to these libraries segfault on exit. This only happens if the QOCI8 driver is compiled as a plugin. To work around this problem, either compile the driver into the TQt libray -itself, or configure TQt with the option '-DQT_NO_LIBRARY_UNLOAD'. +itself, or configure TQt with the option '-DTQT_NO_LIBRARY_UNLOAD'. For Oracle 9, it is possible to link to the static OCI library by using "LIBS+=$ORACLE_HOME/lib/libclntst9.a". diff --git a/examples/canvas/canvas.cpp b/examples/canvas/canvas.cpp index 3c96ca4ac..7e78c7ceb 100644 --- a/examples/canvas/canvas.cpp +++ b/examples/canvas/canvas.cpp @@ -689,7 +689,7 @@ void Main::addMesh() int rows = h / dist; int cols = w / dist; -#ifndef QT_NO_PROGRESSDIALOG +#ifndef TQT_NO_PROGRESSDIALOG TQProgressDialog progress( "Creating mesh...", "Abort", rows, this, "progress", TRUE ); #endif @@ -723,13 +723,13 @@ void Main::addMesh() el->show(); } lastRow[n-1]=prev; -#ifndef QT_NO_PROGRESSDIALOG +#ifndef TQT_NO_PROGRESSDIALOG progress.setProgress( j ); if ( progress.wasCancelled() ) break; #endif } -#ifndef QT_NO_PROGRESSDIALOG +#ifndef TQT_NO_PROGRESSDIALOG progress.setProgress( rows ); #endif // tqDebug( "%d nodes, %d edges", nodecount, EdgeItem::count() ); diff --git a/examples/demo/dnd/styledbutton.cpp b/examples/demo/dnd/styledbutton.cpp index 383f555d2..e04be6317 100644 --- a/examples/demo/dnd/styledbutton.cpp +++ b/examples/demo/dnd/styledbutton.cpp @@ -229,7 +229,7 @@ void StyledButton::mousePressEvent(TQMouseEvent* e) void StyledButton::mouseMoveEvent(TQMouseEvent* e) { TQButton::mouseMoveEvent( e ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( !mousePressed ) return; if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) { @@ -256,7 +256,7 @@ void StyledButton::mouseMoveEvent(TQMouseEvent* e) #endif } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void StyledButton::dragEnterEvent( TQDragEnterEvent *e ) { setFocus(); @@ -305,4 +305,4 @@ void StyledButton::dropEvent( TQDropEvent *e ) e->ignore(); } } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP diff --git a/examples/demo/dnd/styledbutton.h b/examples/demo/dnd/styledbutton.h index 80fae5c10..84ad4e500 100644 --- a/examples/demo/dnd/styledbutton.h +++ b/examples/demo/dnd/styledbutton.h @@ -82,12 +82,12 @@ signals: protected: void mousePressEvent(TQMouseEvent*); void mouseMoveEvent(TQMouseEvent*); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dragEnterEvent ( TQDragEnterEvent * ); void dragMoveEvent ( TQDragMoveEvent * ); void dragLeaveEvent ( TQDragLeaveEvent * ); void dropEvent ( TQDropEvent * ); -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP void drawButton( TQPainter* ); void drawButtonLabel( TQPainter* ); void resizeEvent( TQResizeEvent* ); diff --git a/examples/demo/qthumbwheel.cpp b/examples/demo/qthumbwheel.cpp index 7dc549550..984aa1f43 100644 --- a/examples/demo/qthumbwheel.cpp +++ b/examples/demo/qthumbwheel.cpp @@ -40,7 +40,7 @@ #include "qthumbwheel.h" -#ifndef QT_NO_THUMBWHEEL +#ifndef TQT_NO_THUMBWHEEL #include #include #include diff --git a/examples/demo/qthumbwheel.h b/examples/demo/qthumbwheel.h index 45b7afa13..9f5de2783 100644 --- a/examples/demo/qthumbwheel.h +++ b/examples/demo/qthumbwheel.h @@ -46,7 +46,7 @@ #include "ntqrangecontrol.h" #endif // QT_H -#ifndef QT_NO_THUMBWHEEL +#ifndef TQT_NO_THUMBWHEEL class TQThumbWheel : public TQFrame, public TQRangeControl { @@ -114,6 +114,6 @@ inline double TQThumbWheel::transmissionRatio() const return rat; } -#endif // QT_NO_WHEEL +#endif // TQT_NO_WHEEL #endif // TQWHEEL_H diff --git a/examples/demo/textdrawing/helpwindow.cpp b/examples/demo/textdrawing/helpwindow.cpp index 27d61d1ad..833caa179 100644 --- a/examples/demo/textdrawing/helpwindow.cpp +++ b/examples/demo/textdrawing/helpwindow.cpp @@ -216,7 +216,7 @@ void HelpWindow::aboutTQt() void HelpWindow::openFile() { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) browser->setSource( fn ); @@ -230,7 +230,7 @@ void HelpWindow::newWindow() void HelpWindow::print() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER TQPrinter printer; printer.setFullPage(TRUE); if ( printer.setup() ) { diff --git a/examples/demo/textdrawing/textedit.cpp b/examples/demo/textdrawing/textedit.cpp index d76f16a0e..c564f21b6 100644 --- a/examples/demo/textdrawing/textedit.cpp +++ b/examples/demo/textdrawing/textedit.cpp @@ -271,7 +271,7 @@ void TextEdit::filePrint() { if ( !currentEditor() ) return; -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER TQPrinter printer; printer.setFullPage(TRUE); TQPaintDeviceMetrics screen( this ); diff --git a/examples/drawdemo/drawdemo.cpp b/examples/drawdemo/drawdemo.cpp index 915e218bf..4d5ab2016 100644 --- a/examples/drawdemo/drawdemo.cpp +++ b/examples/drawdemo/drawdemo.cpp @@ -211,7 +211,7 @@ DrawView::DrawView() // If -- at compile time -- printer support will be disabled, // we won't set up printing functionality. -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER printer = new TQPrinter; @@ -234,7 +234,7 @@ DrawView::DrawView() // DrawView::~DrawView() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER delete printer; #endif } diff --git a/examples/drawlines/connect.cpp b/examples/drawlines/connect.cpp index bb4048f91..3b7e140cb 100644 --- a/examples/drawlines/connect.cpp +++ b/examples/drawlines/connect.cpp @@ -123,7 +123,7 @@ int main( int argc, char **argv ) { TQApplication a( argc, argv ); ConnectWidget connect; -#ifndef QT_NO_WIDGET_TOPEXTRA // for TQt/Embedded minimal build +#ifndef TQT_NO_WIDGET_TOPEXTRA // for TQt/Embedded minimal build connect.setCaption( "TQt Example - Draw lines"); #endif a.setMainWidget( &connect ); diff --git a/examples/hello/main.cpp b/examples/hello/main.cpp index 12ea3cf34..95fd3773b 100644 --- a/examples/hello/main.cpp +++ b/examples/hello/main.cpp @@ -28,7 +28,7 @@ int main( int argc, char **argv ) if ( s.isEmpty() ) s = "Hello, World"; Hello h( s ); -#ifndef QT_NO_WIDGET_TOPEXTRA // for TQt/Embedded minimal build +#ifndef TQT_NO_WIDGET_TOPEXTRA // for TQt/Embedded minimal build h.setCaption( "TQt says hello" ); #endif TQObject::connect( &h, SIGNAL(clicked()), &a, SLOT(quit()) ); diff --git a/examples/helpviewer/helpwindow.cpp b/examples/helpviewer/helpwindow.cpp index 724e1ed4a..7bdbad8af 100644 --- a/examples/helpviewer/helpwindow.cpp +++ b/examples/helpviewer/helpwindow.cpp @@ -218,7 +218,7 @@ void HelpWindow::aboutTQt() void HelpWindow::openFile() { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) browser->setSource( fn ); @@ -232,7 +232,7 @@ void HelpWindow::newWindow() void HelpWindow::print() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER TQPrinter printer( TQPrinter::HighResolution ); printer.setFullPage(TRUE); if ( printer.setup( this ) ) { diff --git a/examples/mdi/application.cpp b/examples/mdi/application.cpp index 1b8604f58..6ec40009f 100644 --- a/examples/mdi/application.cpp +++ b/examples/mdi/application.cpp @@ -69,7 +69,7 @@ ApplicationWindow::ApplicationWindow() = new TQToolButton( saveIcon, "Save File", TQString::null, this, SLOT(save()), fileTools, "save file" ); -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER printer = new TQPrinter( TQPrinter::HighResolution ); TQPixmap printIcon; @@ -99,7 +99,7 @@ ApplicationWindow::ApplicationWindow() file->setWhatsThis( id, fileSaveText ); id = file->insertItem( "Save &As...", this, SLOT(saveAs()) ); file->setWhatsThis( id, fileSaveText ); -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER file->insertSeparator(); id = file->insertItem( printIcon, "&Print...", this, SLOT(print()), CTRL+Key_P ); @@ -136,7 +136,7 @@ ApplicationWindow::ApplicationWindow() ApplicationWindow::~ApplicationWindow() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER delete printer; #endif } @@ -186,7 +186,7 @@ void ApplicationWindow::saveAs() void ApplicationWindow::print() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER MDIWindow* m = (MDIWindow*)ws->activeWindow(); if ( m ) m->print( printer ); @@ -394,7 +394,7 @@ void MDIWindow::saveAs() void MDIWindow::print( TQPrinter* printer) { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER int pageNo = 1; if ( printer->setup(this) ) { // printer dialog diff --git a/examples/qwerty/qwerty.cpp b/examples/qwerty/qwerty.cpp index 5f045448f..ab1441749 100644 --- a/examples/qwerty/qwerty.cpp +++ b/examples/qwerty/qwerty.cpp @@ -46,7 +46,7 @@ Editor::Editor( TQWidget * parent , const char * name ) save_as = new TQPopupMenu(); file->insertItem( "Sa&ve As", save_as ); file->insertItem( "Add &Encoding", this, SLOT(addEncoding()) ); -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER file->insertSeparator(); file->insertItem( "&Print...", this, SLOT(print()), ALT+Key_P ); #endif @@ -64,7 +64,7 @@ Editor::Editor( TQWidget * parent , const char * name ) edit->insertItem( "To &Uppercase", this, SLOT(toUpper()), ALT+Key_U ); edit->insertItem( "To &Lowercase", this, SLOT(toLower()), ALT+Key_L ); -#ifndef QT_NO_FONTDIALOG +#ifndef TQT_NO_FONTDIALOG edit->insertSeparator(); edit->insertItem( "&Select Font" , this, SLOT(font()), ALT+Key_T ); #endif @@ -90,7 +90,7 @@ Editor::~Editor() void Editor::font() { -#ifndef QT_NO_FONTDIALOG +#ifndef TQT_NO_FONTDIALOG bool ok; TQFont f = TQFontDialog::getFont( &ok, e->font() ); if ( ok ) { @@ -142,7 +142,7 @@ void Editor::newDoc() void Editor::load() { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) load( fn, -1 ); @@ -190,7 +190,7 @@ void Editor::load( const TQString& fileName, int code ) void Editor::openAsEncoding( int code ) { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG //storing filename (proper save) is left as an exercise... TQString fn = TQFileDialog::getOpenFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) @@ -200,7 +200,7 @@ void Editor::openAsEncoding( int code ) bool Editor::save() { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG //storing filename (proper save) is left as an exercise... TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) @@ -211,7 +211,7 @@ bool Editor::save() void Editor::saveAsEncoding( int code ) { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG //storing filename (proper save) is left as an exercise... TQString fn = TQFileDialog::getSaveFileName( TQString::null, TQString::null, this ); if ( !fn.isEmpty() ) @@ -221,7 +221,7 @@ void Editor::saveAsEncoding( int code ) void Editor::addEncoding() { -#ifndef QT_NO_FILEDIALOG +#ifndef TQT_NO_FILEDIALOG TQString fn = TQFileDialog::getOpenFileName( TQString::null, "*.map", this ); if ( !fn.isEmpty() ) { TQFile f(fn); @@ -275,7 +275,7 @@ bool Editor::saveAs( const TQString& fileName, int code ) void Editor::print() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER if ( printer.setup(this) ) { // opens printer dialog printer.setFullPage(TRUE); // we'll set our own margins TQPainter p; diff --git a/examples/qwerty/qwerty.h b/examples/qwerty/qwerty.h index efd2202fc..f0025c8a1 100644 --- a/examples/qwerty/qwerty.h +++ b/examples/qwerty/qwerty.h @@ -47,7 +47,7 @@ private: void rebuildCodecList(); TQMenuBar *m; TQMultiLineEdit *e; -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER TQPrinter printer; #endif TQPopupMenu *save_as; diff --git a/examples/scribble/scribble.cpp b/examples/scribble/scribble.cpp index 03a3cf3e0..f031044b1 100644 --- a/examples/scribble/scribble.cpp +++ b/examples/scribble/scribble.cpp @@ -36,7 +36,7 @@ Canvas::Canvas( TQWidget *parent, const char *name ) if ((tqApp->argc() > 0) && !buffer.load(tqApp->argv()[1])) buffer.fill( colorGroup().base() ); setBackgroundMode( TQWidget::PaletteBase ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( TQt::crossCursor ); #endif } diff --git a/examples/showimg/showimg.cpp b/examples/showimg/showimg.cpp index 579dbb514..52545f57e 100644 --- a/examples/showimg/showimg.cpp +++ b/examples/showimg/showimg.cpp @@ -597,14 +597,14 @@ void ImageViewer::rot180() void ImageViewer::copy() { -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQApplication::clipboard()->setImage(image); // Less information loss #endif } void ImageViewer::paste() { -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD TQImage p = TQApplication::clipboard()->image(); if ( !p.isNull() ) { filename = "pasted"; diff --git a/examples/tablet/canvas.cpp b/examples/tablet/canvas.cpp index 33ea83fad..cd5da7d81 100644 --- a/examples/tablet/canvas.cpp +++ b/examples/tablet/canvas.cpp @@ -26,7 +26,7 @@ Canvas::Canvas( TQWidget *parent, const char *name, WFlags fl ) if ((tqApp->argc() > 0) && !buffer.load(tqApp->argv()[1])) buffer.fill( colorGroup().base() ); setBackgroundMode( TQWidget::PaletteBase ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( TQt::crossCursor ); #endif } diff --git a/examples/tetrix/qtetrix.cpp b/examples/tetrix/qtetrix.cpp index dd709c5b0..bd624b4ab 100644 --- a/examples/tetrix/qtetrix.cpp +++ b/examples/tetrix/qtetrix.cpp @@ -96,7 +96,7 @@ TQTetrix::TQTetrix( TQWidget *parent, const char *name ) board = new TQTetrixBoard(this); showNext = new ShowNextPiece(this); -#ifndef QT_NO_LCDNUMBER +#ifndef TQT_NO_LCDNUMBER showScore = new TQLCDNumber(5,this); showLevel = new TQLCDNumber(2,this); showLines = new TQLCDNumber(5,this); @@ -124,7 +124,7 @@ TQTetrix::TQTetrix( TQWidget *parent, const char *name ) connect( board, SIGNAL(drawNextSquareSignal(int,int,TQColor*)), showNext, SLOT(drawNextSquare(int,int,TQColor*)) ); connect( showNext, SIGNAL(update()), board, SLOT(updateNext()) ); -#ifndef QT_NO_LCDNUMBER +#ifndef TQT_NO_LCDNUMBER connect( board, SIGNAL(updateScoreSignal(int)), showScore, SLOT(display(int)) ); connect( board, SIGNAL(updateLevelSignal(int)), showLevel, @@ -148,7 +148,7 @@ TQTetrix::TQTetrix( TQWidget *parent, const char *name ) showScore->setGeometry( 330, 40, 178, 93 ); showLevel->setGeometry( 50, 160, 78, 93 ); showLines->setGeometry( 330, 160, 178, 93 ); -#ifndef QT_NO_LCDNUMBER +#ifndef TQT_NO_LCDNUMBER showScore->display( 0 ); showLevel->display( 0 ); showLines->display( 0 ); diff --git a/examples/tetrix/qtetrix.h b/examples/tetrix/qtetrix.h index 3fc9f4297..b0731c872 100644 --- a/examples/tetrix/qtetrix.h +++ b/examples/tetrix/qtetrix.h @@ -52,7 +52,7 @@ private: TQTetrixBoard *board; ShowNextPiece *showNext; -#ifndef QT_NO_LCDNUMBER +#ifndef TQT_NO_LCDNUMBER TQLCDNumber *showScore; TQLCDNumber *showLevel; TQLCDNumber *showLines; diff --git a/examples/textedit/textedit.cpp b/examples/textedit/textedit.cpp index 66a3a4972..20294997b 100644 --- a/examples/textedit/textedit.cpp +++ b/examples/textedit/textedit.cpp @@ -269,7 +269,7 @@ void TextEdit::filePrint() { if ( !currentEditor() ) return; -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER TQPrinter printer( TQPrinter::HighResolution ); printer.setFullPage(TRUE); if ( printer.setup( this ) ) { diff --git a/examples/themes/metal.cpp b/examples/themes/metal.cpp index c3815c625..ee3b57d12 100644 --- a/examples/themes/metal.cpp +++ b/examples/themes/metal.cpp @@ -9,7 +9,7 @@ #include "metal.h" -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS #include "ntqapplication.h" #include "ntqcombobox.h" diff --git a/examples/themes/metal.h b/examples/themes/metal.h index 6ff38d300..7838bd1c5 100644 --- a/examples/themes/metal.h +++ b/examples/themes/metal.h @@ -17,7 +17,7 @@ #include -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS #include diff --git a/examples/themes/themes.cpp b/examples/themes/themes.cpp index 1f5417625..88111945f 100644 --- a/examples/themes/themes.cpp +++ b/examples/themes/themes.cpp @@ -60,7 +60,7 @@ Themes::Themes( TQWidget *parent, const char *name, WFlags f ) connect( styleMapper, SIGNAL( mapped( const TQString& ) ), this, SLOT( makeStyle( const TQString& ) ) ); TQStringList list = TQStyleFactory::keys(); list.sort(); -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS list.insert(list.begin(), "Norwegian Wood"); list.insert(list.begin(), "Metal"); #endif @@ -94,7 +94,7 @@ Themes::Themes( TQWidget *parent, const char *name, WFlags f ) help->insertItem( "&About", this, SLOT(about()), Key_F1); help->insertItem( "About &TQt", this, SLOT(aboutTQt())); -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS tqApp->setStyle( new NorwegianWoodStyle ); #endif } @@ -102,11 +102,11 @@ Themes::Themes( TQWidget *parent, const char *name, WFlags f ) void Themes::makeStyle(const TQString &style) { if(style == "Norwegian Wood") { -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS tqApp->setStyle( new NorwegianWoodStyle ); #endif } else if( style == "Metal" ) { -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS tqApp->setStyle( new MetalStyle ); #endif } else { diff --git a/examples/themes/wood.cpp b/examples/themes/wood.cpp index dd1002bbf..b9cf6cda3 100644 --- a/examples/themes/wood.cpp +++ b/examples/themes/wood.cpp @@ -9,7 +9,7 @@ #include "wood.h" -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS #include "ntqapplication.h" #include "ntqcombobox.h" diff --git a/examples/themes/wood.h b/examples/themes/wood.h index 3c2343704..75778f55c 100644 --- a/examples/themes/wood.h +++ b/examples/themes/wood.h @@ -17,7 +17,7 @@ #include -#ifndef QT_NO_STYLE_WINDOWS +#ifndef TQT_NO_STYLE_WINDOWS #include diff --git a/examples/thread/semaphores/main.cpp b/examples/thread/semaphores/main.cpp index a7704805c..85dec7171 100644 --- a/examples/thread/semaphores/main.cpp +++ b/examples/thread/semaphores/main.cpp @@ -17,7 +17,7 @@ #include #include -#if defined(QT_NO_THREAD) +#if defined(TQT_NO_THREAD) # error Thread support not enabled. #endif diff --git a/mkspecs/hpux-acc-o64/qplatformdefs.h b/mkspecs/hpux-acc-o64/qplatformdefs.h index 82ab0e490..baa8bf37a 100644 --- a/mkspecs/hpux-acc-o64/qplatformdefs.h +++ b/mkspecs/hpux-acc-o64/qplatformdefs.h @@ -24,7 +24,7 @@ #include #include #define QT_HPUX_LD -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include diff --git a/mkspecs/hpux-acc/qplatformdefs.h b/mkspecs/hpux-acc/qplatformdefs.h index 535970aec..544d012d2 100644 --- a/mkspecs/hpux-acc/qplatformdefs.h +++ b/mkspecs/hpux-acc/qplatformdefs.h @@ -24,7 +24,7 @@ #include #include #define QT_HPUX_LD -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include @@ -49,7 +49,7 @@ // Undeclared - at least on HP-UX 10.20. extern "C" int res_init(); -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat diff --git a/mkspecs/hpux-cc/qplatformdefs.h b/mkspecs/hpux-cc/qplatformdefs.h index 5315dddef..896597f3c 100644 --- a/mkspecs/hpux-cc/qplatformdefs.h +++ b/mkspecs/hpux-cc/qplatformdefs.h @@ -24,7 +24,7 @@ #include #include #define QT_HPUX_LD -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include diff --git a/mkspecs/hpux-g++/qplatformdefs.h b/mkspecs/hpux-g++/qplatformdefs.h index 7fbe896e6..4ddcbd74f 100644 --- a/mkspecs/hpux-g++/qplatformdefs.h +++ b/mkspecs/hpux-g++/qplatformdefs.h @@ -24,7 +24,7 @@ #include #include #define QT_HPUX_LD -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include diff --git a/mkspecs/hpuxi-acc-32/qplatformdefs.h b/mkspecs/hpuxi-acc-32/qplatformdefs.h index 82ab0e490..baa8bf37a 100644 --- a/mkspecs/hpuxi-acc-32/qplatformdefs.h +++ b/mkspecs/hpuxi-acc-32/qplatformdefs.h @@ -24,7 +24,7 @@ #include #include #define QT_HPUX_LD -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include diff --git a/mkspecs/hpuxi-acc-64/qplatformdefs.h b/mkspecs/hpuxi-acc-64/qplatformdefs.h index 82ab0e490..baa8bf37a 100644 --- a/mkspecs/hpuxi-acc-64/qplatformdefs.h +++ b/mkspecs/hpuxi-acc-64/qplatformdefs.h @@ -24,7 +24,7 @@ #include #include #define QT_HPUX_LD -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include diff --git a/mkspecs/linux-kcc/qplatformdefs.h b/mkspecs/linux-kcc/qplatformdefs.h index 33b44f963..bbfdfb369 100644 --- a/mkspecs/linux-kcc/qplatformdefs.h +++ b/mkspecs/linux-kcc/qplatformdefs.h @@ -27,7 +27,7 @@ #include // KAI C++ has at the moment problems with unloading the TQt plugins. // So don't unload them as a workaround for now. -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include diff --git a/mkspecs/macx-g++/qplatformdefs.h b/mkspecs/macx-g++/qplatformdefs.h index 6ea456e4c..74a64029b 100644 --- a/mkspecs/macx-g++/qplatformdefs.h +++ b/mkspecs/macx-g++/qplatformdefs.h @@ -22,7 +22,7 @@ #include #include #include -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include diff --git a/mkspecs/macx-mwerks/qplatformdefs.h b/mkspecs/macx-mwerks/qplatformdefs.h index 174711478..b2df8f80b 100644 --- a/mkspecs/macx-mwerks/qplatformdefs.h +++ b/mkspecs/macx-mwerks/qplatformdefs.h @@ -26,7 +26,7 @@ #include #include #include -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD // DNS header files are not fully covered by X/Open specifications. // In particular nothing is said about res_* :/ diff --git a/mkspecs/macx-pbuilder/qplatformdefs.h b/mkspecs/macx-pbuilder/qplatformdefs.h index 6ea456e4c..74a64029b 100644 --- a/mkspecs/macx-pbuilder/qplatformdefs.h +++ b/mkspecs/macx-pbuilder/qplatformdefs.h @@ -22,7 +22,7 @@ #include #include #include -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include diff --git a/mkspecs/macx-xlc/qplatformdefs.h b/mkspecs/macx-xlc/qplatformdefs.h index 6ea456e4c..74a64029b 100644 --- a/mkspecs/macx-xlc/qplatformdefs.h +++ b/mkspecs/macx-xlc/qplatformdefs.h @@ -22,7 +22,7 @@ #include #include #include -#define QT_NO_LIBRARY_UNLOAD +#define TQT_NO_LIBRARY_UNLOAD #include #include diff --git a/plugins/src/accessible/widgets/main.cpp b/plugins/src/accessible/widgets/main.cpp index e63219240..e96a836e4 100644 --- a/plugins/src/accessible/widgets/main.cpp +++ b/plugins/src/accessible/widgets/main.cpp @@ -60,7 +60,7 @@ TQStringList AccessibleFactory::featureList() const list << "TQViewportWidget"; list << "TQClipperWidget"; list << "TQTextEdit"; -#ifndef QT_NO_ICONVIEW +#ifndef TQT_NO_ICONVIEW list << "TQIconView"; #endif list << "TQListView"; @@ -132,7 +132,7 @@ TQRESULT AccessibleFactory::createAccessibleInterface( const TQString &classname *iface = new TQAccessibleViewport( object, object->parent()->parent() ); } else if ( classname == "TQTextEdit" ) { *iface = new TQAccessibleTextEdit( object ); -#ifndef QT_NO_ICONVIEW +#ifndef TQT_NO_ICONVIEW } else if ( classname == "TQIconView" ) { *iface = new TQAccessibleIconView( object ); #endif diff --git a/plugins/src/accessible/widgets/qaccessiblewidget.cpp b/plugins/src/accessible/widgets/qaccessiblewidget.cpp index b40debbe7..319995655 100644 --- a/plugins/src/accessible/widgets/qaccessiblewidget.cpp +++ b/plugins/src/accessible/widgets/qaccessiblewidget.cpp @@ -1264,11 +1264,11 @@ TQAccessible::Role TQAccessibleDisplay::role( int control ) const TQLabel *l = (TQLabel*)widget(); if ( l->pixmap() || l->picture() ) return Graphic; -#ifndef QT_NO_PICTURE +#ifndef TQT_NO_PICTURE if ( l->picture() ) return Graphic; #endif -#ifndef QT_NO_MOVIE +#ifndef TQT_NO_MOVIE if ( l->movie() ) return Animation; #endif @@ -2572,7 +2572,7 @@ TQMemArray TQAccessibleListView::selection() const return array; } -#ifndef QT_NO_ICONVIEW +#ifndef TQT_NO_ICONVIEW /*! \class TQAccessibleIconView qaccessiblewidget.h \brief The TQAccessibleIconView class implements the TQAccessibleInterface for icon views. diff --git a/plugins/src/accessible/widgets/qaccessiblewidget.h b/plugins/src/accessible/widgets/qaccessiblewidget.h index 903271747..8dc0db5db 100644 --- a/plugins/src/accessible/widgets/qaccessiblewidget.h +++ b/plugins/src/accessible/widgets/qaccessiblewidget.h @@ -17,7 +17,7 @@ class TQComboBox; class TQTitleBar; class TQWidgetStack; -#ifndef QT_NO_ICONVIEW +#ifndef TQT_NO_ICONVIEW class TQIconView; #endif @@ -368,7 +368,7 @@ protected: TQListView *listView() const; }; -#ifndef QT_NO_ICONVIEW +#ifndef TQT_NO_ICONVIEW class TQAccessibleIconView : public TQAccessibleScrollView { public: diff --git a/plugins/src/imageformats/jpeg/main.cpp b/plugins/src/imageformats/jpeg/main.cpp index 516244c01..f329756f5 100644 --- a/plugins/src/imageformats/jpeg/main.cpp +++ b/plugins/src/imageformats/jpeg/main.cpp @@ -1,9 +1,9 @@ #include -#ifndef QT_NO_IMAGEFORMATPLUGIN +#ifndef TQT_NO_IMAGEFORMATPLUGIN -#ifdef QT_NO_IMAGEIO_JPEG -#undef QT_NO_IMAGEIO_JPEG +#ifdef TQT_NO_IMAGEIO_JPEG +#undef TQT_NO_IMAGEIO_JPEG #endif #include "../../../../src/kernel/qjpegio.cpp" @@ -70,4 +70,4 @@ bool JPEGFormat::installIOHandler( const TQString &name ) Q_EXPORT_PLUGIN( JPEGFormat ) -#endif // QT_NO_IMAGEFORMATPLUGIN +#endif // TQT_NO_IMAGEFORMATPLUGIN diff --git a/plugins/src/imageformats/mng/main.cpp b/plugins/src/imageformats/mng/main.cpp index 62e159a35..74aca8e76 100644 --- a/plugins/src/imageformats/mng/main.cpp +++ b/plugins/src/imageformats/mng/main.cpp @@ -1,9 +1,9 @@ #include -#ifndef QT_NO_IMAGEFORMATPLUGIN +#ifndef TQT_NO_IMAGEFORMATPLUGIN -#ifdef QT_NO_IMAGEIO_MNG -#undef QT_NO_IMAGEIO_MNG +#ifdef TQT_NO_IMAGEIO_MNG +#undef TQT_NO_IMAGEIO_MNG #endif #include "../../../../src/kernel/qmngio.cpp" @@ -52,4 +52,4 @@ bool MNGFormat::installIOHandler( const TQString &name ) Q_EXPORT_PLUGIN( MNGFormat ) -#endif // QT_NO_IMAGEFORMATPLUGIN +#endif // TQT_NO_IMAGEFORMATPLUGIN diff --git a/plugins/src/imageformats/png/main.cpp b/plugins/src/imageformats/png/main.cpp index fff207613..ce37abb44 100644 --- a/plugins/src/imageformats/png/main.cpp +++ b/plugins/src/imageformats/png/main.cpp @@ -1,9 +1,9 @@ #include -#ifndef QT_NO_IMAGEFORMATPLUGIN +#ifndef TQT_NO_IMAGEFORMATPLUGIN -#ifdef QT_NO_IMAGEIO_PNG -#undef QT_NO_IMAGEIO_PNG +#ifdef TQT_NO_IMAGEIO_PNG +#undef TQT_NO_IMAGEIO_PNG #endif #include "../../../../src/kernel/qpngio.cpp" @@ -70,4 +70,4 @@ bool PNGFormat::installIOHandler( const TQString &name ) Q_EXPORT_PLUGIN( PNGFormat ) -#endif // QT_NO_IMAGEFORMATPLUGIN +#endif // TQT_NO_IMAGEFORMATPLUGIN diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp index a721d9739..24259bd09 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.cpp @@ -40,18 +40,18 @@ ** **********************************************************************/ -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qmultiinputcontext.h" #include #include #include -#ifndef QT_NO_IM_EXTENSIONS +#ifndef TQT_NO_IM_EXTENSIONS #include #endif #include -#define QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX +#define TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX TQMultiInputContext::TQMultiInputContext() : TQInputContext(), _slave( 0 ), imIndex( 0 ), cachedFocus( FALSE ), @@ -64,7 +64,7 @@ TQMultiInputContext::TQMultiInputContext() if ( getenv( "QT_IM_MODULE" ) ) { currentIMKey = getenv( "QT_IM_MODULE" ); } else { -#ifndef QT_NO_IM_EXTENSIONS +#ifndef TQT_NO_IM_EXTENSIONS TQSettings settings; currentIMKey = settings.readEntry( "/qt/DefaultInputMethod", "xim" ); #else @@ -100,7 +100,7 @@ bool TQMultiInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event ) bool TQMultiInputContext::filterEvent( const TQEvent *event ) { -#if !defined(QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX) +#if !defined(TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX) if ( event->type() == TQEvent::KeyPress ) { TQKeyEvent *keyevent = (TQKeyEvent *)event; @@ -236,7 +236,7 @@ bool TQMultiInputContext::isPreeditRelocationEnabled() TQInputContext *TQMultiInputContext::slave() { if ( ! _slave ) { -#if !defined(QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX) +#if !defined(TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX) changeInputMethod( imIndex ); #else changeInputMethod( currentIMKey ); @@ -253,7 +253,7 @@ const TQInputContext *TQMultiInputContext::slave() const void TQMultiInputContext::changeInputMethod( int newIndex ) { -#if !defined(QT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX) +#if !defined(TQT_NO_IM_QMULTIINPUTCONTEXT_IMINDEX) TQStringList keys = TQInputContextFactory::keys(); if ( keys.size() == 0 ) return; diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h index 3ef3ba4d2..f6ae6bb84 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontext.h @@ -43,7 +43,7 @@ #ifndef TQMULTIINPUTCONTEXT_H #define TQMULTIINPUTCONTEXT_H -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include #include diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp index 08d0a1ddd..942ee0251 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.cpp @@ -40,7 +40,7 @@ ** **********************************************************************/ -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qmultiinputcontext.h" #include "qmultiinputcontextplugin.h" #include diff --git a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h index 95c987925..5a399412a 100644 --- a/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h +++ b/plugins/src/inputmethods/imsw-multi/qmultiinputcontextplugin.h @@ -40,7 +40,7 @@ ** **********************************************************************/ -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qmultiinputcontext.h" #include #include diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp index 9f6014be5..f4d8e59ff 100644 --- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp +++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp @@ -40,7 +40,7 @@ ** **********************************************************************/ -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qnoneinputcontextplugin.h" #include #include diff --git a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h index 8b5fd2212..9c877e5c3 100644 --- a/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h +++ b/plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.h @@ -40,7 +40,7 @@ ** **********************************************************************/ -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include #include diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp index a7d2bb320..539d35a6d 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp +++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.cpp @@ -40,7 +40,7 @@ ** **********************************************************************/ -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qsimpleinputcontext.h" #include "qsimpleinputcontextplugin.h" #include diff --git a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h index 84e23b312..c1988b5f3 100644 --- a/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h +++ b/plugins/src/inputmethods/simple/qsimpleinputcontextplugin.h @@ -40,7 +40,7 @@ ** **********************************************************************/ -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qsimpleinputcontext.h" #include #include diff --git a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp index b631d1916..e9dbcdd29 100644 --- a/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp +++ b/plugins/src/inputmethods/xim/qximinputcontext_x11.cpp @@ -41,7 +41,7 @@ const int XKeyRelease = KeyRelease; #undef KeyPress #undef KeyRelease -#if !defined(QT_NO_IM) +#if !defined(TQT_NO_IM) #include "qplatformdefs.h" @@ -55,7 +55,7 @@ const int XKeyRelease = KeyRelease; #include #include -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) #define XK_MISCELLANY #define XK_LATIN1 @@ -75,7 +75,7 @@ extern int qt_ximComposingKeycode; extern TQTextCodec * qt_input_mapper; -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) #if defined(Q_C_CALLBACKS) extern "C" { @@ -107,9 +107,9 @@ extern "C" { } #endif // Q_C_CALLBACKS -#endif // QT_NO_XIM +#endif // TQT_NO_XIM -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM /* The cache here is needed, as X11 leaks a few kb for every XFreeFontSet call, so we avoid creating and deletion of fontsets as @@ -334,7 +334,7 @@ extern "C" { } #endif // Q_C_CALLBACKS -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM @@ -353,7 +353,7 @@ void TQXIMInputContext::setHolderWidget( TQWidget *widget ) TQInputContext::setHolderWidget( widget ); -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) fontsetRefCount++; if (! qt_xim) { tqWarning("TQInputContext: no input method context available"); @@ -428,14 +428,14 @@ void TQXIMInputContext::setHolderWidget( TQWidget *widget ) if( ! ximContextList ) ximContextList = new TQPtrList; ximContextList->append( this ); -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM } TQXIMInputContext::~TQXIMInputContext() { -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) if (ic) XDestroyIC((XIC) ic); @@ -464,14 +464,14 @@ TQXIMInputContext::~TQXIMInputContext() ximContextList = 0; } } -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM ic = 0; } void TQXIMInputContext::init_xim() { -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM if(!isInitXIM) isInitXIM = TRUE; @@ -503,7 +503,7 @@ void TQXIMInputContext::init_xim() else TQXIMInputContext::create_xim(); #endif // USE_X11R6_XIM -#endif // QT_NO_XIM +#endif // TQT_NO_XIM } @@ -512,7 +512,7 @@ void TQXIMInputContext::init_xim() */ void TQXIMInputContext::create_xim() { -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM Display *appDpy = TQPaintDevice::x11AppDisplay(); qt_xim = XOpenIM( appDpy, 0, 0, 0 ); if ( qt_xim ) { @@ -571,7 +571,7 @@ void TQXIMInputContext::create_xim() TQXIMInputContext::close_xim(); } } -#endif // QT_NO_XIM +#endif // TQT_NO_XIM } @@ -580,7 +580,7 @@ void TQXIMInputContext::create_xim() */ void TQXIMInputContext::close_xim() { -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM TQString errMsg( "TQXIMInputContext::close_xim() has been called" ); // Calling XCloseIM gives a Purify FMR error @@ -597,13 +597,13 @@ void TQXIMInputContext::close_xim() } // ximContextList will be deleted in ~TQXIMInputContext } -#endif // QT_NO_XIM +#endif // TQT_NO_XIM } bool TQXIMInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event ) { -#ifndef QT_NO_XIM +#ifndef TQT_NO_XIM int xkey_keycode = event->xkey.keycode; if ( XFilterEvent( event, keywidget->topLevelWidget()->winId() ) ) { qt_ximComposingKeycode = xkey_keycode; // ### not documented in xlib @@ -694,7 +694,7 @@ bool TQXIMInputContext::x11FilterEvent( TQWidget *keywidget, XEvent *event ) return TRUE; } } -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM return FALSE; } @@ -711,7 +711,7 @@ void TQXIMInputContext::sendIMEvent( TQEvent::Type type, const TQString &text, void TQXIMInputContext::reset() { -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) if ( focusWidget() && isComposing() && ! composingText.isNull() ) { #ifdef QT_XIM_DEBUG tqDebug("TQXIMInputContext::reset: composing - sending IMEnd (empty) to %p", @@ -725,18 +725,18 @@ void TQXIMInputContext::reset() if (mb) XFree(mb); } -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM } void TQXIMInputContext::resetClientState() { -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) composingText = TQString::null; if ( selectedChars.size() < 128 ) selectedChars.resize( 128 ); selectedChars.fill( 0 ); -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM } @@ -785,7 +785,7 @@ void TQXIMInputContext::mouseHandler( int , TQEvent::Type type, void TQXIMInputContext::setComposePosition(int x, int y) { -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) if (qt_xim && ic) { XPoint point; point.x = x; @@ -799,13 +799,13 @@ void TQXIMInputContext::setComposePosition(int x, int y) XSetICValues((XIC) ic, XNPreeditAttributes, preedit_attr, (char *) 0); XFree(preedit_attr); } -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM } void TQXIMInputContext::setComposeArea(int x, int y, int w, int h) { -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) if (qt_xim && ic) { XRectangle rect; rect.x = x; @@ -826,7 +826,7 @@ void TQXIMInputContext::setComposeArea(int x, int y, int w, int h) void TQXIMInputContext::setXFontSet(const TQFont &f) { -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) if (font == f) return; // nothing to do font = f; @@ -848,7 +848,7 @@ int TQXIMInputContext::lookupString(XKeyEvent *event, TQCString &chars, { int count = 0; -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) if (qt_xim && ic) { count = XmbLookupString((XIC) ic, event, chars.data(), chars.size(), key, status); @@ -860,25 +860,25 @@ int TQXIMInputContext::lookupString(XKeyEvent *event, TQCString &chars, } } -#endif // QT_NO_XIM +#endif // TQT_NO_XIM return count; } void TQXIMInputContext::setFocus() { -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) if ( qt_xim && ic ) XSetICFocus((XIC) ic); -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM } void TQXIMInputContext::unsetFocus() { -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) if (qt_xim && ic) XUnsetICFocus((XIC) ic); -#endif // !QT_NO_XIM +#endif // !TQT_NO_XIM // Don't reset Japanese input context here. Japanese input context // sometimes contains a whole paragraph and has minutes of @@ -911,7 +911,7 @@ TQString TQXIMInputContext::identifierName() TQString TQXIMInputContext::language() { -#if !defined(QT_NO_XIM) +#if !defined(TQT_NO_XIM) if ( qt_xim ) { TQString locale( XLocaleOfIM( qt_xim ) ); @@ -927,4 +927,4 @@ TQString TQXIMInputContext::language() return _language; } -#endif //QT_NO_IM +#endif //TQT_NO_IM diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp index 381b808a8..9b35ef9a0 100644 --- a/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp +++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.cpp @@ -40,7 +40,7 @@ ** **********************************************************************/ -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qximinputcontext.h" #include "qximinputcontextplugin.h" #include diff --git a/plugins/src/inputmethods/xim/qximinputcontextplugin.h b/plugins/src/inputmethods/xim/qximinputcontextplugin.h index d930eeecd..6ba643352 100644 --- a/plugins/src/inputmethods/xim/qximinputcontextplugin.h +++ b/plugins/src/inputmethods/xim/qximinputcontextplugin.h @@ -40,7 +40,7 @@ ** **********************************************************************/ -#ifndef QT_NO_IM +#ifndef TQT_NO_IM #include "qximinputcontext.h" #include #include diff --git a/plugins/src/inputmethods/xim/xim.pro b/plugins/src/inputmethods/xim/xim.pro index 994f0d443..ae83967fb 100644 --- a/plugins/src/inputmethods/xim/xim.pro +++ b/plugins/src/inputmethods/xim/xim.pro @@ -6,7 +6,7 @@ INCLUDEPATH += . CONFIG += qt warn_on debug plugin target.path += $$plugins.path/inputmethods INSTALLS += target -DEFINES += QT_NO_XINERAMA +DEFINES += TQT_NO_XINERAMA # Input HEADERS += qximinputcontext.h \ diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index c6a3906da..8e94d388a 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -35,8 +35,8 @@ DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makef CXXFLAGS= @QMAKE_CXXFLAGS@ \ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ -I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \ - -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DTQT_NO_STL \ - -DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP + -DTQT_NO_TEXTCODEC -DTQT_NO_UNICODETABLES -DTQT_NO_COMPONENT -DTQT_NO_STL \ + -DTQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP LFLAGS=@QMAKE_LFLAGS@ tqmake: $(OBJS) $(QOBJS) diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 564bfa2be..a25b8f35f 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -5,7 +5,7 @@ CXX = g++ CFLAGS = -c -o$@ -O \ -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \ -I..\mkspecs\win32-g++ \ - -DUNICODE -DQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DQT_NO_COMPRESS + -DUNICODE -DTQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DTQT_NO_COMPRESS CXXFLAGS = $(CFLAGS) LFLAGS = LIBS = -lole32 -luuid diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp index 5b8802a0a..22cc89b33 100644 --- a/qmake/generators/mac/metrowerks_xml.cpp +++ b/qmake/generators/mac/metrowerks_xml.cpp @@ -534,7 +534,7 @@ MetrowerksMakefileGenerator::init() if(configs.findIndex("moc")) configs.append("moc"); if ( !project->isActiveConfig("debug") ) - project->variables()["DEFINES"].append("QT_NO_DEBUG"); + project->variables()["DEFINES"].append("TQT_NO_DEBUG"); } //version handling diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 758634b34..7779a7307 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -177,7 +177,7 @@ UnixMakefileGenerator::init() if(configs.findIndex("moc")) configs.append("moc"); project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"]; if ( !project->isActiveConfig("debug") ) - project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG"); if ( !is_qt ) { if ( !project->isEmpty("QMAKE_RPATH") ) { if ( !project->isEmpty("QMAKE_RTLDIR_QT") ) diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index 0acae966a..9d8dc7cb6 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -480,7 +480,7 @@ BorlandMakefileGenerator::init() project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"]; project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"]; if ( !project->isActiveConfig("debug") ) - project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG"); if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) { project->variables()["DEFINES"].append("QT_MAKEDLL"); diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index 2a3ab3e02..069524314 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -494,7 +494,7 @@ MingwMakefileGenerator::init() project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"]; project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"]; if ( !project->isActiveConfig("debug") ) - project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG"); if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) { project->variables()["DEFINES"].append("QT_MAKEDLL"); diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index fabdd7232..6b6b8fdbd 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp @@ -918,7 +918,7 @@ DspMakefileGenerator::init() project->variables()["MSVCDSP_INCPATH"].append("/I \"" + specdir() + "\""); if ( project->isActiveConfig("qt") ) { - project->variables()["MSVCDSP_RELDEFS"].append("/D \"QT_NO_DEBUG\""); + project->variables()["MSVCDSP_RELDEFS"].append("/D \"TQT_NO_DEBUG\""); } else { project->variables()["MSVCDSP_RELDEFS"].clear(); } diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index a9e08a855..a1ada25f5 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -580,7 +580,7 @@ NmakeMakefileGenerator::init() project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"]; project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"]; if ( !project->isActiveConfig("debug") ) - project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG"); + project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_NO_DEBUG"); if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) { if ( !project->variables()["QMAKE_QT_DLL"].isEmpty()) { project->variables()["DEFINES"].append("QT_MAKEDLL"); diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index 40034ace5..999b05f04 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -648,8 +648,8 @@ void VcprojGenerator::initConfiguration() if (!project->variables()["QMAKE_CXXFLAGS_RELEASE"].contains("Gm") && project->variables()["QMAKE_CXXFLAGS_DEBUG"].contains("Gm")) RConf.compiler.parseOption("-Gm-"); - if (RConf.compiler.PreprocessorDefinitions.findIndex("QT_NO_DEBUG") == -1) - RConf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; + if (RConf.compiler.PreprocessorDefinitions.findIndex("TQT_NO_DEBUG") == -1) + RConf.compiler.PreprocessorDefinitions += "TQT_NO_DEBUG"; } else { DConf.IntermediateDirectory = DConf.compiler.AssemblerListingLocation = @@ -659,7 +659,7 @@ void VcprojGenerator::initConfiguration() DConf.linker.DelayLoadDLLs.clear(); DConf.compiler.parseOptions(project->variables()["QMAKE_CFLAGS_DEBUG"]); DConf.compiler.parseOptions(project->variables()["QMAKE_CXXFLAGS_DEBUG"]); - DConf.compiler.PreprocessorDefinitions.remove("QT_NO_DEBUG"); + DConf.compiler.PreprocessorDefinitions.remove("TQT_NO_DEBUG"); } // Add Debug configuration to project @@ -704,7 +704,7 @@ void VcprojGenerator::initCompilerTool() // Release version RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS"] ); RConf.compiler.parseOptions( project->variables()["QMAKE_CXXFLAGS_RELEASE"] ); - RConf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; + RConf.compiler.PreprocessorDefinitions += "TQT_NO_DEBUG"; RConf.compiler.PreprocessorDefinitions += "NDEBUG"; if ( project->isActiveConfig("thread") ) { if ( (projectTarget == Application) || (projectTarget == StaticLib) ) diff --git a/src/attic/qtmultilineedit.cpp b/src/attic/qtmultilineedit.cpp index 27a65e4f5..0f52e6cf6 100644 --- a/src/attic/qtmultilineedit.cpp +++ b/src/attic/qtmultilineedit.cpp @@ -12,7 +12,7 @@ **********************************************************************/ #include "qtmultilineedit.h" -#ifndef QT_NO_QTMULTILINEEDIT +#ifndef TQT_NO_QTMULTILINEEDIT #include "ntqpainter.h" #include "ntqscrollbar.h" #include "ntqclipboard.h" @@ -320,7 +320,7 @@ static const char * const arrow_xpm[] = { enum { IdUndo, IdRedo, -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD IdCut, IdCopy, IdPaste, @@ -396,7 +396,7 @@ struct TQtMultiLineData TQPixmap arrow; TQPoint dnd_startpos; TQTimer *blinkTimer, *scrollTimer; -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP TQTimer *dnd_timer; #endif }; @@ -584,7 +584,7 @@ TQtMultiLineEdit::TQtMultiLineEdit( TQWidget *parent , const char *name ) setWFlags( WResizeNoErase ); setKeyCompression( TRUE ); setFocusPolicy( WheelFocus ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( ibeamCursor ); verticalScrollBar()->setCursor( arrowCursor ); horizontalScrollBar()->setCursor( arrowCursor ); @@ -607,7 +607,7 @@ TQtMultiLineEdit::TQtMultiLineEdit( TQWidget *parent , const char *name ) d->scrollTimer = new TQTimer( this ); connect( d->scrollTimer, SIGNAL( timeout() ), this, SLOT( scrollTimerTimeout() ) ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP d->dnd_timer = new TQTimer( this ); connect( d->dnd_timer, SIGNAL( timeout() ), this, SLOT( dndTimeout() ) ); @@ -691,7 +691,7 @@ void TQtMultiLineEdit::setReadOnly( bool on ) { if ( readOnly != on ) { readOnly = on; -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR setCursor( on ? arrowCursor : ibeamCursor ); #endif } @@ -839,7 +839,7 @@ void TQtMultiLineEdit::paintCell( TQPainter *painter, int row, int ) cXPos + 2, cYPos + fm.height() - 2); */ -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS // TODO: set it other times, eg. when scrollbar moves view TQWMatrix wm = painter->worldMatrix(); setMicroFocusHint( int(wm.dx()+cXPos), @@ -933,7 +933,7 @@ void TQtMultiLineEdit::timerEvent( TQTimerEvent * ) // ############ Remove in 3.0!!!!!!!! } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void TQtMultiLineEdit::doDrag() { if ( d->dnd_timer ) { @@ -1243,7 +1243,7 @@ void TQtMultiLineEdit::keyPressEvent( TQKeyEvent *e ) case Key_Prior: setTopCell( TQMAX( topCell() - pageSize, 0 ) ); break; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD case Key_C: if ( echoMode() == Normal && (e->state()&ControlButton) ) copy(); @@ -1287,7 +1287,7 @@ void TQtMultiLineEdit::keyPressEvent( TQKeyEvent *e ) case Key_B: cursorLeft( e->state() & ShiftButton ); break; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD case Key_C: if ( echoMode() == Normal ) copy(); @@ -1333,7 +1333,7 @@ void TQtMultiLineEdit::keyPressEvent( TQKeyEvent *e ) case Key_P: cursorUp( e->state() & ShiftButton ); break; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD case Key_V: paste(); break; @@ -1411,7 +1411,7 @@ void TQtMultiLineEdit::keyPressEvent( TQKeyEvent *e ) case Key_F14: // Undo key on Sun keyboards undo(); break; -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD case Key_F16: // Copy key on Sun keyboards if ( echoMode() == Normal ) copy(); @@ -2128,11 +2128,11 @@ void TQtMultiLineEdit::mousePressEvent( TQMouseEvent *e ) id[ IdUndo ] = popup->insertItem( tr( "Undo" ) ); id[ IdRedo ] = popup->insertItem( tr( "Redo" ) ); popup->insertSeparator(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD id[ IdCut ] = popup->insertItem( tr( "Cut" ) ); id[ IdCopy ] = popup->insertItem( tr( "Copy" ) ); id[ IdPaste ] = popup->insertItem( tr( "Paste" ) ); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD id[ IdPasteSpecial ] = popup->insertItem( tr( "Paste special..." ) ); #endif #endif @@ -2143,13 +2143,13 @@ void TQtMultiLineEdit::mousePressEvent( TQMouseEvent *e ) !this->d->undoList.isEmpty() ); popup->setItemEnabled( id[ IdRedo ], !this->d->redoList.isEmpty() ); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD popup->setItemEnabled( id[ IdCut ], !isReadOnly() && hasMarkedText() ); popup->setItemEnabled( id[ IdCopy ], hasMarkedText() ); popup->setItemEnabled( id[ IdPaste ], !isReadOnly() && (bool)TQApplication::clipboard()->text().length() ); -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD // Any non-plain types? TQMimeSource* ms = TQApplication::clipboard()->data(); bool ps = FALSE; @@ -2179,14 +2179,14 @@ void TQtMultiLineEdit::mousePressEvent( TQMouseEvent *e ) undo(); else if ( r == id[ IdRedo ] ) redo(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD else if ( r == id[ IdCut ] ) cut(); else if ( r == id[ IdCopy ] ) copy(); else if ( r == id[ IdPaste ] ) paste(); -# ifndef QT_NO_MIMECLIPBOARD +# ifndef TQT_NO_MIMECLIPBOARD else if ( r == id[ IdPasteSpecial ] ) pasteSpecial(TQCursor::pos()); # endif @@ -2211,7 +2211,7 @@ void TQtMultiLineEdit::mousePressEvent( TQMouseEvent *e ) return; } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( inMark(newX, newY) // Click on highlighted text && echoMode() == Normal // No DnD of passwords, etc. @@ -2299,7 +2299,7 @@ void TQtMultiLineEdit::stopAutoScroll() */ void TQtMultiLineEdit::mouseMoveEvent( TQMouseEvent *e ) { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP d->dnd_timer->stop(); if ( d->dnd_primed && ( d->dnd_startpos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) { @@ -2360,7 +2360,7 @@ void TQtMultiLineEdit::extendSelectionWord( int &newX, int&newY) void TQtMultiLineEdit::mouseReleaseEvent( TQMouseEvent *e ) { stopAutoScroll(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP if ( d->dnd_timer->isActive() ) { d->dnd_timer->stop(); d->dnd_primed = FALSE; @@ -2374,7 +2374,7 @@ void TQtMultiLineEdit::mouseReleaseEvent( TQMouseEvent *e ) if ( markAnchorY == markDragY && markAnchorX == markDragX ) turnMark( FALSE ); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD #if defined(_WS_X11_) else if ( echoMode() == Normal ) copy(); @@ -2419,7 +2419,7 @@ void TQtMultiLineEdit::mouseDoubleClickEvent( TQMouseEvent *m ) } } -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP /* \reimp @@ -2510,7 +2510,7 @@ void TQtMultiLineEdit::dropEvent( TQDropEvent* event ) } } -#endif // QT_NO_DRAGANDDROP +#endif // TQT_NO_DRAGANDDROP /* @@ -2644,7 +2644,7 @@ void TQtMultiLineEdit::setBottomCell( int line ) setYOffset( TQMAX( newYPos, 0 ) ); } -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD /* Copies text in MIME subtype \a subtype from the clipboard onto the current @@ -2692,7 +2692,7 @@ void TQtMultiLineEdit::paste() pasteSubType("plain"); } -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD /* Prompts the user for a type from a list of text types available, Then copies text from the clipboard onto the current cursor position. @@ -2705,7 +2705,7 @@ void TQtMultiLineEdit::pasteSpecial(const TQPoint& pt) pasteSubType(st); } #endif -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQCString TQtMultiLineEdit::pickSpecial(TQMimeSource* ms, bool always_ask, const TQPoint& pt) { if ( ms ) { @@ -2734,8 +2734,8 @@ TQCString TQtMultiLineEdit::pickSpecial(TQMimeSource* ms, bool always_ask, const } return TQCString(); } -#endif // QT_NO_MIME -#endif // QT_NO_CLIPBOARD +#endif // TQT_NO_MIME +#endif // TQT_NO_CLIPBOARD /* @@ -2843,7 +2843,7 @@ void TQtMultiLineEdit::markWord( int posx, int posy ) markDragY = posy; turnMark( markDragX != markAnchorX || markDragY != markAnchorY ); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD #if defined(_WS_X11_) if ( echoMode() == Normal ) copy(); @@ -2865,7 +2865,7 @@ int TQtMultiLineEdit::charClass( TQChar ch ) else return 3; } -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD /* Copies the marked text to the clipboard. Will copy only if echoMode() is Normal. @@ -4156,7 +4156,7 @@ void TQtMultiLineEdit::scrollTimerTimeout() void TQtMultiLineEdit::dndTimeout() { -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP doDrag(); #endif } diff --git a/src/attic/qtmultilineedit.h b/src/attic/qtmultilineedit.h index da12cb543..10573e3dd 100644 --- a/src/attic/qtmultilineedit.h +++ b/src/attic/qtmultilineedit.h @@ -20,7 +20,7 @@ #include "ntqptrlist.h" #endif // QT_H -#ifndef QT_NO_QTMULTILINEEDIT +#ifndef TQT_NO_QTMULTILINEEDIT struct TQtMultiLineData; class TQtMultiLineEditCommand; @@ -149,7 +149,7 @@ public slots: void append( const TQString &); void deselect(); void selectAll(); -#ifndef QT_NO_CLIPBOARD +#ifndef TQT_NO_CLIPBOARD void paste(); void pasteSubType(const TQCString& subtype); void copyText() const; @@ -185,7 +185,7 @@ protected: bool focusNextPrevChild( bool ); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void dragMoveEvent( TQDragMoveEvent* ); void dragEnterEvent( TQDragEnterEvent * ); void dropEvent( TQDropEvent* ); @@ -232,10 +232,10 @@ private slots: void dndTimeout(); private: -#ifndef QT_NO_MIME +#ifndef TQT_NO_MIME TQCString pickSpecial(TQMimeSource* ms, bool always_ask, const TQPoint&); #endif -#ifndef QT_NO_MIMECLIPBOARD +#ifndef TQT_NO_MIMECLIPBOARD void pasteSpecial(const TQPoint&); #endif struct TQtMultiLineEditRow { @@ -291,7 +291,7 @@ private: bool afterMark( int posx, int posy ) const; int setNumRowsAndTruncate(); -#ifndef QT_NO_DRAGANDDROP +#ifndef TQT_NO_DRAGANDDROP void doDrag(); #endif void startAutoScroll(); @@ -358,6 +358,6 @@ inline int TQtMultiLineEdit::numLines() const return contents->count(); } -#endif // QT_NO_QTMULTILINEEDIT +#endif // TQT_NO_QTMULTILINEEDIT #endif // TQTMULTILINEDIT_H diff --git a/src/attic/qttableview.cpp b/src/attic/qttableview.cpp index 9f68ec4b8..ea55a9ff6 100644 --- a/src/attic/qttableview.cpp +++ b/src/attic/qttableview.cpp @@ -12,7 +12,7 @@ **********************************************************************/ #include "qttableview.h" -#ifndef QT_NO_QTTABLEVIEW +#ifndef TQT_NO_QTTABLEVIEW #include "ntqscrollbar.h" #include "ntqpainter.h" #include "ntqdrawutil.h" @@ -1313,7 +1313,7 @@ void TQtTableView::paintEvent( TQPaintEvent *e ) TQRect winR = viewRect(); TQRect cellR; TQRect cellUR; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix matrix; #endif @@ -1337,7 +1337,7 @@ void TQtTableView::paintEvent( TQPaintEvent *e ) if ( eraseInPaint ) paint.eraseRect( cellUR ); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS matrix.translate( xPos, yPos ); paint.setWorldMatrix( matrix ); if ( testTableFlags(Tbl_clipCellPainting) || @@ -1438,7 +1438,7 @@ TQScrollBar *TQtTableView::verticalScrollBar() const TQtTableView *that = (TQtTableView*)this; // semantic const if ( !vScrollBar ) { TQScrollBar *sb = new TQScrollBar( TQScrollBar::Vertical, that ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif sb->resize( sb->sizeHint() ); // height is irrelevant @@ -1469,7 +1469,7 @@ TQScrollBar *TQtTableView::horizontalScrollBar() const TQtTableView *that = (TQtTableView*)this; // semantic const if ( !hScrollBar ) { TQScrollBar *sb = new TQScrollBar( TQScrollBar::Horizontal, that ); -#ifndef QT_NO_CURSOR +#ifndef TQT_NO_CURSOR sb->setCursor( arrowCursor ); #endif sb->resize( sb->sizeHint() ); // width is irrelevant diff --git a/src/attic/qttableview.h b/src/attic/qttableview.h index 43468c83a..b48f44e1b 100644 --- a/src/attic/qttableview.h +++ b/src/attic/qttableview.h @@ -18,7 +18,7 @@ #include "ntqframe.h" #endif // QT_H -#ifndef QT_NO_QTTABLEVIEW +#ifndef TQT_NO_QTTABLEVIEW class TQScrollBar; class TQCornerSquare; @@ -245,6 +245,6 @@ inline void TQtTableView::updateScrollBars() { updateScrollBars( 0 ); } -#endif // QT_NO_QTTABLEVIEW +#endif // TQT_NO_QTTABLEVIEW #endif // TQTTABLEVIEW_H diff --git a/src/canvas/ntqcanvas.h b/src/canvas/ntqcanvas.h index 8b2958dcb..1b18dab4e 100644 --- a/src/canvas/ntqcanvas.h +++ b/src/canvas/ntqcanvas.h @@ -59,7 +59,7 @@ #define TQM_TEMPLATE_EXTERN_CANVAS Q_TEMPLATE_EXTERN #endif -#ifndef QT_NO_CANVAS +#ifndef TQT_NO_CANVAS class TQCanvasSprite; @@ -403,7 +403,7 @@ private: class TQM_EXPORT_CANVAS TQCanvasPixmap : public TQPixmap { public: -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQCanvasPixmap(const TQString& datafilename); #endif TQCanvasPixmap(const TQImage& image); @@ -438,7 +438,7 @@ class TQM_EXPORT_CANVAS TQCanvasPixmapArray { public: TQCanvasPixmapArray(); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO TQCanvasPixmapArray(const TQString& datafilenamepattern, int framecount=0); #endif // this form is deprecated @@ -447,7 +447,7 @@ public: TQCanvasPixmapArray(TQValueList, TQPointArray hotspots = TQPointArray() ); ~TQCanvasPixmapArray(); -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool readPixmaps(const TQString& datafilenamepattern, int framecount=0); bool readCollisionMasks(const TQString& filenamepattern); #endif @@ -467,7 +467,7 @@ private: TQCanvasPixmapArray( const TQCanvasPixmapArray & ); TQCanvasPixmapArray &operator=( const TQCanvasPixmapArray & ); #endif -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO bool readPixmaps(const TQString& datafilenamepattern, int framecount, bool maskonly); #endif @@ -811,6 +811,6 @@ private: #define Q_DEFINED_QCANVAS #include "ntqwinexport.h" -#endif // QT_NO_CANVAS +#endif // TQT_NO_CANVAS #endif // TQCANVAS_H diff --git a/src/canvas/qcanvas.cpp b/src/canvas/qcanvas.cpp index d5eceae9b..e947ccfe4 100644 --- a/src/canvas/qcanvas.cpp +++ b/src/canvas/qcanvas.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqcanvas.h" -#ifndef QT_NO_CANVAS +#ifndef TQT_NO_CANVAS #include "ntqapplication.h" #include "ntqbitmap.h" #include "ntqimage.h" @@ -66,7 +66,7 @@ public: class TQCanvasViewData { public: TQCanvasViewData() : repaint_from_moving( FALSE ) {} -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix xform; TQWMatrix ixform; #endif @@ -1067,7 +1067,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, { TQPoint tl = view->contentsToViewport(TQPoint(0,0)); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix wm = view->worldMatrix(); TQWMatrix iwm = wm.invert(); // ivr = covers all chunks in vr @@ -1084,7 +1084,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, if ( !all.contains(ivr) ) { // Need to clip with edge of canvas. -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS // For translation-only transformation, it is safe to include the right // and bottom edges, but otherwise, these must be excluded since they // are not precisely defined (different bresenham paths). @@ -1113,7 +1113,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, offscr.x11SetScreen(p->device()->x11Screen()); #endif TQPainter dbp(&offscr); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS twm.translate(-vr.x(),-vr.y()); twm.translate(-tl.x(),-tl.y()); dbp.setWorldMatrix( wm*twm, TRUE ); @@ -1135,7 +1135,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, } else { p->setClipRect(r); } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS p->setWorldMatrix( wm*twm ); #else #endif @@ -1152,7 +1152,7 @@ void TQCanvas::drawViewArea( TQCanvasView* view, TQPainter* p, const TQRect& vr, void TQCanvas::update() { TQCanvasClusterizer clusterizer(d->viewList.count()); -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQPtrList doneareas; doneareas.setAutoDelete(TRUE); #endif @@ -1161,13 +1161,13 @@ void TQCanvas::update() TQCanvasView* view; while( (view=it.current()) != 0 ) { ++it; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS TQWMatrix wm = view->worldMatrix(); #endif TQRect area(view->contentsX(),view->contentsY(), view->visibleWidth(),view->visibleHeight()); if (area.width()>0 && area.height()>0) { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( !wm.isIdentity() ) { // r = Visible area of the canvas where there are changes TQRect r = changeBounds(view->inverseWorldMatrix().map(area)); @@ -1190,7 +1190,7 @@ void TQCanvas::update() for (int i=0; iviewList.first(); view; view=d->viewList.next()) { -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS if ( !view->worldMatrix().isIdentity() ) continue; // Cannot paint those here (see callers). #endif @@ -2841,7 +2841,7 @@ TQRect TQCanvasItem::boundingRectAdvanced() const \sa TQCanvasPixmapArray TQCanvasItem TQCanvasSprite */ -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Constructs a TQCanvasPixmap that uses the image stored in \a @@ -2876,7 +2876,7 @@ void TQCanvasPixmap::init(const TQImage& image) convertFromImage(image); hotx = image.offset().x(); hoty = image.offset().y(); -#ifndef QT_NO_IMAGE_DITHER_TO_1 +#ifndef TQT_NO_IMAGE_DITHER_TO_1 if( image.hasAlphaBuffer() ) { TQImage i = image.createAlphaMask(); collision_mask = new TQImage(i); @@ -2971,7 +2971,7 @@ TQCanvasPixmapArray::TQCanvasPixmapArray() { } -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Constructs a TQCanvasPixmapArray from files. @@ -3072,7 +3072,7 @@ void TQCanvasPixmapArray::reset() framecount = 0; } -#ifndef QT_NO_IMAGEIO +#ifndef TQT_NO_IMAGEIO /*! Reads one or more pixmaps into the pixmap array. @@ -3591,7 +3591,7 @@ void TQCanvasView::setCanvas(TQCanvas* canvas) updateContentsSize(); } -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS /*! Returns a reference to the canvas view's current transformation matrix. @@ -3643,7 +3643,7 @@ void TQCanvasView::updateContentsSize() { if ( viewing ) { TQRect br; -#ifndef QT_NO_TRANSFORMATIONS +#ifndef TQT_NO_TRANSFORMATIONS br = d->xform.map(TQRect(0,0,viewing->width(),viewing->height())); #else br = TQRect(0,0,viewing->width(),viewing->height()); @@ -5412,4 +5412,4 @@ void TQCanvasPolygonalItem::scanPolygon(const TQPointArray& pa, int winding, TQP } -#endif // QT_NO_CANVAS +#endif // TQT_NO_CANVAS diff --git a/src/codecs/ntqbig5codec.h b/src/codecs/ntqbig5codec.h index 24b8747ec..73039967f 100644 --- a/src/codecs/ntqbig5codec.h +++ b/src/codecs/ntqbig5codec.h @@ -49,7 +49,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS class TQBig5Codec : public TQTextCodec { public: diff --git a/src/codecs/ntqeucjpcodec.h b/src/codecs/ntqeucjpcodec.h index e0f2edcf0..eb140e947 100644 --- a/src/codecs/ntqeucjpcodec.h +++ b/src/codecs/ntqeucjpcodec.h @@ -75,7 +75,7 @@ #include "ntqjpunicode.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP diff --git a/src/codecs/ntqeuckrcodec.h b/src/codecs/ntqeuckrcodec.h index 216cce616..00b260293 100644 --- a/src/codecs/ntqeuckrcodec.h +++ b/src/codecs/ntqeuckrcodec.h @@ -70,7 +70,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_KR diff --git a/src/codecs/ntqgb18030codec.h b/src/codecs/ntqgb18030codec.h index fa7f897c9..5369a6c35 100644 --- a/src/codecs/ntqgb18030codec.h +++ b/src/codecs/ntqgb18030codec.h @@ -46,7 +46,7 @@ #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_CN diff --git a/src/codecs/ntqjiscodec.h b/src/codecs/ntqjiscodec.h index 6a34cb7dd..c464df003 100644 --- a/src/codecs/ntqjiscodec.h +++ b/src/codecs/ntqjiscodec.h @@ -75,7 +75,7 @@ #include "ntqjpunicode.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP diff --git a/src/codecs/ntqjpunicode.h b/src/codecs/ntqjpunicode.h index 8d19960f8..689c0abb0 100644 --- a/src/codecs/ntqjpunicode.h +++ b/src/codecs/ntqjpunicode.h @@ -74,7 +74,7 @@ #include "ntqglobal.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP @@ -178,5 +178,5 @@ private: int rule; }; -#endif // QT_NO_BIG_CODECS +#endif // TQT_NO_BIG_CODECS #endif /* TQJPUNICODE_H */ diff --git a/src/codecs/ntqrtlcodec.h b/src/codecs/ntqrtlcodec.h index bb031da45..859da5cad 100644 --- a/src/codecs/ntqrtlcodec.h +++ b/src/codecs/ntqrtlcodec.h @@ -45,7 +45,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_CODEC_HEBREW +#ifndef TQT_NO_CODEC_HEBREW class Q_EXPORT TQHebrewCodec : public TQTextCodec { public: diff --git a/src/codecs/ntqsjiscodec.h b/src/codecs/ntqsjiscodec.h index 46fbc9186..9187672f4 100644 --- a/src/codecs/ntqsjiscodec.h +++ b/src/codecs/ntqsjiscodec.h @@ -75,7 +75,7 @@ #include "ntqjpunicode.h" #endif // QT_H -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #if defined(QT_PLUGIN) #define Q_EXPORT_CODECS_JP diff --git a/src/codecs/ntqtextcodec.h b/src/codecs/ntqtextcodec.h index d6ea1a3bd..ad49b5870 100644 --- a/src/codecs/ntqtextcodec.h +++ b/src/codecs/ntqtextcodec.h @@ -45,7 +45,7 @@ #include "ntqstring.h" #endif // QT_H -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC class TQTextCodec; class TQIODevice; @@ -67,10 +67,10 @@ class Q_EXPORT TQTextCodec { public: virtual ~TQTextCodec(); -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS static TQTextCodec* loadCharmap(TQIODevice*); static TQTextCodec* loadCharmapFile(TQString filename); -#endif //QT_NO_CODECS +#endif //TQT_NO_CODECS static TQTextCodec* codecForMib(int mib); static TQTextCodec* codecForName(const char* hint, int accuracy=0); static TQTextCodec* codecForContent(const char* chars, int len); @@ -130,5 +130,5 @@ inline void TQTextCodec::setCodecForTr(TQTextCodec *c) { cftr = c; } inline TQTextCodec* TQTextCodec::codecForCStrings() { return cfcs; } inline void TQTextCodec::setCodecForCStrings(TQTextCodec *c) { cfcs = c; } -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC #endif // TQTEXTCODEC_H diff --git a/src/codecs/ntqtextcodecfactory.h b/src/codecs/ntqtextcodecfactory.h index 94b4dddad..947d32f7a 100644 --- a/src/codecs/ntqtextcodecfactory.h +++ b/src/codecs/ntqtextcodecfactory.h @@ -43,7 +43,7 @@ #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC class TQTextCodec; @@ -54,6 +54,6 @@ public: static TQTextCodec *createForMib( int ); }; -#endif // QT_NO_TEXTCODEC +#endif // TQT_NO_TEXTCODEC #endif // TQTEXTCODECFACTORY_H diff --git a/src/codecs/ntqtextcodecplugin.h b/src/codecs/ntqtextcodecplugin.h index d0ac81034..70c1ce12c 100644 --- a/src/codecs/ntqtextcodecplugin.h +++ b/src/codecs/ntqtextcodecplugin.h @@ -46,7 +46,7 @@ #include "ntqstringlist.h" #endif // QT_H -#ifndef QT_NO_TEXTCODECPLUGIN +#ifndef TQT_NO_TEXTCODECPLUGIN class TQTextCodec; class TQTextCodecPluginPrivate; @@ -66,5 +66,5 @@ public: private: TQTextCodecPluginPrivate *d; }; -#endif // QT_NO_TEXTCODECPLUGIN +#endif // TQT_NO_TEXTCODECPLUGIN #endif // TQTEXTCODECPLUGIN_H diff --git a/src/codecs/ntqtsciicodec.h b/src/codecs/ntqtsciicodec.h index ad04e2f7e..d9486f237 100644 --- a/src/codecs/ntqtsciicodec.h +++ b/src/codecs/ntqtsciicodec.h @@ -72,7 +72,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS class Q_EXPORT TQTsciiCodec : public TQTextCodec { public: diff --git a/src/codecs/ntqutfcodec.h b/src/codecs/ntqutfcodec.h index 8955b6c2c..9c6408af1 100644 --- a/src/codecs/ntqutfcodec.h +++ b/src/codecs/ntqutfcodec.h @@ -45,7 +45,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC class Q_EXPORT TQUtf8Codec : public TQTextCodec { public: @@ -74,5 +74,5 @@ public: int heuristicContentMatch(const char* chars, int len) const; }; -#endif //QT_NO_TEXTCODEC +#endif //TQT_NO_TEXTCODEC #endif // TQUTFCODEC_H diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/qbig5codec.cpp index ddf6a2a20..efeb5415b 100644 --- a/src/codecs/qbig5codec.cpp +++ b/src/codecs/qbig5codec.cpp @@ -100,7 +100,7 @@ #include "ntqbig5codec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS static int qt_Big5hkscsToUnicode(const uchar *s, uint *pwc); int qt_UnicodeToBig5hkscs(uint wc, uchar *r); diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/qeucjpcodec.cpp index 6230559de..226becf04 100644 --- a/src/codecs/qeucjpcodec.cpp +++ b/src/codecs/qeucjpcodec.cpp @@ -116,7 +116,7 @@ #include "ntqeucjpcodec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS static const uchar Esc = 0x1b; static const uchar Ss2 = 0x8e; // Single Shift 2 diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/qeuckrcodec.cpp index 1b325ce66..44e7779c8 100644 --- a/src/codecs/qeuckrcodec.cpp +++ b/src/codecs/qeuckrcodec.cpp @@ -94,7 +94,7 @@ #include "ntqeuckrcodec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS unsigned int qt_Ksc5601ToUnicode(unsigned int code); diff --git a/src/codecs/qfontcncodec.cpp b/src/codecs/qfontcncodec.cpp index f4d5fc327..e628dd856 100644 --- a/src/codecs/qfontcncodec.cpp +++ b/src/codecs/qfontcncodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS extern int qt_UnicodeToGbk(uint unicode, uchar *gbchar); @@ -324,5 +324,5 @@ bool TQFontGb18030_0Codec::canEncode( TQChar ch ) const //========================================================================== -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfontcodecs_p.h b/src/codecs/qfontcodecs_p.h index d323fbb92..cc2cd40b0 100644 --- a/src/codecs/qfontcodecs_p.h +++ b/src/codecs/qfontcodecs_p.h @@ -59,8 +59,8 @@ #endif // QT_H -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS class TQJpUnicodeConv; @@ -378,7 +378,7 @@ public: bool canEncode( TQChar ) const; }; -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS #endif // TQFONTCODECS_P_H diff --git a/src/codecs/qfonthkcodec.cpp b/src/codecs/qfonthkcodec.cpp index 954d53ea1..98fad1dcd 100644 --- a/src/codecs/qfonthkcodec.cpp +++ b/src/codecs/qfonthkcodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS extern int qt_UnicodeToBig5hkscs(uint wc, uchar *r); @@ -156,5 +156,5 @@ bool TQFontBig5hkscsCodec::canEncode( TQChar ch ) const return ( qt_UnicodeToBig5hkscs( ch.unicode(), c ) == 2 ); } -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfontjpcodec.cpp b/src/codecs/qfontjpcodec.cpp index bd21e167e..92c4fe6d9 100644 --- a/src/codecs/qfontjpcodec.cpp +++ b/src/codecs/qfontjpcodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS #include "ntqjpunicode.h" @@ -219,5 +219,5 @@ bool TQFontJis0208Codec::canEncode( TQChar ch ) const -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfontkrcodec.cpp b/src/codecs/qfontkrcodec.cpp index 1c4a21a53..f7dc7f9f8 100644 --- a/src/codecs/qfontkrcodec.cpp +++ b/src/codecs/qfontkrcodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS extern unsigned int qt_UnicodeToKsc5601(unsigned int unicode); @@ -117,5 +117,5 @@ bool TQFontKsc5601Codec::canEncode( TQChar ch ) const return (qt_UnicodeToKsc5601(ch.unicode()) != 0); } -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfontlaocodec.cpp b/src/codecs/qfontlaocodec.cpp index 4a9eda3de..53da705f9 100644 --- a/src/codecs/qfontlaocodec.cpp +++ b/src/codecs/qfontlaocodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS static unsigned char const unicode_to_mulelao[256] = { @@ -147,6 +147,6 @@ bool TQFontLaoCodec::canEncode( TQChar ch ) const } -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qfonttwcodec.cpp b/src/codecs/qfonttwcodec.cpp index 7fe3f80d3..39cc5dd45 100644 --- a/src/codecs/qfonttwcodec.cpp +++ b/src/codecs/qfonttwcodec.cpp @@ -40,8 +40,8 @@ #include "private/qfontcodecs_p.h" -#ifndef QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS extern int qt_UnicodeToBig5hkscs(uint wc, uchar *r); @@ -158,5 +158,5 @@ bool TQFontBig5Codec::canEncode( TQChar ch ) const c[0] >= 0xa1 && c[0] <= 0xf9 ); } -#endif // QT_NO_BIG_CODECS -#endif // QT_NO_CODECS +#endif // TQT_NO_BIG_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp index db2a76fd0..f2c84dab7 100644 --- a/src/codecs/qgb18030codec.cpp +++ b/src/codecs/qgb18030codec.cpp @@ -121,7 +121,7 @@ #error "move obsolete header into the src/compat directory" #endif -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #define InRange(c, lower, upper) (((c) >= (lower)) && ((c) <= (upper))) #define IsLatin(c) ((c) <= 0x7F) diff --git a/src/codecs/qisciicodec.cpp b/src/codecs/qisciicodec.cpp index fa181ca80..952abddb2 100644 --- a/src/codecs/qisciicodec.cpp +++ b/src/codecs/qisciicodec.cpp @@ -1,5 +1,5 @@ #include "qisciicodec_p.h" -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS #define TQValidChar(u) ((u) ? TQChar((u)) : TQChar::replacement) @@ -237,4 +237,4 @@ TQString TQIsciiCodec::toUnicode( const char* chars, int len_in ) const } return result; } -#endif // QT_NO_CODECS +#endif // TQT_NO_CODECS diff --git a/src/codecs/qisciicodec_p.h b/src/codecs/qisciicodec_p.h index ebf9fe14b..2fe0a1150 100644 --- a/src/codecs/qisciicodec_p.h +++ b/src/codecs/qisciicodec_p.h @@ -5,7 +5,7 @@ #include "ntqtextcodec.h" #endif // QT_H -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS class TQIsciiCodec : public TQTextCodec { public: @@ -29,5 +29,5 @@ private: int idx; }; -#endif // QT_NO_CODECS +#endif // TQT_NO_CODECS #endif // TQISCIIDEVCODEC_H diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp index 366a19f5b..8922209c7 100644 --- a/src/codecs/qjiscodec.cpp +++ b/src/codecs/qjiscodec.cpp @@ -134,7 +134,7 @@ #include "ntqjiscodec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS static const uchar Esc = 0x1b; static const uchar So = 0x0e; // Shift Out diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp index ea0ca2ba8..aa2812498 100644 --- a/src/codecs/qjpunicode.cpp +++ b/src/codecs/qjpunicode.cpp @@ -83,7 +83,7 @@ */ #include "ntqjpunicode.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS #include "ntqcstring.h" #ifdef Q_OS_TEMP #include "qwinfunctions_wce.h" diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp index c03506b64..f4e471b0a 100644 --- a/src/codecs/qrtlcodec.cpp +++ b/src/codecs/qrtlcodec.cpp @@ -41,7 +41,7 @@ #include "ntqrtlcodec.h" #include -#ifndef QT_NO_CODEC_HEBREW +#ifndef TQT_NO_CODEC_HEBREW // NOT REVISED diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/qsjiscodec.cpp index 33aee7554..731e2bef5 100644 --- a/src/codecs/qsjiscodec.cpp +++ b/src/codecs/qsjiscodec.cpp @@ -92,7 +92,7 @@ #include "ntqsjiscodec.h" -#ifndef QT_NO_BIG_CODECS +#ifndef TQT_NO_BIG_CODECS static const uchar Esc = 0x1b; diff --git a/src/codecs/qt_codecs.pri b/src/codecs/qt_codecs.pri index 709c3ce6e..196448d3b 100644 --- a/src/codecs/qt_codecs.pri +++ b/src/codecs/qt_codecs.pri @@ -1,6 +1,6 @@ # TQt codecs module -!bigcodecs:DEFINES += QT_NO_BIG_CODECS +!bigcodecs:DEFINES += TQT_NO_BIG_CODECS tools { CODECS_P = codecs HEADERS += \ diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index 764aacb88..c37a7cb12 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -46,18 +46,18 @@ #endif #include "ntqtextcodec.h" -#ifndef QT_NO_TEXTCODEC +#ifndef TQT_NO_TEXTCODEC #include "ntqvaluelist.h" #include "ntqtextcodecfactory.h" #include "ntqutfcodec.h" #include "ntqnamespace.h" -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS #include "ntqrtlcodec.h" #include "ntqtsciicodec.h" #include "qisciicodec_p.h" -#endif // QT_NO_CODECS -#ifndef QT_NO_BIG_CODECS +#endif // TQT_NO_CODECS +#ifndef TQT_NO_BIG_CODECS #include "ntqbig5codec.h" #include "ntqeucjpcodec.h" #include "ntqeuckrcodec.h" @@ -65,13 +65,13 @@ #include "ntqjiscodec.h" #include "ntqjpunicode.h" #include "ntqsjiscodec.h" -#endif // QT_NO_BIG_CODECS +#endif // TQT_NO_BIG_CODECS #include "ntqfile.h" #include "ntqstrlist.h" #include "ntqstring.h" #include "../tools/qlocale_p.h" -#if !defined(QT_NO_CODECS) && !defined(QT_NO_BIG_CODECS) && defined(Q_WS_X11) +#if !defined(TQT_NO_CODECS) && !defined(TQT_NO_BIG_CODECS) && defined(Q_WS_X11) # include "qfontcodecs_p.h" #endif @@ -549,13 +549,13 @@ TQTextCodec* TQTextCodec::codecForMib(int mib) return result; } -#if !defined(QT_NO_COMPONENT) && !defined(QT_LITE_COMPONENT) +#if !defined(TQT_NO_COMPONENT) && !defined(QT_LITE_COMPONENT) if ( !result || (result && result->mibEnum() != mib) ) { TQTextCodec *codec = TQTextCodecFactory::createForMib(mib); if (codec) result = codec; } -#endif // !QT_NO_COMPONENT !QT_LITE_COMPONENT +#endif // !TQT_NO_COMPONENT !QT_LITE_COMPONENT return result; } @@ -855,10 +855,10 @@ TQTextCodec* TQTextCodec::codecForName( const char* name, int accuracy ) } } -#if !defined(QT_NO_COMPONENT) && !defined(QT_LITE_COMPONENT) +#if !defined(TQT_NO_COMPONENT) && !defined(QT_LITE_COMPONENT) if ( !result ) result = TQTextCodecFactory::createForName(name); -#endif // !QT_NO_COMPONENT !QT_LITE_COMPONENT +#endif // !TQT_NO_COMPONENT !QT_LITE_COMPONENT return result; } @@ -1566,7 +1566,7 @@ TQString TQTextCodecFromIODDecoder::toUnicode(const char* chars, int len) return result; } -#ifndef QT_NO_CODECS +#ifndef TQT_NO_CODECS // Cannot use 
     or \code
 /*!
     Reads a POSIX2 charmap definition from \a iod.
@@ -1621,7 +1621,7 @@ TQTextCodec* TQTextCodec::loadCharmapFile(TQString filename)
     return 0;
 }
 
-#endif //QT_NO_CODECS
+#endif //TQT_NO_CODECS
 
 /*!
     Returns a string representing the current language and
@@ -1633,7 +1633,7 @@ const char* TQTextCodec::locale()
     return TQLocalePrivate::systemLocaleName();
 }
 
-#ifndef QT_NO_CODECS
+#ifndef TQT_NO_CODECS
 
 class TQSimpleTextCodec: public TQTextCodec
 {
@@ -2914,7 +2914,7 @@ static void realSetup()
     (void)new TQUtf8Codec;
     (void)new TQUtf16Codec;
 
-#ifndef QT_NO_CODECS
+#ifndef TQT_NO_CODECS
     int i = 0;
     do {
 	(void)new TQSimpleTextCodec( i );
@@ -2925,11 +2925,11 @@ static void realSetup()
     for (i = 0; i < 9; ++i) {
 	(void)new TQIsciiCodec(i);
     }
-#endif // QT_NO_CODECS
-#ifndef QT_NO_CODEC_HEBREW
+#endif // TQT_NO_CODECS
+#ifndef TQT_NO_CODEC_HEBREW
     (void)new TQHebrewCodec;
 #endif
-#ifndef QT_NO_BIG_CODECS
+#ifndef TQT_NO_BIG_CODECS
     (void)new TQBig5Codec;
     (void)new TQBig5hkscsCodec;
     (void)new TQEucJpCodec;
@@ -2939,7 +2939,7 @@ static void realSetup()
     (void)new TQGb18030Codec;
     (void)new TQJisCodec;
     (void)new TQSjisCodec;
-#endif // QT_NO_BIG_CODECS
+#endif // TQT_NO_BIG_CODECS
 
 #ifdef Q_OS_WIN32
     (void) new TQWindowsLocalCodec;
@@ -2952,7 +2952,7 @@ static void realSetup()
 void TQTextCodec::fromUnicodeInternal( const TQChar *in, unsigned short *out, int length )
 {
     switch( mibEnum() ) {
-#ifndef QT_NO_CODECS
+#ifndef TQT_NO_CODECS
     case 2084:
     case 2088:
     case 5:
@@ -2982,7 +2982,7 @@ void TQTextCodec::fromUnicodeInternal( const TQChar *in, unsigned short *out, in
 	((TQSimpleTextCodec *)this)->fromUnicode( in, out, length );
 	break;
 
-#if !defined(QT_NO_BIG_CODECS) && defined(Q_WS_X11)
+#if !defined(TQT_NO_BIG_CODECS) && defined(Q_WS_X11)
 	// the TQFont*Codecs are only used on X11
 
     case 15:
@@ -3021,7 +3021,7 @@ void TQTextCodec::fromUnicodeInternal( const TQChar *in, unsigned short *out, in
 	((TQFontLaoCodec *) this)->fromUnicode( in, out, length );
 	break;
 #endif
-#endif // QT_NO_CODECS
+#endif // TQT_NO_CODECS
 
     case 4:
 	((TQLatin1Codec *) this)->fromUnicode( in, out, length );
@@ -3118,4 +3118,4 @@ TQTextCodec *TQTextCodec::cftr = 0;
 TQTextCodec *TQTextCodec::cfcs = 0;
 
 
-#endif // QT_NO_TEXTCODEC
+#endif // TQT_NO_TEXTCODEC
diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp
index 29ee86e0f..6a570157b 100644
--- a/src/codecs/qtextcodecfactory.cpp
+++ b/src/codecs/qtextcodecfactory.cpp
@@ -40,9 +40,9 @@
 
 #include "ntqtextcodecfactory.h"
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 #include "ntqapplication.h"
 #include "ntqcleanuphandler.h"
 #include 
@@ -83,14 +83,14 @@ static void create_manager()
     cleanup_manager.set( &manager );
 }
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
 
 
 TQTextCodec *TQTextCodecFactory::createForName(const TQString &name)
 {
     TQTextCodec *codec = 0;
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
     // make sure the manager is created
     create_manager();
@@ -101,7 +101,7 @@ TQTextCodec *TQTextCodecFactory::createForName(const TQString &name)
     if (iface)
 	codec = iface->createForName(name);
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
 
     return codec;
 }
@@ -111,7 +111,7 @@ TQTextCodec *TQTextCodecFactory::createForMib(int mib)
 {
     TQTextCodec *codec = 0;
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
     // make sure the manager is created
     create_manager();
@@ -122,10 +122,10 @@ TQTextCodec *TQTextCodecFactory::createForMib(int mib)
     if (iface)
 	codec = iface->createForMib(mib);
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
 
     return codec;
 }
 
 
-#endif // QT_NO_TEXTCODEC
+#endif // TQT_NO_TEXTCODEC
diff --git a/src/codecs/qtextcodecinterface_p.h b/src/codecs/qtextcodecinterface_p.h
index e3645a802..cba2cdd61 100644
--- a/src/codecs/qtextcodecinterface_p.h
+++ b/src/codecs/qtextcodecinterface_p.h
@@ -56,8 +56,8 @@
 #include 
 #endif // QT_H
 
-#ifndef QT_NO_TEXTCODEC
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_TEXTCODEC
+#ifndef TQT_NO_COMPONENT
 
 class TQTextCodec;
 
@@ -74,7 +74,7 @@ struct Q_EXPORT TQTextCodecFactoryInterface : public TQFeatureListInterface
     virtual TQTextCodec *createForName( const TQString &name ) = 0;
 };
 
-#endif // QT_NO_COMPONENT
-#endif // QT_NO_TEXTCODEC
+#endif // TQT_NO_COMPONENT
+#endif // TQT_NO_TEXTCODEC
 
 #endif // TQTEXTCODECINTERFACE_P_H
diff --git a/src/codecs/qtextcodecplugin.cpp b/src/codecs/qtextcodecplugin.cpp
index 6f084584d..2d05117e7 100644
--- a/src/codecs/qtextcodecplugin.cpp
+++ b/src/codecs/qtextcodecplugin.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqtextcodecplugin.h"
-#ifndef QT_NO_TEXTCODECPLUGIN
+#ifndef TQT_NO_TEXTCODECPLUGIN
 #include "qtextcodecinterface_p.h"
 
 /*!
@@ -183,4 +183,4 @@ TQTextCodecPlugin::~TQTextCodecPlugin()
 {
 }
 
-#endif // QT_NO_TEXTCODECPLUGIN
+#endif // TQT_NO_TEXTCODECPLUGIN
diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/qtsciicodec.cpp
index 5a615e746..0bf558e69 100644
--- a/src/codecs/qtsciicodec.cpp
+++ b/src/codecs/qtsciicodec.cpp
@@ -94,7 +94,7 @@
 
 #include "ntqtsciicodec.h"
 
-#ifndef QT_NO_CODECS
+#ifndef TQT_NO_CODECS
 
 static unsigned char qt_UnicodeToTSCII(ushort u1, ushort u2, ushort u3);
 static unsigned int qt_TSCIIToUnicode(unsigned int code, uint *s);
diff --git a/src/codecs/qutfcodec.cpp b/src/codecs/qutfcodec.cpp
index 9c9f4283f..0a47f1523 100644
--- a/src/codecs/qutfcodec.cpp
+++ b/src/codecs/qutfcodec.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqutfcodec.h"
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 
 int TQUtf8Codec::mibEnum() const
 {
@@ -347,4 +347,4 @@ TQTextEncoder* TQUtf16Codec::makeEncoder() const
     return new TQUtf16Encoder;
 }
 
-#endif //QT_NO_TEXTCODEC
+#endif //TQT_NO_TEXTCODEC
diff --git a/src/dialogs/ntqcolordialog.h b/src/dialogs/ntqcolordialog.h
index 6c64f3ba6..07c695fe8 100644
--- a/src/dialogs/ntqcolordialog.h
+++ b/src/dialogs/ntqcolordialog.h
@@ -45,7 +45,7 @@
 #include "ntqdialog.h"
 #endif // QT_H
 
-#ifndef QT_NO_COLORDIALOG
+#ifndef TQT_NO_COLORDIALOG
 
 class TQColorDialogPrivate;
 
diff --git a/src/dialogs/ntqdialog.h b/src/dialogs/ntqdialog.h
index 5c9e1499f..dc20b730d 100644
--- a/src/dialogs/ntqdialog.h
+++ b/src/dialogs/ntqdialog.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqwidget.h"
 #endif // QT_H
-#ifndef QT_NO_DIALOG
+#ifndef TQT_NO_DIALOG
 #if 0
 TQ_OBJECT
 #endif
@@ -137,5 +137,5 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_DIALOG
+#endif // TQT_NO_DIALOG
 #endif // TQDIALOG_H
diff --git a/src/dialogs/ntqerrormessage.h b/src/dialogs/ntqerrormessage.h
index ebc4a2330..f17db5ea2 100644
--- a/src/dialogs/ntqerrormessage.h
+++ b/src/dialogs/ntqerrormessage.h
@@ -45,7 +45,7 @@
 #include "ntqdialog.h"
 #endif // QT_H
 
-#ifndef QT_NO_ERRORMESSAGE
+#ifndef TQT_NO_ERRORMESSAGE
 class TQPushButton;
 class TQCheckBox;
 class TQLabel;
@@ -84,6 +84,6 @@ private:
 #endif
 };
 
-#endif //QT_NO_ERRORMESSAGE
+#endif //TQT_NO_ERRORMESSAGE
 
 #endif
diff --git a/src/dialogs/ntqfiledialog.h b/src/dialogs/ntqfiledialog.h
index 577958bc5..a26cdd662 100644
--- a/src/dialogs/ntqfiledialog.h
+++ b/src/dialogs/ntqfiledialog.h
@@ -65,7 +65,7 @@ class TQFileDialogTQFileListView;
 #pragma GCC system_header
 #endif
 
-#ifndef QT_NO_FILEDIALOG
+#ifndef TQT_NO_FILEDIALOG
 
 class Q_EXPORT TQFileIconProvider : public TQObject
 {
diff --git a/src/dialogs/ntqfontdialog.h b/src/dialogs/ntqfontdialog.h
index 2aaa24242..88321cb42 100644
--- a/src/dialogs/ntqfontdialog.h
+++ b/src/dialogs/ntqfontdialog.h
@@ -43,7 +43,7 @@
 
 #include "ntqwindowdefs.h"
 
-#ifndef QT_NO_FONTDIALOG
+#ifndef TQT_NO_FONTDIALOG
 
 //
 //  W A R N I N G
diff --git a/src/dialogs/ntqinputdialog.h b/src/dialogs/ntqinputdialog.h
index e48b62303..afbdf0f1a 100644
--- a/src/dialogs/ntqinputdialog.h
+++ b/src/dialogs/ntqinputdialog.h
@@ -47,7 +47,7 @@
 #include "ntqlineedit.h"
 #endif // QT_H
 
-#ifndef QT_NO_INPUTDIALOG
+#ifndef TQT_NO_INPUTDIALOG
 
 class TQSpinBox;
 class TQComboBox;
@@ -101,7 +101,7 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_INPUTDIALOG
+#endif // TQT_NO_INPUTDIALOG
 
 #endif // TQINPUTDIALOG_H
 
diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/ntqmessagebox.h
index c4436dfc4..e41f20101 100644
--- a/src/dialogs/ntqmessagebox.h
+++ b/src/dialogs/ntqmessagebox.h
@@ -45,7 +45,7 @@
 #include "ntqdialog.h"
 #endif // QT_H
 
-#ifndef QT_NO_MESSAGEBOX
+#ifndef TQT_NO_MESSAGEBOX
 
 class  TQLabel;
 class  TQPushButton;
@@ -218,6 +218,6 @@ str)).arg(TQString::fromLatin1(tqVersion()) ); TQMessageBox::critical( 0, TQAppl
 "Incompatible TQt Library Error" ), s, TQMessageBox::Abort,0 ); tqFatal(s.ascii()); }}
 
 
-#endif // QT_NO_MESSAGEBOX
+#endif // TQT_NO_MESSAGEBOX
 
 #endif // TQMESSAGEBOX_H
diff --git a/src/dialogs/ntqprintdialog.h b/src/dialogs/ntqprintdialog.h
index 8f79bf0ba..696897602 100644
--- a/src/dialogs/ntqprintdialog.h
+++ b/src/dialogs/ntqprintdialog.h
@@ -45,7 +45,7 @@
 #include "ntqdialog.h"
 #endif // QT_H
 
-#ifndef QT_NO_PRINTDIALOG
+#ifndef TQT_NO_PRINTDIALOG
 
 class TQGroupBox;
 class TQPrintDialogPrivate;
diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h
index 404fa5e3d..d69b5dc0a 100644
--- a/src/dialogs/ntqprogressdialog.h
+++ b/src/dialogs/ntqprogressdialog.h
@@ -47,7 +47,7 @@
 #include "ntqprogressbar.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 
-#ifndef QT_NO_PROGRESSDIALOG
+#ifndef TQT_NO_PROGRESSDIALOG
 
 class TQPushButton;
 class TQTimer;
@@ -136,6 +136,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_PROGRESSDIALOG
+#endif // TQT_NO_PROGRESSDIALOG
 
 #endif // TQPROGRESSDIALOG_H
diff --git a/src/dialogs/ntqsemimodal.h b/src/dialogs/ntqsemimodal.h
index 107ed2c9a..cf0a46f6b 100644
--- a/src/dialogs/ntqsemimodal.h
+++ b/src/dialogs/ntqsemimodal.h
@@ -46,7 +46,7 @@
 #endif // QT_H
 
 #ifndef TQT_NO_COMPAT
-#ifndef QT_NO_SEMIMODAL
+#ifndef TQT_NO_SEMIMODAL
 class Q_EXPORT TQSemiModal : public TQDialog
 {
     TQ_OBJECT
diff --git a/src/dialogs/ntqtabdialog.h b/src/dialogs/ntqtabdialog.h
index 826d3b6dc..dd91a4bcd 100644
--- a/src/dialogs/ntqtabdialog.h
+++ b/src/dialogs/ntqtabdialog.h
@@ -46,7 +46,7 @@
 #include "ntqiconset.h"
 #endif // QT_H
 
-#ifndef QT_NO_TABDIALOG
+#ifndef TQT_NO_TABDIALOG
 
 class  TQTabBar;
 class  TQTab;
@@ -141,6 +141,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_TABDIALOG
+#endif // TQT_NO_TABDIALOG
 
 #endif // TQTABDIALOG_H
diff --git a/src/dialogs/ntqwizard.h b/src/dialogs/ntqwizard.h
index d9fb8d1cc..281ab3f7d 100644
--- a/src/dialogs/ntqwizard.h
+++ b/src/dialogs/ntqwizard.h
@@ -46,7 +46,7 @@
 #include "ntqdialog.h"
 #endif // QT_H
 
-#ifndef QT_NO_WIZARD
+#ifndef TQT_NO_WIZARD
 
 class TQHBoxLayout;
 class TQWizardPrivate;
@@ -137,6 +137,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_WIZARD
+#endif // TQT_NO_WIZARD
 
 #endif // TQWIZARD_H
diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp
index ac27d6c34..281445c2e 100644
--- a/src/dialogs/qcolordialog.cpp
+++ b/src/dialogs/qcolordialog.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqcolordialog.h"
 
-#ifndef QT_NO_COLORDIALOG
+#ifndef TQT_NO_COLORDIALOG
 
 #include "ntqpainter.h"
 #include "ntqlayout.h"
@@ -529,7 +529,7 @@ protected:
     void mousePressEvent( TQMouseEvent *e );
     void mouseMoveEvent( TQMouseEvent *e );
     void mouseReleaseEvent( TQMouseEvent *e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent *e );
     void dragLeaveEvent( TQDragLeaveEvent *e );
     void dragMoveEvent( TQDragMoveEvent *e );
@@ -561,7 +561,7 @@ void TQColorWell::mousePressEvent( TQMouseEvent *e )
 void TQColorWell::mouseMoveEvent( TQMouseEvent *e )
 {
     TQWellArray::mouseMoveEvent( e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !mousePressed )
 	return;
     if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) {
@@ -581,7 +581,7 @@ void TQColorWell::mouseMoveEvent( TQMouseEvent *e )
 #endif
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void TQColorWell::dragEnterEvent( TQDragEnterEvent *e )
 {
     setFocus();
@@ -620,7 +620,7 @@ void TQColorWell::dropEvent( TQDropEvent *e )
     }
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 void TQColorWell::mouseReleaseEvent( TQMouseEvent *e )
 {
@@ -987,7 +987,7 @@ protected:
     void mousePressEvent( TQMouseEvent *e );
     void mouseMoveEvent( TQMouseEvent *e );
     void mouseReleaseEvent( TQMouseEvent *e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent *e );
     void dragLeaveEvent( TQDragLeaveEvent *e );
     void dropEvent( TQDropEvent *e );
@@ -1024,7 +1024,7 @@ void TQColorShowLabel::mousePressEvent( TQMouseEvent *e )
 
 void TQColorShowLabel::mouseMoveEvent( TQMouseEvent *e )
 {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !mousePressed )
 	return;
     if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) {
@@ -1041,7 +1041,7 @@ void TQColorShowLabel::mouseMoveEvent( TQMouseEvent *e )
 #endif
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void TQColorShowLabel::dragEnterEvent( TQDragEnterEvent *e )
 {
     if ( TQColorDrag::canDecode( e ) )
@@ -1065,7 +1065,7 @@ void TQColorShowLabel::dropEvent( TQDropEvent *e )
 	e->ignore();
     }
 }
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 void TQColorShowLabel::mouseReleaseEvent( TQMouseEvent * )
 {
@@ -1459,7 +1459,7 @@ TQColorDialog::TQColorDialog(TQWidget* parent, const char* name, bool modal) :
     setSizeGripEnabled( FALSE );
     d = new TQColorDialogPrivate( this );
 
-#ifndef QT_NO_SETTINGS
+#ifndef TQT_NO_SETTINGS
     if ( !customSet ) {
 	TQSettings settings;
 	settings.insertSearchPath( TQSettings::Windows, "/Trolltech" );
@@ -1494,7 +1494,7 @@ TQColor TQColorDialog::getColor( const TQColor& initial, TQWidget *parent,
 
     int allocContext = TQColor::enterAllocContext();
     TQColorDialog *dlg = new TQColorDialog( parent, name, TRUE );  //modal
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     dlg->setCaption( TQColorDialog::tr( "Select color" ) );
 #endif
     dlg->setColor( initial );
@@ -1540,7 +1540,7 @@ TQRgb TQColorDialog::getRgba( TQRgb initial, bool *ok,
     TQColorDialog *dlg = new TQColorDialog( parent, name, TRUE );  //modal
 
     TQ_CHECK_PTR( dlg );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     dlg->setCaption( TQColorDialog::tr( "Select color" ) );
 #endif
     dlg->setColor( initial );
@@ -1584,7 +1584,7 @@ TQColor TQColorDialog::color() const
 
 TQColorDialog::~TQColorDialog()
 {
-#ifndef QT_NO_SETTINGS
+#ifndef TQT_NO_SETTINGS
     if ( !customSet ) {
 	TQSettings settings;
 	settings.insertSearchPath( TQSettings::Windows, "/Trolltech" );
diff --git a/src/dialogs/qdialog.cpp b/src/dialogs/qdialog.cpp
index 095cbf2e7..3e3d77c3e 100644
--- a/src/dialogs/qdialog.cpp
+++ b/src/dialogs/qdialog.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdialog.h"
 
-#ifndef QT_NO_DIALOG
+#ifndef TQT_NO_DIALOG
 
 #include "ntqpushbutton.h"
 #include "ntqfocusdata.h"
@@ -215,7 +215,7 @@ public:
 
     TQDialogPrivate()
 	: mainDef(0), orientation(Horizontal),extension(0), doShowExtension(FALSE)
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
 	,resizer(0)
 #endif
 	{
@@ -226,7 +226,7 @@ public:
     TQWidget* extension;
     bool doShowExtension;
     TQSize size, min, max;
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
     TQSizeGrip* resizer;
 #endif
     TQPoint lastRMBPress;
@@ -283,7 +283,7 @@ TQDialog::~TQDialog()
 
 void TQDialog::setDefault( TQPushButton *pushButton )
 {
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
     TQObjectList *list = queryList( "TQPushButton" );
     Q_ASSERT(list);
     TQObjectListIt it( *list );
@@ -313,7 +313,7 @@ void TQDialog::setDefault( TQPushButton *pushButton )
 */
 void TQDialog::setMainDefault( TQPushButton *pushButton )
 {
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
     d->mainDef = 0;
     setDefault(pushButton);
 #endif
@@ -326,7 +326,7 @@ void TQDialog::setMainDefault( TQPushButton *pushButton )
  */
 void TQDialog::hideDefault()
 {
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
     TQObjectList *list = queryList( "TQPushButton" );
     TQObjectListIt it( *list );
     TQPushButton *pb;
@@ -529,7 +529,7 @@ bool TQDialog::eventFilter( TQObject *o, TQEvent *e )
 /*! \reimp */
 void TQDialog::contextMenuEvent( TQContextMenuEvent *e )
 {
-#if !defined(QT_NO_WHATSTHIS) && !defined(QT_NO_POPUPMENU)
+#if !defined(TQT_NO_WHATSTHIS) && !defined(TQT_NO_POPUPMENU)
     TQWidget* w = childAt( e->pos(), TRUE );
     if ( !w )
 	return;
@@ -563,7 +563,7 @@ void TQDialog::keyPressEvent( TQKeyEvent *e )
 	switch ( e->key() ) {
 	case Key_Enter:
 	case Key_Return: {
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    TQObjectList *list = queryList( "TQPushButton" );
 	    TQObjectListIt it( *list );
 	    TQPushButton *pb;
@@ -622,7 +622,7 @@ void TQDialog::keyPressEvent( TQKeyEvent *e )
 /*! \reimp */
 void TQDialog::closeEvent( TQCloseEvent *e )
 {
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
     if ( isModal() && TQWhatsThis::inWhatsThisMode() )
 	TQWhatsThis::leaveWhatsThisMode();
 #endif
@@ -725,7 +725,7 @@ void TQDialog::show()
 
     TQWidget::show();
     showExtension( d->doShowExtension );
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
     TQWidget *fw = focusWidget();
     TQFocusData *fd = focusData();
 
@@ -1043,7 +1043,7 @@ void TQDialog::showExtension( bool showIt )
 	d->size = size();
 	d->min = minimumSize();
 	d->max = maximumSize();
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 	if ( layout() )
 	    layout()->setEnabled( FALSE );
 #endif
@@ -1066,7 +1066,7 @@ void TQDialog::showExtension( bool showIt )
 	setMinimumSize( d->min.expandedTo( TQSize( 1, 1 ) ) );
 	setMaximumSize( d->max );
 	resize( d->size );
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 	if ( layout() )
 	    layout()->setEnabled( TRUE );
 #endif
@@ -1132,7 +1132,7 @@ bool TQDialog::isModal() const
 
 bool TQDialog::isSizeGripEnabled() const
 {
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
     return !!d->resizer;
 #else
     return FALSE;
@@ -1142,7 +1142,7 @@ bool TQDialog::isSizeGripEnabled() const
 
 void TQDialog::setSizeGripEnabled(bool enabled)
 {
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
     if ( !enabled != !d->resizer ) {
 	if ( enabled ) {
 	    d->resizer = new TQSizeGrip( this, "TQDialog::resizer" );
@@ -1159,7 +1159,7 @@ void TQDialog::setSizeGripEnabled(bool enabled)
 	    d->resizer = 0;
 	}
     }
-#endif //QT_NO_SIZEGRIP
+#endif //TQT_NO_SIZEGRIP
 }
 
 
@@ -1167,7 +1167,7 @@ void TQDialog::setSizeGripEnabled(bool enabled)
 /*! \reimp */
 void TQDialog::resizeEvent( TQResizeEvent * )
 {
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
     if ( d->resizer ) {
 	if ( TQApplication::reverseLayout() )
 	    d->resizer->move( rect().bottomLeft() -d->resizer->rect().bottomLeft() );
@@ -1177,4 +1177,4 @@ void TQDialog::resizeEvent( TQResizeEvent * )
 #endif
 }
 
-#endif // QT_NO_DIALOG
+#endif // TQT_NO_DIALOG
diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp
index cbeeac685..13b55a1e1 100644
--- a/src/dialogs/qerrormessage.cpp
+++ b/src/dialogs/qerrormessage.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqerrormessage.h"
 
-#ifndef QT_NO_ERRORMESSAGE
+#ifndef TQT_NO_ERRORMESSAGE
 
 #include "ntqapplication.h"
 #include "ntqcheckbox.h"
@@ -162,7 +162,7 @@ TQErrorMessage::TQErrorMessage( TQWidget * parent, const char * name )
 {
     TQGridLayout * grid = new TQGridLayout( this, 3, 2, 11, 6 );
     icon = new TQLabel( this, "qt_icon_lbl" );
-#ifndef QT_NO_MESSAGEBOX
+#ifndef TQT_NO_MESSAGEBOX
     icon->setPixmap( TQMessageBox::standardIcon(TQMessageBox::Information) );
 #endif
     grid->addWidget( icon, 0, 0, AlignTop );
@@ -225,7 +225,7 @@ TQErrorMessage * TQErrorMessage::qtHandler()
     if ( !qtMessageHandler ) {
 	qtMessageHandler = new TQErrorMessage( 0, "automatic message handler" );
 	tqAddPostRoutine( deleteStaticcTQErrorMessage ); // clean up
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	if ( tqApp->mainWidget() )
 	    qtMessageHandler->setCaption( tqApp->mainWidget()->caption() );
 #endif
@@ -267,4 +267,4 @@ void TQErrorMessage::message( const TQString & m )
 	show();
 }
 
-#endif // QT_NO_ERRORMESSAGE
+#endif // TQT_NO_ERRORMESSAGE
diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp
index ae1b5ab34..471084f1e 100644
--- a/src/dialogs/qfiledialog.cpp
+++ b/src/dialogs/qfiledialog.cpp
@@ -52,7 +52,7 @@
 
 #include "ntqfiledialog.h"
 
-#ifndef QT_NO_FILEDIALOG
+#ifndef TQT_NO_FILEDIALOG
 
 #include "private/qapplication_p.h"
 #include "ntqapplication.h"
@@ -669,7 +669,7 @@ private:
     void viewportMouseReleaseEvent( TQMouseEvent *e );
     void viewportMouseDoubleClickEvent( TQMouseEvent *e );
     void viewportMouseMoveEvent( TQMouseEvent *e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void viewportDragEnterEvent( TQDragEnterEvent *e );
     void viewportDragMoveEvent( TQDragMoveEvent *e );
     void viewportDragLeaveEvent( TQDragLeaveEvent *e );
@@ -726,7 +726,7 @@ private:
     void keyPressEvent( TQKeyEvent *e );
     void viewportMouseReleaseEvent( TQMouseEvent *e );
     void viewportMouseMoveEvent( TQMouseEvent *e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void viewportDragEnterEvent( TQDragEnterEvent *e );
     void viewportDragMoveEvent( TQDragMoveEvent *e );
     void viewportDragLeaveEvent( TQDragLeaveEvent *e );
@@ -865,7 +865,7 @@ private:
 TQFDProgressDialog::TQFDProgressDialog( TQWidget *parent, const TQString &fn, int steps )
     : TQDialog( parent, "", TRUE )
 {
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     setCaption( TQFileDialog::tr( "Copy or Move a File" ) );
 #endif
     TQVBoxLayout *layout = new TQVBoxLayout( this );
@@ -1305,7 +1305,7 @@ void TQFileListBox::viewportMouseMoveEvent( TQMouseEvent *e )
     if ( !dragItem )
 	dragItem = itemAt( e->pos() );
     renameTimer->stop();
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if (  ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() && mousePressed ) {
 	TQListBoxItem *item = dragItem;
 	dragItem = 0;
@@ -1339,13 +1339,13 @@ void TQFileListBox::viewportMouseMoveEvent( TQMouseEvent *e )
 
 void TQFileListBox::dragObjDestroyed()
 {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     //#######
     //filedialog->rereadDir();
 #endif
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void TQFileListBox::viewportDragEnterEvent( TQDragEnterEvent *e )
 {
     startDragUrl = filedialog->d->url;
@@ -1483,11 +1483,11 @@ void TQFileListBox::setCurrentDropItem( const TQPoint &pnt )
 	setCurrentItem( currDropItem );
     changeDirTimer->start( 750 );
 }
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 void TQFileListBox::changeDirDuringDrag()
 {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !currDropItem )
 	return;
     changeDirTimer->stop();
@@ -1560,7 +1560,7 @@ void TQFileListBox::cancelRename()
 void TQFileListBox::contentsMoved( int, int )
 {
     changeDirTimer->stop();
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     setCurrentDropItem( TQPoint( -1, -1 ) );
 #endif
 }
@@ -1735,7 +1735,7 @@ void TQFileDialogTQFileListView::viewportMouseMoveEvent( TQMouseEvent *e )
     renameTimer->stop();
     if ( !dragItem )
 	dragItem = itemAt( e->pos() );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if (  ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() && mousePressed ) {
 	TQListViewItem *item = dragItem;
 	dragItem = 0;
@@ -1763,13 +1763,13 @@ void TQFileDialogTQFileListView::viewportMouseMoveEvent( TQMouseEvent *e )
 
 void TQFileDialogTQFileListView::dragObjDestroyed()
 {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     //######
     //filedialog->rereadDir();
 #endif
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void TQFileDialogTQFileListView::viewportDragEnterEvent( TQDragEnterEvent *e )
 {
     startDragUrl = filedialog->d->url;
@@ -1905,18 +1905,18 @@ void TQFileDialogTQFileListView::setCurrentDropItem( const TQPoint &pnt )
 
     changeDirTimer->start( 750 );
 }
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 void TQFileDialogTQFileListView::changeDirDuringDrag()
 {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !currDropItem )
 	return;
     changeDirTimer->stop();
     TQUrl u( filedialog->d->url, TQFileDialogPrivate::encodeFileName(currDropItem->text( 0 ) ) );
     filedialog->setDir( u );
     currDropItem = 0;
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 }
 
 
@@ -1985,7 +1985,7 @@ void TQFileDialogTQFileListView::cancelRename()
 void TQFileDialogTQFileListView::contentsMoved( int, int )
 {
     changeDirTimer->stop();
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     setCurrentDropItem( TQPoint( -1, -1 ) );
 #endif
 }
@@ -2609,14 +2609,14 @@ void TQFileDialog::init()
     d->goBack->setEnabled( FALSE );
     d->goBack->setFocusPolicy( TabFocus );
     connect( d->goBack, SIGNAL( clicked() ), this, SLOT( goBack() ) );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTip::add( d->goBack, tr( "Back" ) );
 #endif
     d->goBack->setIconSet( *goBackIcon );
 
     d->cdToParent = new TQToolButton( this, "cd to parent" );
     d->cdToParent->setFocusPolicy( TabFocus );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTip::add( d->cdToParent, tr( "One directory up" ) );
 #endif
     d->cdToParent->setIconSet( *cdToParentIcon );
@@ -2625,7 +2625,7 @@ void TQFileDialog::init()
 
     d->newFolder = new TQToolButton( this, "new folder" );
     d->newFolder->setFocusPolicy( TabFocus );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTip::add( d->newFolder, tr( "Create New Folder" ) );
 #endif
     d->newFolder->setIconSet( *newFolderIcon );
@@ -2643,7 +2643,7 @@ void TQFileDialog::init()
 
     d->mcView = new TQToolButton( this, "mclistbox view" );
     d->mcView->setFocusPolicy( TabFocus );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTip::add( d->mcView, tr( "List View" ) );
 #endif
     d->mcView->setIconSet( *multiColumnListViewIcon );
@@ -2651,7 +2651,7 @@ void TQFileDialog::init()
     d->stack->addWidget( d->moreFiles, d->modeButtons->insert( d->mcView ) );
     d->detailView = new TQToolButton( this, "list view" );
     d->detailView->setFocusPolicy( TabFocus );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTip::add( d->detailView, tr( "Detail View" ) );
 #endif
     d->detailView->setIconSet( *detailViewIcon );
@@ -2660,7 +2660,7 @@ void TQFileDialog::init()
 
     d->previewInfo = new TQToolButton( this, "preview info view" );
     d->previewInfo->setFocusPolicy( TabFocus );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTip::add( d->previewInfo, tr( "Preview File Info" ) );
 #endif
     d->previewInfo->setIconSet( *previewInfoViewIcon );
@@ -2683,7 +2683,7 @@ void TQFileDialog::init()
 	d->previewContents->setAutoRaise( TRUE );
     }
     d->previewContents->setFocusPolicy( TabFocus );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTip::add( d->previewContents, tr( "Preview File Contents" ) );
 #endif
     d->previewContents->setIconSet( *previewContentsViewIcon );
@@ -2919,7 +2919,7 @@ TQFileDialog::~TQFileDialog()
     d->moreFiles->blockSignals( FALSE );
     files->blockSignals( FALSE );
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( d->cursorOverride )
 	TQApplication::restoreOverrideCursor();
 #endif
@@ -3343,7 +3343,7 @@ bool TQFileDialog::showHiddenFiles() const
 
 void TQFileDialog::rereadDir()
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( !d->cursorOverride ) {
 	TQApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 	d->cursorOverride = TRUE;
@@ -3353,7 +3353,7 @@ void TQFileDialog::rereadDir()
     if ( d->mimeTypeTimer->isActive() )
 	d->mimeTypeTimer->stop();
     d->currListChildren = d->url.listChildren();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( d->cursorOverride ) {
 	TQApplication::restoreOverrideCursor();
 	d->cursorOverride = FALSE;
@@ -3512,7 +3512,7 @@ TQString TQFileDialog::getOpenFileName( const TQString & startWith,
     TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gofn", TRUE );
 
     TQ_CHECK_PTR( dlg );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     if ( !caption.isNull() )
 	dlg->setCaption( caption );
     else
@@ -3637,7 +3637,7 @@ TQString TQFileDialog::getSaveFileName( const TQString & startWith,
     TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gsfn", TRUE );
 
     TQ_CHECK_PTR( dlg );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     if ( !caption.isNull() )
 	dlg->setCaption( caption );
     else
@@ -4549,7 +4549,7 @@ TQString TQFileDialog::getExistingDirectory( const TQString & dir,
     TQFileDialog *dlg = new TQFileDialog( parent, name ? name : "qt_filedlg_ged", TRUE );
 
     TQ_CHECK_PTR( dlg );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     if ( !caption.isNull() )
 	dlg->setCaption( caption );
     else
@@ -5709,7 +5709,7 @@ TQStringList TQFileDialog::getOpenFileNames( const TQString & filter,
     TQFileDialog *dlg = new TQFileDialog( *workingDirectory, TQString::null, parent, name ? name : "qt_filedlg_gofns", TRUE );
 
     TQ_CHECK_PTR( dlg );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     if ( !caption.isNull() )
 	dlg->setCaption( caption );
     else
@@ -5797,7 +5797,7 @@ void TQFileDialog::urlStart( TQNetworkOperation *op )
     qt_ntfs_permission_lookup--;
 #endif
     if ( op->operation() == TQNetworkProtocol::OpListChildren ) {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	if ( !d->cursorOverride ) {
 	    TQApplication::setOverrideCursor( TQCursor( TQt::WaitCursor ) );
 	    d->cursorOverride = TRUE;
@@ -5849,7 +5849,7 @@ void TQFileDialog::urlFinished( TQNetworkOperation *op )
     if ( !op )
 	return;
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( op->operation() == TQNetworkProtocol::OpListChildren &&
 	 d->cursorOverride ) {
 	TQApplication::restoreOverrideCursor();
diff --git a/src/dialogs/qfontdialog.cpp b/src/dialogs/qfontdialog.cpp
index 0eee95a8c..cddc66a9a 100644
--- a/src/dialogs/qfontdialog.cpp
+++ b/src/dialogs/qfontdialog.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqwindowdefs.h"
 
-#ifndef QT_NO_FONTDIALOG
+#ifndef TQT_NO_FONTDIALOG
 
 #include "ntqfontdialog.h"
 
@@ -407,7 +407,7 @@ TQFont TQFontDialog::getFont( bool *ok, const TQFont *def,
     TQFontDialog *dlg = new TQFontDialog( parent, name, TRUE );
 
     dlg->setFont( ( def ? *def : TQFont() ) );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     dlg->setCaption( tr("Select Font") );
 #endif
 
diff --git a/src/dialogs/qinputdialog.cpp b/src/dialogs/qinputdialog.cpp
index 905a6da00..1569d7e73 100644
--- a/src/dialogs/qinputdialog.cpp
+++ b/src/dialogs/qinputdialog.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqinputdialog.h"
 
-#ifndef QT_NO_INPUTDIALOG
+#ifndef TQT_NO_INPUTDIALOG
 
 #include "ntqlayout.h"
 #include "ntqlabel.h"
@@ -239,7 +239,7 @@ void TQInputDialog::setType( Type t )
 	d->stack->raiseWidget( input );
 	d->stack->setFixedHeight( input->sizeHint().height() );
 	input->setFocus();
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	d->label->setBuddy( input );
 #endif
     }
@@ -304,7 +304,7 @@ TQString TQInputDialog::getText( const TQString &caption, const TQString &label,
 					  name ? name : "qt_inputdlg_gettext",
 					  TRUE, LineEdit );
 
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     dlg->setCaption( caption );
 #endif
     dlg->lineEdit()->setText( text );
@@ -361,7 +361,7 @@ int TQInputDialog::getInteger( const TQString &caption, const TQString &label,
     TQInputDialog *dlg = new TQInputDialog( label, parent,
 					  name ? name : "qt_inputdlg_getint",
 					  TRUE, SpinBox );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     dlg->setCaption( caption );
 #endif
     dlg->spinBox()->setRange( minValue, maxValue );
@@ -419,7 +419,7 @@ double TQInputDialog::getDouble( const TQString &caption, const TQString &label,
 {
     TQInputDialog dlg( label, parent,
 		      name ? name : "qt_inputdlg_getdbl", TRUE, LineEdit );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     dlg.setCaption( caption );
 #endif
     dlg.lineEdit()->setValidator( new TQDoubleValidator( minValue, maxValue, decimals, dlg.lineEdit() ) );
@@ -472,7 +472,7 @@ TQString TQInputDialog::getItem( const TQString &caption, const TQString &label,
 			       bool *ok, TQWidget *parent, const char *name )
 {
     TQInputDialog *dlg = new TQInputDialog( label, parent, name ? name : "qt_inputdlg_getitem", TRUE, editable ? EditableComboBox : ComboBox );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     dlg->setCaption( caption );
 #endif
     if ( editable ) {
diff --git a/src/dialogs/qmessagebox.cpp b/src/dialogs/qmessagebox.cpp
index 23e1d5cde..97ba0e850 100644
--- a/src/dialogs/qmessagebox.cpp
+++ b/src/dialogs/qmessagebox.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqmessagebox.h"
 
-#ifndef QT_NO_MESSAGEBOX
+#ifndef TQT_NO_MESSAGEBOX
 
 #include "ntqaccel.h"
 #include "ntqlabel.h"
@@ -566,7 +566,7 @@ TQMessageBox::TQMessageBox( const TQString& caption,
     : TQDialog( parent, name, modal, f | WStyle_Customize | WStyle_DialogBorder | WStyle_Title | WStyle_SysMenu )
 {
     init( button0, button1, button2 );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     setCaption( caption );
 #endif
     setText( text );
@@ -1022,7 +1022,7 @@ void TQMessageBox::keyPressEvent( TQKeyEvent *e )
             return;
         }
     }
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( !( e->state() & AltButton ) ) {
 	TQObjectList *list = queryList( "TQPushButton" );
 	TQObjectListIt it( *list );
@@ -1315,7 +1315,7 @@ void TQMessageBox::about( TQWidget *parent, const TQString &caption,
                                        parent, "qt_msgbox_simple_about_box", TRUE,
 				       WDestructiveClose);
     TQ_CHECK_PTR( mb );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     const TQPixmap *pm = parent ? parent->icon() : 0;
     if ( pm && !pm->isNull() )
 	mb->setIconPixmap( *pm );
@@ -1381,7 +1381,7 @@ static int textBox( TQWidget *parent, TQMessageBox::Icon severity,
     if ( b[2] )
         mb->setButtonText( 3, button2Text );
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     mb->setCursor( TQt::arrowCursor );
 #endif
     return mb->exec() - 1;
@@ -1597,14 +1597,14 @@ void TQMessageBox::aboutTQt( TQWidget *parent, const TQString &caption )
     TQ_CHECK_PTR( mb );
     mb->setWFlags( WDestructiveClose );
 
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     TQString c = caption;
     if ( c.isNull() )
         c = tr( "About TQt" );
     mb->setCaption( c );
 #endif
     mb->setText( *translatedTextAboutTQt );
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     TQPixmap pm;
     TQImage logo( (const char **)qtlogo_xpm);
     if ( tqGray(mb->palette().active().text().rgb()) >
@@ -1641,7 +1641,7 @@ void TQMessageBox::aboutTQt( TQWidget *parent, const TQString &caption )
 void TQMessageBox::setIcon( const TQPixmap &pix )
 {
     //reimplemented to avoid compiler warning.
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     TQDialog::setIcon( pix );
 #endif
 }
diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp
index 57eb2d0fe..48b180cdc 100644
--- a/src/dialogs/qprintdialog.cpp
+++ b/src/dialogs/qprintdialog.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqprintdialog.h"
 
-#ifndef QT_NO_PRINTDIALOG
+#ifndef TQT_NO_PRINTDIALOG
 
 #include "ntqfiledialog.h"
 #include "ntqfile.h"
@@ -61,11 +61,11 @@
 #include "ntqstyle.h"
 #include "ntqstring.h"
 #include "ntqregexp.h"
-#if !defined(QT_NO_CUPS) || !defined(QT_NO_NIS)
+#if !defined(TQT_NO_CUPS) || !defined(TQT_NO_NIS)
 #include "ntqlibrary.h"
 #endif
 
-#ifndef QT_NO_NIS
+#ifndef TQT_NO_NIS
 
 #ifndef BOOL_DEFINED
 #define BOOL_DEFINED
@@ -79,7 +79,7 @@
 # undef connect
 #endif
 
-#endif // QT_NO_NIS
+#endif // TQT_NO_NIS
 
 // UNIX Large File Support redefines open -> open64
 #if defined(open)
@@ -465,7 +465,7 @@ static char * parsePrintersConf( TQListView * printers, bool *found = 0 )
     return defaultPrinter;
 }
 
-#ifndef QT_NO_NIS
+#ifndef TQT_NO_NIS
 
 #if defined(Q_C_CALLBACKS)
 extern "C" {
@@ -510,7 +510,7 @@ static int retrieveNisPrinters( TQListView * printers )
     return Unavail;
 }
 
-#endif // QT_NO_NIS
+#endif // TQT_NO_NIS
 
 static char *parseNsswitchPrintersEntry( TQListView * printers, char *line )
 {
@@ -578,7 +578,7 @@ static char *parseNsswitchPrintersEntry( TQListView * printers, char *line )
 		defaultPrinter = parsePrintersConf( printers, &found );
 		if ( found )
 		    lastStatus = Success;
-#ifndef QT_NO_NIS
+#ifndef TQT_NO_NIS
 	    } else if ( source == "nis" ) {
 		lastStatus = retrieveNisPrinters( printers );
 #endif
@@ -786,7 +786,7 @@ static void parseQconfig( TQListView * printers )
 }
 
 
-#ifndef QT_NO_CUPS
+#ifndef TQT_NO_CUPS
 #include 
 
 static char * parseCupsOutput( TQListView * printers )
@@ -1037,7 +1037,7 @@ TQGroupBox * TQPrintDialog::setupDestination()
 #if defined(Q_OS_UNIX)
     char * etcLpDefault = 0;
 
-#ifndef QT_NO_CUPS
+#ifndef TQT_NO_CUPS
     etcLpDefault = parseCupsOutput( d->printers );
 #endif
     if ( d->printers->childCount() == 0 ) {
@@ -1162,7 +1162,7 @@ TQGroupBox * TQPrintDialog::setupDestination()
     horiz->addSpacing( 6 );
     d->browse = new TQPushButton( tr("Browse..."), g, "browse files" );
     d->browse->setAutoDefault( FALSE );
-#ifdef QT_NO_FILEDIALOG
+#ifdef TQT_NO_FILEDIALOG
     d->browse->setEnabled( FALSE );
 #endif
     connect( d->browse, SIGNAL(clicked()),
@@ -1372,7 +1372,7 @@ bool TQPrintDialog::getPrinterSetup( TQPrinter * p, TQWidget* w  )
 {
     if ( !globalPrintDialog ) {
 	globalPrintDialog = new TQPrintDialog( 0, 0, "global print dialog" );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	globalPrintDialog->setCaption( TQPrintDialog::tr( "Setup Printer" ) );
 #endif
 	tqAddPostRoutine( qpd_cleanup_globaldialog );
@@ -1382,7 +1382,7 @@ bool TQPrintDialog::getPrinterSetup( TQPrinter * p, TQWidget* w  )
 	globalPrintDialog->setPrinter( p, TRUE );
     }
     globalPrintDialog->adjustPosition( w );
- #ifndef QT_NO_WIDGET_TOPEXTRA
+ #ifndef TQT_NO_WIDGET_TOPEXTRA
     if ( w ) {
 	const TQPixmap *pm = w->icon();
 	if ( pm && !pm->isNull() )
@@ -1471,7 +1471,7 @@ void TQPrintDialog::setNumCopies( int copies )
 
 void TQPrintDialog::browseClicked()
 {
-#ifndef QT_NO_FILEDIALOG
+#ifndef TQT_NO_FILEDIALOG
     TQString fn = TQFileDialog::getSaveFileName( d->fileName->text(), tr( "PostScript Files (*.ps);;All Files (*)" ), this );
     if ( !fn.isNull() )
 	d->fileName->setText( fn );
diff --git a/src/dialogs/qprogressdialog.cpp b/src/dialogs/qprogressdialog.cpp
index d0320af69..f7d1e1c5a 100644
--- a/src/dialogs/qprogressdialog.cpp
+++ b/src/dialogs/qprogressdialog.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqprogressdialog.h"
 
-#ifndef QT_NO_PROGRESSDIALOG
+#ifndef TQT_NO_PROGRESSDIALOG
 
 #include "ntqaccel.h"
 #include "ntqpainter.h"
@@ -89,7 +89,7 @@ public:
     bool	  shown_once;
     bool	  cancellation_flag;
     TQTime	  starttime;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     TQCursor	  parentCursor;
 #endif
     int		  showTime;
@@ -298,7 +298,7 @@ TQProgressDialog::TQProgressDialog( const TQString &labelText,
 
 TQProgressDialog::~TQProgressDialog()
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( d->creator )
 	d->creator->setCursor( d->parentCursor );
 #endif
@@ -411,7 +411,7 @@ void TQProgressDialog::setCancelButton( TQPushButton *cancelButton )
 	    cancelButton->reparent( this, 0, TQPoint(0,0), FALSE );
 	}
 	connect( d->cancel, SIGNAL(clicked()), this, SIGNAL(canceled()) );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	TQAccel *accel = new TQAccel( this );
 	accel->connectItem( accel->insertItem(Key_Escape),
 			    d->cancel, SIGNAL(clicked()) );
@@ -519,7 +519,7 @@ void TQProgressDialog::setTotalSteps( int totalSteps )
 
 void TQProgressDialog::reset()
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( progress() >= 0 ) {
 	if ( d->creator )
 	    d->creator->setCursor( d->parentCursor );
@@ -583,7 +583,7 @@ void TQProgressDialog::setProgress( int progress )
 	    tqApp->processEvents();
     } else {
 	if ( progress == 0 ) {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    if ( d->creator ) {
 		d->parentCursor = d->creator->cursor();
 		d->creator->setCursor( waitCursor );
diff --git a/src/dialogs/qtabdialog.cpp b/src/dialogs/qtabdialog.cpp
index c50b748e9..c577bdc63 100644
--- a/src/dialogs/qtabdialog.cpp
+++ b/src/dialogs/qtabdialog.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqtabdialog.h"
 
-#ifndef QT_NO_TABDIALOG
+#ifndef TQT_NO_TABDIALOG
 
 #include "ntqobjectlist.h"
 #include "ntqtabbar.h"
diff --git a/src/dialogs/qwizard.cpp b/src/dialogs/qwizard.cpp
index a11094a6f..a8bba3129 100644
--- a/src/dialogs/qwizard.cpp
+++ b/src/dialogs/qwizard.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqwizard.h"
 
-#ifndef QT_NO_WIZARD
+#ifndef TQT_NO_WIZARD
 
 #include "ntqlayout.h"
 #include "ntqpushbutton.h"
@@ -138,7 +138,7 @@ public:
 
     TQFrame * hbar1, * hbar2;
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQAccel * accel;
     int backAccel;
     int nextAccel;
@@ -203,7 +203,7 @@ TQWizard::TQWizard( TQWidget *parent, const char *name, bool modal,
     connect( d->helpButton, SIGNAL(clicked()),
 	     this, SLOT(help()) );
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     d->accel = new TQAccel( this, "arrow-key accel" );
     d->backAccel = d->accel->insertItem( TQt::ALT + TQt::Key_Left );
     d->accel->connectItem( d->backAccel, this, SLOT(back()) );
@@ -457,7 +457,7 @@ void TQWizard::help()
 void TQWizard::setBackEnabled( bool enable )
 {
     d->backButton->setEnabled( enable );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     d->accel->setItemEnabled( d->backAccel, enable );
 #endif
 }
@@ -466,7 +466,7 @@ void TQWizard::setBackEnabled( bool enable )
 void TQWizard::setNextEnabled( bool enable )
 {
     d->nextButton->setEnabled( enable );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     d->accel->setItemEnabled( d->nextAccel, enable );
 #endif
 }
@@ -914,4 +914,4 @@ TQWidget* TQWizard::page( int index ) const
     return d->pages.at( index )->w;
 }
 
-#endif // QT_NO_WIZARD
+#endif // TQT_NO_WIZARD
diff --git a/src/embedded/qgfxdriverinterface_p.h b/src/embedded/qgfxdriverinterface_p.h
index 61e7ca5bf..310f2262e 100644
--- a/src/embedded/qgfxdriverinterface_p.h
+++ b/src/embedded/qgfxdriverinterface_p.h
@@ -55,7 +55,7 @@
 #include 
 #endif // QT_H
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 // {449EC6C6-DF3E-43E3-9E57-354A3D05AB34}
 #ifndef IID_QGfxDriver
@@ -69,6 +69,6 @@ struct Q_EXPORT TQGfxDriverInterface : public TQFeatureListInterface
     virtual TQScreen* create( const TQString& driver, int displayId ) = 0;
 };
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
 
 #endif // TQGFXDRIVERINTERFACE_P_H
diff --git a/src/embedded/qkbddriverinterface_p.h b/src/embedded/qkbddriverinterface_p.h
index 84313f72e..002d70141 100644
--- a/src/embedded/qkbddriverinterface_p.h
+++ b/src/embedded/qkbddriverinterface_p.h
@@ -55,7 +55,7 @@
 #include 
 #endif // QT_H
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 // {C7C838EA-FC3E-4905-92AD-F479E81F1D02}
 #ifndef IID_QKbdDriver
@@ -69,6 +69,6 @@ struct Q_EXPORT TQKbdDriverInterface : public TQFeatureListInterface
     virtual TQWSKeyboardHandler* create( const TQString& driver, const TQString& device ) = 0;
 };
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
 
 #endif // TQKBDDRIVERINTERFACE_P_H
diff --git a/src/embedded/qmousedriverinterface_p.h b/src/embedded/qmousedriverinterface_p.h
index 041628f28..d4caea4b5 100644
--- a/src/embedded/qmousedriverinterface_p.h
+++ b/src/embedded/qmousedriverinterface_p.h
@@ -55,7 +55,7 @@
 #include 
 #endif // QT_H
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 // {4367CF5A-F7CE-407B-8BB6-DF19AEDA2EBB}
 #ifndef IID_QMouseDriver
@@ -69,6 +69,6 @@ struct Q_EXPORT TQMouseDriverInterface : public TQFeatureListInterface
     virtual TQWSMouseHandler* create( const TQString& driver, const TQString &device ) = 0;
 };
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
 
 #endif // TQMOUSEDRIVERINTERFACE_P_H
diff --git a/src/embedded/qt_embedded.pri b/src/embedded/qt_embedded.pri
index d02bdfb3f..018b2070a 100644
--- a/src/embedded/qt_embedded.pri
+++ b/src/embedded/qt_embedded.pri
@@ -31,31 +31,31 @@ embedded {
 	        HEADERS += $$EMBEDDED_H/qgfxlinuxfb_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxlinuxfb_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_LINUXFB
+	else:DEFINES += TQT_NO_QWS_LINUXFB
 
 	contains( gfx-drivers, tqvfb ) {
 		HEADERS += $$EMBEDDED_H/qgfxvfb_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxvfb_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_VFB
+	else:DEFINES += TQT_NO_QWS_VFB
 
 	contains( gfx-drivers, vnc ) {
 		HEADERS += $$EMBEDDED_H/qgfxvnc_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxvnc_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_VNC
+	else:DEFINES += TQT_NO_QWS_VNC
 
-	!contains( DEFINES, QT_NO_QWS_LINUXFB):contains( gfx-drivers, vga16 ) {
+	!contains( DEFINES, TQT_NO_QWS_LINUXFB):contains( gfx-drivers, vga16 ) {
 		HEADERS += $$EMBEDDED_H/qgfxvga16_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxvga16_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_VGA16
+	else:DEFINES += TQT_NO_QWS_VGA16
 
 	contains( gfx-drivers, transformed ) {
 		HEADERS += $$EMBEDDED_H/qgfxtransformed_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxtransformed_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_TRANSFORMED
+	else:DEFINES += TQT_NO_QWS_TRANSFORMED
 
 	contains( gfx-drivers, snap ) {
         exists( $(SCITECH)/include/snap/graphics.h) {
@@ -71,40 +71,40 @@ embedded {
             error("Please fix and re-build the makefiles.")
         }
 	}
-	else:DEFINES += QT_NO_QWS_SNAP
+	else:DEFINES += TQT_NO_QWS_SNAP
 
 	contains( gfx-drivers, mach64 ) {
 		HEADERS += $$EMBEDDED_H/qgfxmach64_qws.h \
 			   $$EMBEDDED_H/qgfxmach64defs_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxmach64_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_MACH64
+	else:DEFINES += TQT_NO_QWS_MACH64
 
 	contains( gfx-drivers, voodoo ) {
 		HEADERS += $$EMBEDDED_H/qgfxvoodoo_qws.h \
 			   $$EMBEDDED_H/qgfxvoodoodefs_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxvoodoo_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_VOODOO3
+	else:DEFINES += TQT_NO_QWS_VOODOO3
 
 	contains( gfx-drivers, matrox ) {
 		HEADERS += $$EMBEDDED_H/qgfxmatrox_qws.h \
 			   $$EMBEDDED_H/qgfxmatroxdefs_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxmatrox_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_MATROX
+	else:DEFINES += TQT_NO_QWS_MATROX
 
 	contains( gfx-drivers, shadowfb ) {
 		HEADERS += $$EMBEDDED_H/qgfxshadow_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxshadow_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_SHADOWFB
+	else:DEFINES += TQT_NO_QWS_SHADOWFB
 
 	contains( gfx-drivers, repeater ) {
 		HEADERS += $$EMBEDDED_H/qgfxrepeater_qws.h
 		SOURCES += $$EMBEDDED_CPP/qgfxrepeater_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_REPEATER
+	else:DEFINES += TQT_NO_QWS_REPEATER
 
 #
 # Keyboard drivers
@@ -117,7 +117,7 @@ embedded {
 		    kbd-drivers += tty
 		}
 	}
-	else:DEFINES += QT_NO_QWS_KBD_SL5000
+	else:DEFINES += TQT_NO_QWS_KBD_SL5000
 
 	contains( kbd-drivers, tty ) {
 		HEADERS +=$$EMBEDDED_H/qkbdtty_qws.h
@@ -126,7 +126,7 @@ embedded {
 		    kbd-drivers += pc101
 		}
 	}
-	else:DEFINES += QT_NO_QWS_KBD_TTY
+	else:DEFINES += TQT_NO_QWS_KBD_TTY
 
 	contains( kbd-drivers, usb ) {
 		HEADERS +=$$EMBEDDED_H/qkbdusb_qws.h
@@ -135,25 +135,25 @@ embedded {
 		    kbd-drivers += pc101
 		}
 	}
-	else:DEFINES += QT_NO_QWS_KBD_USB
+	else:DEFINES += TQT_NO_QWS_KBD_USB
 
 	contains( kbd-drivers, pc101 ) {
 		HEADERS +=$$EMBEDDED_H/qkbdpc101_qws.h
 		SOURCES +=$$EMBEDDED_CPP/qkbdpc101_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_KBD_PC101
+	else:DEFINES += TQT_NO_QWS_KBD_PC101
 
 	contains( kbd-drivers, yopy ) {
 		HEADERS +=$$EMBEDDED_H/qkbdyopy_qws.h
 		SOURCES +=$$EMBEDDED_CPP/qkbdyopy_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_KBD_YOPY
+	else:DEFINES += TQT_NO_QWS_KBD_YOPY
 
 	contains( kbd-drivers, vr41xx ) {
 		HEADERS +=$$EMBEDDED_H/qkbdvr41xx_qws.h
 		SOURCES +=$$EMBEDDED_CPP/qkbdvr41xx_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_KBD_VR41
+	else:DEFINES += TQT_NO_QWS_KBD_VR41
 
 #
 # Mouse drivers
@@ -163,30 +163,30 @@ embedded {
 		HEADERS +=$$EMBEDDED_H/qmousepc_qws.h
 		SOURCES +=$$EMBEDDED_CPP/qmousepc_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_MOUSE_PC
+	else:DEFINES += TQT_NO_QWS_MOUSE_PC
 
 	contains( mouse-drivers, bus ) {
 		HEADERS +=$$EMBEDDED_H/qmousebus_qws.h
 		SOURCES +=$$EMBEDDED_CPP/qmousebus_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_MOUSE_BUS
+	else:DEFINES += TQT_NO_QWS_MOUSE_BUS
 
 	contains( mouse-drivers, linuxtp ) {
 		HEADERS +=$$EMBEDDED_H/qmouselinuxtp_qws.h
 		SOURCES +=$$EMBEDDED_CPP/qmouselinuxtp_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_MOUSE_LINUXTP
+	else:DEFINES += TQT_NO_QWS_MOUSE_LINUXTP
 
 	contains( mouse-drivers, vr41xx ) {
 		HEADERS +=$$EMBEDDED_H/qmousevr41xx_qws.h
 		SOURCES +=$$EMBEDDED_CPP/qmousevr41xx_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_MOUSE_VR41
+	else:DEFINES += TQT_NO_QWS_MOUSE_VR41
 
 	contains( mouse-drivers, yopy ) {
 		HEADERS +=$$EMBEDDED_H/qmouseyopy_qws.h
 		SOURCES +=$$EMBEDDED_CPP/qmouseyopy_qws.cpp
 	}
-	else:DEFINES += QT_NO_QWS_MOUSE_YOPY
+	else:DEFINES += TQT_NO_QWS_MOUSE_YOPY
 }
 
diff --git a/src/inputmethod/ntqinputcontextfactory.h b/src/inputmethod/ntqinputcontextfactory.h
index 29ecda7f3..9e0160630 100644
--- a/src/inputmethod/ntqinputcontextfactory.h
+++ b/src/inputmethod/ntqinputcontextfactory.h
@@ -40,7 +40,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 
 class TQInputContext;
 class TQWidget;
@@ -54,6 +54,6 @@ public:
     static TQString displayName( const TQString &key );
     static TQString description( const TQString &key );
 };
-#endif //QT_NO_IM
+#endif //TQT_NO_IM
 
 #endif //TQINPUTCONTEXTFACTORY_H
diff --git a/src/inputmethod/ntqinputcontextplugin.h b/src/inputmethod/ntqinputcontextplugin.h
index bec6dc5be..5c99341de 100644
--- a/src/inputmethod/ntqinputcontextplugin.h
+++ b/src/inputmethod/ntqinputcontextplugin.h
@@ -43,7 +43,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 class TQInputContext;
 class TQInputContextPluginPrivate;
 
@@ -63,5 +63,5 @@ public:
 private:
     TQInputContextPluginPrivate *d;
 };
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 #endif // TQINPUTCONTEXTPLUGIN_H
diff --git a/src/inputmethod/qinputcontextfactory.cpp b/src/inputmethod/qinputcontextfactory.cpp
index f57d3a3cf..ded0be5ba 100644
--- a/src/inputmethod/qinputcontextfactory.cpp
+++ b/src/inputmethod/qinputcontextfactory.cpp
@@ -39,7 +39,7 @@
 #include "ntqinputcontextfactory.h"
 #include "ntqinputcontext.h"
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 
 #include "ntqapplication.h"
 
@@ -51,7 +51,7 @@
 
 #include "ntqcleanuphandler.h"
 #include 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 
 static TQPluginManager *manager = 0;
@@ -80,7 +80,7 @@ static void create_manager()
     cleanup_manager.set( &manager );
 }
 
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
 
 /*!
@@ -92,7 +92,7 @@ TQInputContext *TQInputContextFactory::create( const TQString& key, TQWidget *wi
 {
     TQInputContext *ret = 0;
     TQString inputcontext = key;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     // make sure the manager is created
     create_manager();
 
@@ -119,12 +119,12 @@ TQInputContext *TQInputContextFactory::create( const TQString& key, TQWidget *wi
 TQStringList TQInputContextFactory::keys()
 {
     TQStringList list;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     // make sure the manager is created
     create_manager();
 
     list = manager->featureList();
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
     return list;
 }
@@ -133,7 +133,7 @@ TQStringList TQInputContextFactory::keys()
 TQStringList TQInputContextFactory::languages( const TQString &key )
 {
     TQStringList result;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     // make sure the manager is created
     create_manager();
 
@@ -142,7 +142,7 @@ TQStringList TQInputContextFactory::languages( const TQString &key )
 
     if ( iface )
 	result = iface->languages( key );
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
     return result;
 }
@@ -151,7 +151,7 @@ TQStringList TQInputContextFactory::languages( const TQString &key )
 TQString TQInputContextFactory::displayName( const TQString &key )
 {
     TQString result( "" );
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     // make sure the manager is created
     create_manager();
 
@@ -160,7 +160,7 @@ TQString TQInputContextFactory::displayName( const TQString &key )
 
     if ( iface )
 	result = iface->displayName( key );
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
     return result;
 }
@@ -169,7 +169,7 @@ TQString TQInputContextFactory::displayName( const TQString &key )
 TQString TQInputContextFactory::description( const TQString &key )
 {
     TQString result( "" );
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     // make sure the manager is created
     create_manager();
 
@@ -178,9 +178,9 @@ TQString TQInputContextFactory::description( const TQString &key )
 
     if ( iface )
 	result = iface->description( key );
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
     return result;
 }
 
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
diff --git a/src/inputmethod/qinputcontextinterface_p.h b/src/inputmethod/qinputcontextinterface_p.h
index 40574894e..fc2b50969 100644
--- a/src/inputmethod/qinputcontextinterface_p.h
+++ b/src/inputmethod/qinputcontextinterface_p.h
@@ -52,8 +52,8 @@
 #include 
 #endif // QT_H
 
-#ifndef QT_NO_IM
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_IM
+#ifndef TQT_NO_COMPONENT
 
 class TQWidget;
 class TQInputContext;
@@ -81,7 +81,7 @@ struct Q_EXPORT TQInputContextFactoryInterface : public TQFeatureListInterface
     virtual TQString description( const TQString &key ) = 0;
 };
 
-#endif //QT_NO_COMPONENT
-#endif //QT_NO_IM
+#endif //TQT_NO_COMPONENT
+#endif //TQT_NO_IM
 
 #endif //TQINPUTCONTEXTINTERFACE_P_H
diff --git a/src/inputmethod/qinputcontextplugin.cpp b/src/inputmethod/qinputcontextplugin.cpp
index 3b474d2ff..48f9c0d4a 100644
--- a/src/inputmethod/qinputcontextplugin.cpp
+++ b/src/inputmethod/qinputcontextplugin.cpp
@@ -37,8 +37,8 @@
 
 #include "ntqinputcontextplugin.h"
 
-#ifndef QT_NO_IM
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_IM
+#ifndef TQT_NO_COMPONENT
 
 #include "qinputcontextinterface_p.h"
 
@@ -227,5 +227,5 @@ TQInputContextPlugin::~TQInputContextPlugin()
     // don't delete d, as this is deleted by d
 }
 
-#endif // QT_NO_COMPONENT
-#endif // QT_NO_IM
+#endif // TQT_NO_COMPONENT
+#endif // TQT_NO_IM
diff --git a/src/kernel/ntqaccel.h b/src/kernel/ntqaccel.h
index ae79380c9..42ee4f77a 100644
--- a/src/kernel/ntqaccel.h
+++ b/src/kernel/ntqaccel.h
@@ -46,7 +46,7 @@
 #include "ntqkeysequence.h"
 #endif // QT_H
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 class TQAccelPrivate;
 
@@ -106,5 +106,5 @@ private:
     friend class TQAccelManager;
 };
 
-#endif // QT_NO_ACCEL
+#endif // TQT_NO_ACCEL
 #endif // TQACCEL_H
diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h
index 9ae120f2b..e00289ab6 100644
--- a/src/kernel/ntqapplication.h
+++ b/src/kernel/ntqapplication.h
@@ -92,7 +92,7 @@ public:
 
     Type type() const;
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     static TQStyle  &style();
     static void	    setStyle( TQStyle* );
     static TQStyle*  setStyle( const TQString& );
@@ -106,14 +106,14 @@ public:
     enum ColorSpec { NormalColor=0, CustomColor=1, ManyColor=2 };
     static int	     colorSpec();
     static void      setColorSpec( int );
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     static TQCursor  *overrideCursor();
     static void	     setOverrideCursor( const TQCursor &, bool replace=FALSE );
     static void	     restoreOverrideCursor();
 #endif
     static bool	     hasGlobalMouseTracking();
     static void	     setGlobalMouseTracking( bool enable );
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     static TQPalette  palette( const TQWidget* = 0 );
     static TQPalette  palette( TQStringList );
     static void	     setPalette( const TQPalette &, bool informWidgets=FALSE,
@@ -135,7 +135,7 @@ public:
 
     static TQWidget     *activePopupWidget();
     static TQWidget     *activeModalWidget();
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     static TQClipboard  *clipboard();
 #endif
     TQWidget	       *focusWidget() const;
@@ -175,7 +175,7 @@ public:
     static void	     beep();
 
 #ifndef TQT_NO_TRANSLATION
-# ifndef QT_NO_TEXTCODEC
+# ifndef TQT_NO_TEXTCODEC
     void	     setDefaultCodec( TQTextCodec * );
     TQTextCodec*	     defaultCodec() const;
 # endif
@@ -187,11 +187,11 @@ public:
 				const char * key,
 				const char * comment = 0,
 				Encoding encoding = DefaultCodec ) const;
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
     TQString   applicationDirPath();
     TQString   applicationFilePath();
 #endif
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     // obsolete functions
     static void      setWinStyleHighlightColor( const TQColor &c ) {
 	TQPalette p( palette() );
@@ -210,19 +210,19 @@ public:
 
     static void      setDoubleClickInterval( int );
     static int       doubleClickInterval();
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     static void      setWheelScrollLines( int );
     static int       wheelScrollLines();
 #endif
     static void	     setGlobalStrut( const TQSize & );
     static TQSize     globalStrut();
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     static void      setLibraryPaths( const TQStringList & );
     static TQStringList libraryPaths();
     static void      addLibraryPath( const TQString & );
     static void      removeLibraryPath( const TQString & );
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
     static void setStartDragTime( int ms );
     static int startDragTime();
     static void setStartDragDistance( int l );
@@ -256,7 +256,7 @@ public:
     Returns true if the process is GUI server
 */
     bool          qwsIsGUIServer();
-#ifndef QT_NO_QWS_MANAGER
+#ifndef TQT_NO_QWS_MANAGER
     static TQWSDecoration &qwsDecoration();
     static void      qwsSetDecoration( TQWSDecoration *);
 #endif
@@ -272,7 +272,7 @@ public:
     static void	     winMouseButtonUp();
 #endif
 
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
     // session management
     bool	     isSessionRestored() const;
     TQString 	sessionId() const;
@@ -281,7 +281,7 @@ public:
     virtual void     saveState( TQSessionManager& sm );
 #endif
 #if defined(Q_WS_X11)
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM_EXTENSIONS)
     virtual TQWidget *locateICHolderWidget( TQWidget *w );
     virtual TQWidgetList *icHolderWidgets();
     static void create_im();
@@ -365,11 +365,11 @@ private:
     int		     quit_code;
     static TQStyle   *app_style;
     static int	     app_cspec;
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     static TQPalette *app_pal;
 #endif
     static TQFont    *app_font;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     static TQCursor  *app_cursor;
 #endif
 #ifndef TQT_THREAD_SUPPORT
@@ -400,21 +400,21 @@ private:
     static bool	     metaComposeUnicode;
 
     TQValueList *translators;
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
     TQSessionManager *session_manager;
     TQString	     session_id;
     static TQString* session_key;
     bool	     is_session_restored;
 #endif
 #if defined(Q_WS_X11)
-#if !defined (QT_NO_STYLE)
+#if !defined (TQT_NO_STYLE)
     static void x11_initialize_style();
 #endif
     static TQString defaultIM; // default input method's name in this application.
 #endif
 
     static TQSize     app_strut;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     static TQStringList *app_libpaths;
 #endif
     static TQAsciiDict *app_palettes;
@@ -483,7 +483,7 @@ inline void TQApplication::setArgs(int c, char **v)
 }
 #endif
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 inline TQCursor *TQApplication::overrideCursor()
 {
     return app_cursor;
@@ -518,7 +518,7 @@ inline bool TQApplication::inPopupMode() const
 {
     return popupWidgets != 0;
 }
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
 inline bool TQApplication::isSessionRestored() const
 {
     return is_session_restored;
@@ -544,7 +544,7 @@ inline TQSize TQApplication::globalStrut()
 inline TQString TQApplication::translate( const char *, const char *sourceText,
 					const char *, Encoding encoding ) const
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( encoding == UnicodeUTF8 )
 	return TQString::fromUtf8( sourceText );
     else
diff --git a/src/kernel/ntqasyncimageio.h b/src/kernel/ntqasyncimageio.h
index 25401c06e..b307490ea 100644
--- a/src/kernel/ntqasyncimageio.h
+++ b/src/kernel/ntqasyncimageio.h
@@ -45,7 +45,7 @@
 #include "ntqimage.h"
 #endif // QT_H
 
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
 
 #if __GNUC__ - 0 > 3
 #pragma GCC system_header
@@ -106,6 +106,6 @@ private:
     TQImageDecoderPrivate *d;
 };
 
-#endif // QT_NO_ASYNC_IMAGE_IO
+#endif // TQT_NO_ASYNC_IMAGE_IO
 
 #endif // TQASYNCIMAGEIO_H
diff --git a/src/kernel/ntqasyncio.h b/src/kernel/ntqasyncio.h
index aa2968bc7..b585032f4 100644
--- a/src/kernel/ntqasyncio.h
+++ b/src/kernel/ntqasyncio.h
@@ -47,7 +47,7 @@
 #include "ntqtimer.h"
 #endif // QT_H
 
-#ifndef QT_NO_ASYNC_IO
+#ifndef TQT_NO_ASYNC_IO
 
 class TQIODevice;
 
@@ -115,6 +115,6 @@ private slots:
     void tryToPump();
 };
 
-#endif	// QT_NO_ASYNC_IO
+#endif	// TQT_NO_ASYNC_IO
 
 #endif
diff --git a/src/kernel/ntqbitmap.h b/src/kernel/ntqbitmap.h
index 90fe694e4..a4e49a362 100644
--- a/src/kernel/ntqbitmap.h
+++ b/src/kernel/ntqbitmap.h
@@ -57,14 +57,14 @@ public:
     TQBitmap( int w, int h,  const uchar *bits, bool isXbitmap=FALSE );
     TQBitmap( const TQSize &, const uchar *bits, bool isXbitmap=FALSE );
     TQBitmap( const TQBitmap & );
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     TQBitmap( const TQString &fileName, const char *format=0 );
 #endif
     TQBitmap &operator=( const TQBitmap & );
     TQBitmap &operator=( const TQPixmap & );
     TQBitmap &operator=( const TQImage  & );
 
-#ifndef QT_NO_PIXMAP_TRANSFORMATION
+#ifndef TQT_NO_PIXMAP_TRANSFORMATION
     TQBitmap  xForm( const TQWMatrix & ) const;
 #endif
 };
diff --git a/src/kernel/ntqbrush.h b/src/kernel/ntqbrush.h
index 72c61d4e6..6c13f2308 100644
--- a/src/kernel/ntqbrush.h
+++ b/src/kernel/ntqbrush.h
@@ -86,7 +86,7 @@ private:
   TQBrush stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBrush & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBrush & );
 #endif
diff --git a/src/kernel/ntqclipboard.h b/src/kernel/ntqclipboard.h
index 9675b8855..34e9ed509 100644
--- a/src/kernel/ntqclipboard.h
+++ b/src/kernel/ntqclipboard.h
@@ -46,7 +46,7 @@
 #include "ntqobject.h"
 #endif // QT_H
 
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 
 class TQMimeSource;
 
@@ -75,7 +75,7 @@ public:
     TQString     text( TQCString& subtype, Mode mode ) const;
     void	setText( const TQString &, Mode mode );
 
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
     TQMimeSource *data( Mode mode ) const;
     void setData( TQMimeSource*, Mode mode );
 
@@ -90,7 +90,7 @@ public:
     TQString     text(TQCString& subtype) const;
     void	setText( const TQString &);
 
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
     TQMimeSource	*data() const;
     void	setData( TQMimeSource* );
 
@@ -129,6 +129,6 @@ private:
 #endif
 };
 
-#endif // QT_NO_CLIPBOARD
+#endif // TQT_NO_CLIPBOARD
 
 #endif // TQCLIPBOARD_H
diff --git a/src/kernel/ntqcolor.h b/src/kernel/ntqcolor.h
index a35e81098..30acc281f 100644
--- a/src/kernel/ntqcolor.h
+++ b/src/kernel/ntqcolor.h
@@ -140,7 +140,7 @@ public:
 
     static void initialize();
     static void cleanup();
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     static TQStringList colorNames();
 #endif
     enum { Dirt = 0x44495254, Invalid = 0x49000000 };
@@ -221,7 +221,7 @@ inline bool TQColor::operator!=( const TQColor &c ) const
   TQColor stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColor & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQColor & );
 #endif
diff --git a/src/kernel/ntqcursor.h b/src/kernel/ntqcursor.h
index a285637cc..38f55c48c 100644
--- a/src/kernel/ntqcursor.h
+++ b/src/kernel/ntqcursor.h
@@ -49,7 +49,7 @@
 /*
   ### The fake cursor has to go first with old qdoc.
 */
-#ifdef QT_NO_CURSOR
+#ifdef TQT_NO_CURSOR
 
 class Q_EXPORT TQCursor : public TQt
 {
@@ -61,9 +61,9 @@ private:
     TQCursor();
 };
 
-#endif // QT_NO_CURSOR
+#endif // TQT_NO_CURSOR
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 
 struct TQCursorData;
 
@@ -125,11 +125,11 @@ private:
 /*****************************************************************************
   TQCursor stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCursor & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCursor & );
 #endif
-#endif // QT_NO_CURSOR
+#endif // TQT_NO_CURSOR
 
 
 inline void TQCursor::setPos( const TQPoint &p )
diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h
index fbcca3abb..a255d0fe5 100644
--- a/src/kernel/ntqdragobject.h
+++ b/src/kernel/ntqdragobject.h
@@ -52,7 +52,7 @@ class TQImageDragData;
 #include "ntqcolor.h"
 #endif // QT_H
 
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 
 class Q_EXPORT TQDragObject: public TQObject, public TQMimeSource {
     TQ_OBJECT
@@ -60,7 +60,7 @@ public:
     TQDragObject( TQWidget * dragSource = 0, const char * name = 0 );
     virtual ~TQDragObject();
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     bool drag();
     bool dragMove();
     void dragCopy();
@@ -77,7 +77,7 @@ public:
 
     static void setTarget(TQWidget*);
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     enum DragMode { DragDefault, DragCopy, DragMove, DragLink, DragCopyOrMove };
 
 protected:
@@ -220,7 +220,7 @@ private:
 typedef TQUriDrag TQUrlDrag;
 #endif
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 // TQDragManager is not part of the public API.  It is defined in a
 // header file simply so different .cpp files can implement different
@@ -274,6 +274,6 @@ private:
 
 #endif
 
-#endif // QT_NO_MIME
+#endif // TQT_NO_MIME
 
 #endif // TQDRAGOBJECT_H
diff --git a/src/kernel/ntqdrawutil.h b/src/kernel/ntqdrawutil.h
index 2d3e1fefd..c315cb5b2 100644
--- a/src/kernel/ntqdrawutil.h
+++ b/src/kernel/ntqdrawutil.h
@@ -53,7 +53,7 @@ class TQBrush;
 class TQRect;
 class TQPixmap;
 
-#ifndef QT_NO_DRAWUTIL
+#ifndef TQT_NO_DRAWUTIL
 //
 // Standard shade drawing
 //
@@ -124,5 +124,5 @@ Q_EXPORT void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style
 			  int x, int y, int w, int h,
 			  const TQColorGroup &g, bool enabled );
 
-#endif // QT_NO_DRAWUTIL
+#endif // TQT_NO_DRAWUTIL
 #endif // TQDRAWUTIL_H
diff --git a/src/kernel/ntqevent.h b/src/kernel/ntqevent.h
index 566575ca3..d5db5ce82 100644
--- a/src/kernel/ntqevent.h
+++ b/src/kernel/ntqevent.h
@@ -203,7 +203,7 @@ protected:
 };
 
 
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 class Q_EXPORT TQWheelEvent : public TQEvent
 {
 public:
@@ -500,7 +500,7 @@ inline int TQIMEvent::selectionLength() const
 }
 
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 // This class is rather closed at the moment.  If you need to create your
 // own DND event objects, write to qt-bugs@trolltech.com and we'll try to
@@ -589,7 +589,7 @@ public:
 	: TQEvent(DragLeave) {}
 };
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 class Q_EXPORT TQChildEvent : public TQEvent
 {
diff --git a/src/kernel/ntqfont.h b/src/kernel/ntqfont.h
index b3a0911fc..cdbd069d6 100644
--- a/src/kernel/ntqfont.h
+++ b/src/kernel/ntqfont.h
@@ -181,14 +181,14 @@ public:
     TQString toString() const;
     bool fromString(const TQString &);
 
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     static TQString substitute(const TQString &);
     static TQStringList substitutes(const TQString &);
     static TQStringList substitutions();
     static void insertSubstitution(const TQString&, const TQString &);
     static void insertSubstitutions(const TQString&, const TQStringList &);
     static void removeSubstitution(const TQString &);
-#endif //QT_NO_STRINGLIST
+#endif //TQT_NO_STRINGLIST
     static void initialize();
     static void cleanup();
 #ifndef Q_WS_QWS
@@ -337,10 +337,10 @@ private:
     friend class TQTextLayout;
     friend class TQTextItem;
     friend class TQGLContext;
-#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
+#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
     friend TQt::HANDLE qt_xft_handle(const TQFont &font);
 #endif
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & );
     friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & );
 #endif
@@ -363,7 +363,7 @@ inline void TQFont::setBold( bool enable )
   TQFont stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQFont & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQFont & );
 #endif
diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h
index bc686cabc..7ea425155 100644
--- a/src/kernel/ntqfontdatabase.h
+++ b/src/kernel/ntqfontdatabase.h
@@ -50,7 +50,7 @@
 #endif // QT_H
 
 
-#ifndef QT_NO_FONTDATABASE
+#ifndef TQT_NO_FONTDATABASE
 
 class TQFontStylePrivate; /* Don't touch! */
 struct TQtFontStyle;
@@ -222,6 +222,6 @@ inline int TQFontDatabase::weight( const TQString &family,
 
 #endif // TQT_NO_COMPAT
 
-#endif // QT_NO_FONTDATABASE
+#endif // TQT_NO_FONTDATABASE
 
 #endif // TQFONTDATABASE_H
diff --git a/src/kernel/ntqgplugin.h b/src/kernel/ntqgplugin.h
index 7300c0f3e..3b645ab2f 100644
--- a/src/kernel/ntqgplugin.h
+++ b/src/kernel/ntqgplugin.h
@@ -55,7 +55,7 @@
 #include "ntqobject.h"
 #endif // QT_H
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 #ifndef Q_EXTERN_C
 #ifdef __cplusplus
@@ -125,6 +125,6 @@ private:
     TQUnknownInterface* _iface;
 };
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
 
 #endif // TQGPLUGIN_H
diff --git a/src/kernel/ntqiconset.h b/src/kernel/ntqiconset.h
index a16d96553..7576c9d02 100644
--- a/src/kernel/ntqiconset.h
+++ b/src/kernel/ntqiconset.h
@@ -46,7 +46,7 @@
 #include "ntqpixmap.h"
 #endif // QT_H
 
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 
 class TQIconFactory;
 class TQIconSetPrivate;
@@ -128,5 +128,5 @@ private:
     uint unused : 31;
 };
 
-#endif // QT_NO_ICONSET
+#endif // TQT_NO_ICONSET
 #endif
diff --git a/src/kernel/ntqimage.h b/src/kernel/ntqimage.h
index e4f23596f..214af452b 100644
--- a/src/kernel/ntqimage.h
+++ b/src/kernel/ntqimage.h
@@ -48,7 +48,7 @@
 #endif // QT_H
 
 class TQImageDataMisc; // internal
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
 class Q_EXPORT TQImageTextKeyLang {
 public:
     TQImageTextKeyLang(const char* k, const char* l) : key(k), lang(l) { }
@@ -62,7 +62,7 @@ public:
     bool operator== (const TQImageTextKeyLang& other) const
 	{ return (key==other.key) && (lang==other.lang); }
 };
-#endif //QT_NO_IMAGE_TEXT
+#endif //TQT_NO_IMAGE_TEXT
 
 
 class Q_EXPORT TQImage
@@ -75,7 +75,7 @@ public:
 	    Endian bitOrder=IgnoreEndian );
     TQImage( const TQSize&, int depth, int numColors=0,
 	    Endian bitOrder=IgnoreEndian );
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     TQImage( const TQString &fileName, const char* format=0 );
     TQImage( const char * const xpm[] );
     TQImage( const TQByteArray &data );
@@ -99,7 +99,7 @@ public:
     TQImage	copy()		const;
     TQImage	copy(int x, int y, int w, int h, int conversion_flags=0) const;
     TQImage	copy(const TQRect&)	const;
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     static TQImage fromMimeSource( const TQString& abs_name );
 #endif
     bool	isNull()	const	{ return data->bits == 0; }
@@ -143,7 +143,7 @@ public:
     void	invertPixels( bool invertAlpha = TRUE );
 
     TQImage	convertDepth( int ) const;
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
     TQImage	convertDepthWithPalette( int, TQRgb* p, int pc, int cf=0 ) const;
 #endif
     TQImage	convertDepth( int, int conversion_flags ) const;
@@ -154,11 +154,11 @@ public:
 	ScaleMin,
 	ScaleMax
     };
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
     TQImage smoothScale( int w, int h, ScaleMode mode=ScaleFree ) const;
     TQImage smoothScale( const TQSize& s, ScaleMode mode=ScaleFree ) const;
 #endif
-#ifndef QT_NO_IMAGE_TRANSFORMATION
+#ifndef TQT_NO_IMAGE_TRANSFORMATION
     TQImage scale( int w, int h, ScaleMode mode=ScaleFree ) const;
     TQImage scale( const TQSize& s, ScaleMode mode=ScaleFree ) const;
     TQImage scaleWidth( int w ) const;
@@ -166,13 +166,13 @@ public:
     TQImage xForm( const TQWMatrix &matrix ) const;
 #endif
 
-#ifndef QT_NO_IMAGE_DITHER_TO_1
+#ifndef TQT_NO_IMAGE_DITHER_TO_1
     TQImage	createAlphaMask( int conversion_flags=0 ) const;
 #endif
-#ifndef QT_NO_IMAGE_HEURISTIC_MASK
+#ifndef TQT_NO_IMAGE_HEURISTIC_MASK
     TQImage	createHeuristicMask( bool clipTight=TRUE ) const;
 #endif
-#ifndef QT_NO_IMAGE_MIRROR
+#ifndef TQT_NO_IMAGE_MIRROR
     TQImage	mirror() const;
     TQImage	mirror(bool horizontally, bool vertically) const;
 #endif
@@ -181,11 +181,11 @@ public:
     static Endian systemBitOrder();
     static Endian systemByteOrder();
 
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     static const char* imageFormat( const TQString &fileName );
     static TQStrList inputFormats();
     static TQStrList outputFormats();
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     static TQStringList inputFormatList();
     static TQStringList outputFormatList();
 #endif
@@ -197,7 +197,7 @@ public:
 		      int quality=-1 ) const;
     bool	save( TQIODevice * device, const char* format,
 		      int quality=-1 ) const;
-#endif //QT_NO_IMAGEIO
+#endif //TQT_NO_IMAGEIO
 
     bool	valid( int x, int y ) const;
     int		pixelIndex( int x, int y ) const;
@@ -211,7 +211,7 @@ public:
     void setDotsPerMeterY(int);
     TQPoint offset() const;
     void setOffset(const TQPoint&);
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     TQValueList textList() const;
     TQStringList textLanguages() const;
     TQStringList textKeys() const;
@@ -238,15 +238,15 @@ private:
 	int	dpmx;				// dots per meter X (or 0)
 	int	dpmy;				// dots per meter Y (or 0)
 	TQPoint	offset;				// offset in pixels
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
 	TQImageDataMisc* misc;			// less common stuff
 #endif
 	bool    ctbl_mine;			// this allocated ctbl
     } *data;
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     TQImageDataMisc& misc() const;
 #endif
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     bool doImageIO( TQImageIO* io, int quality ) const;
 #endif
     friend Q_EXPORT void bitBlt( TQImage* dst, int dx, int dy,
@@ -257,12 +257,12 @@ private:
 
 // TQImage stream functions
 
-#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO)
+#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO)
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQImage & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQImage & );
 #endif
 
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 class TQIODevice;
 typedef void (*image_io_handler)( TQImageIO * ); // image IO handler
 
@@ -332,7 +332,7 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif //QT_NO_IMAGEIO
+#endif //TQT_NO_IMAGEIO
 
 Q_EXPORT void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src,
 		      int sx=0, int sy=0, int sw=-1, int sh=-1,
diff --git a/src/kernel/ntqimageformatplugin.h b/src/kernel/ntqimageformatplugin.h
index 74ec7c2eb..d595881c5 100644
--- a/src/kernel/ntqimageformatplugin.h
+++ b/src/kernel/ntqimageformatplugin.h
@@ -44,7 +44,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_IMAGEFORMATPLUGIN
+#ifndef TQT_NO_IMAGEFORMATPLUGIN
 class TQImageFormat;
 class TQImageFormatPluginPrivate;
 
@@ -63,5 +63,5 @@ public:
 private:
     TQImageFormatPluginPrivate *d;
 };
-#endif // QT_NO_IMAGEFORMATPLUGIN
+#endif // TQT_NO_IMAGEFORMATPLUGIN
 #endif // TQIMAGEFORMATPLUGIN_H
diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h
index c39939b47..2cb7785e0 100644
--- a/src/kernel/ntqinputcontext.h
+++ b/src/kernel/ntqinputcontext.h
@@ -36,7 +36,7 @@
 #ifndef TQINPUTCONTEXT_H
 #define TQINPUTCONTEXT_H
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 
 #ifndef QT_H
 #include "ntqobject.h"
diff --git a/src/kernel/ntqjpegio.h b/src/kernel/ntqjpegio.h
index 43e240296..bb27c5dc8 100644
--- a/src/kernel/ntqjpegio.h
+++ b/src/kernel/ntqjpegio.h
@@ -43,10 +43,10 @@
 
 #include "ntqglobal.h"
 
-#ifndef QT_NO_IMAGEIO_JPEG
+#ifndef TQT_NO_IMAGEIO_JPEG
 
 void qInitJpegIO();
 
-#endif // QT_NO_IMAGEIO_JPEG
+#endif // TQT_NO_IMAGEIO_JPEG
 
 #endif // TQJPEGIO_H
diff --git a/src/kernel/ntqkeysequence.h b/src/kernel/ntqkeysequence.h
index e326570ca..84475a17e 100644
--- a/src/kernel/ntqkeysequence.h
+++ b/src/kernel/ntqkeysequence.h
@@ -48,12 +48,12 @@
 #endif // QT_H
 #endif
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 /*****************************************************************************
   TQKeySequence stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 class TQKeySequence;
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQKeySequence & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQKeySequence & );
@@ -104,6 +104,6 @@ public:
     TQKeySequence( int ) {}
 };
 
-#endif //QT_NO_ACCEL
+#endif //TQT_NO_ACCEL
 
 #endif
diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h
index ce170abc2..a9962e47c 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -49,7 +49,7 @@
 
 #include 
 
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 
 #if 0
 TQ_OBJECT
@@ -207,7 +207,7 @@ public:
     void setResizeMode( ResizeMode );
     ResizeMode resizeMode() const;
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     virtual void setMenuBar( TQMenuBar *w );
     TQMenuBar *menuBar() const { return menubar; }
 #endif
@@ -270,7 +270,7 @@ private:
     uint autoResizeMode : 1;
     TQRect rect;
     TQLayoutData *extraData;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     TQMenuBar *menubar;
 #endif
 
@@ -469,5 +469,5 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_LAYOUT
+#endif // TQT_NO_LAYOUT
 #endif // TQLAYOUT_H
diff --git a/src/kernel/ntqlocalfs.h b/src/kernel/ntqlocalfs.h
index 72c635907..7676cec48 100644
--- a/src/kernel/ntqlocalfs.h
+++ b/src/kernel/ntqlocalfs.h
@@ -46,7 +46,7 @@
 #include "ntqdir.h"
 #endif // QT_H
 
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
 
 class Q_EXPORT TQLocalFs : public TQNetworkProtocol
 {
@@ -70,6 +70,6 @@ private:
 
 };
 
-#endif // QT_NO_NETWORKPROTOCOL
+#endif // TQT_NO_NETWORKPROTOCOL
 
 #endif // TQLOCALFS_H
diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/ntqmetaobject.h
index 6c8fb094c..55d3962e3 100644
--- a/src/kernel/ntqmetaobject.h
+++ b/src/kernel/ntqmetaobject.h
@@ -62,7 +62,7 @@ struct TQMetaData				// - member function meta data
     Access access;				// - access permission
 };
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 struct TQMetaEnum				// enumerator meta data
 {						//  for properties
     const char *name;				// - enumerator name
@@ -77,7 +77,7 @@ struct TQMetaEnum				// enumerator meta data
 };
 #endif
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 
 class Q_EXPORT TQMetaProperty			// property meta data
 {
@@ -131,7 +131,7 @@ public:
 inline bool TQMetaProperty::testFlags( uint f ) const
 { return (flags & (uint)f) != (uint)0; }
 
-#endif // QT_NO_PROPERTIES
+#endif // TQT_NO_PROPERTIES
 
 struct TQClassInfo				// class info meta data
 {
@@ -145,13 +145,13 @@ public:
     TQMetaObject( const char * const class_name, TQMetaObject *superclass,
 		 const TQMetaData * const slot_data, int n_slots,
 		 const TQMetaData * const signal_data, int n_signals,
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 		 const TQMetaProperty *const prop_data, int n_props,
 		 const TQMetaEnum *const enum_data, int n_enums,
 #endif
 		 const TQClassInfo *const class_info, int n_info );
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     TQMetaObject( const char * const class_name, TQMetaObject *superclass,
 		 const TQMetaData * const slot_data, int n_slots,
 		 const TQMetaData * const signal_data, int n_signals,
@@ -191,7 +191,7 @@ public:
     const TQClassInfo	*classInfo( int index, bool super = FALSE ) const;
     const char	*classInfo( const char* name, bool super = FALSE ) const;
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     const TQMetaProperty	*property( int index, bool super = FALSE ) const;
     int findProperty( const char *name, bool super = FALSE ) const;
     int indexOfProperty( const TQMetaProperty*, bool super = FALSE ) const;
@@ -207,12 +207,12 @@ public:
     static TQMetaObject	*new_metaobject( const char *, TQMetaObject *,
 					const TQMetaData *const, int,
 					const TQMetaData *const, int,
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 					const TQMetaProperty *const prop_data, int n_props,
 					const TQMetaEnum *const enum_data, int n_enums,
 #endif
 					const TQClassInfo *const  class_info, int n_info );
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     static TQMetaObject	*new_metaobject( const char *, TQMetaObject *,
 					const TQMetaData *const, int,
 					const TQMetaData *const, int,
@@ -242,7 +242,7 @@ private:
     TQMemberDict	*signalDict;			// signal dictionary
     int signaloffset;
     int slotoffset;
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     int propertyoffset;
 public:
     bool tqt_static_property( TQObject* o, int id, int f, TQVariant* v);
@@ -263,7 +263,7 @@ inline int TQMetaObject::slotOffset() const
 inline int TQMetaObject::signalOffset() const
 { return signaloffset; }
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 inline int TQMetaObject::propertyOffset() const
 { return propertyoffset; }
 #endif
diff --git a/src/kernel/ntqmime.h b/src/kernel/ntqmime.h
index 60fdbc247..08b5334b9 100644
--- a/src/kernel/ntqmime.h
+++ b/src/kernel/ntqmime.h
@@ -46,7 +46,7 @@
 #include "ntqmap.h"
 #endif // QT_H
 
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 
 class TQImageDrag;
 class TQTextDrag;
@@ -195,6 +195,6 @@ public:
 
 #endif // Q_WS_MAC
 
-#endif // QT_NO_MIME
+#endif // TQT_NO_MIME
 
 #endif // TQMIME_H
diff --git a/src/kernel/ntqmngio.h b/src/kernel/ntqmngio.h
index 76f5abf69..530a0aa1d 100644
--- a/src/kernel/ntqmngio.h
+++ b/src/kernel/ntqmngio.h
@@ -44,10 +44,10 @@
 #ifndef QT_H
 #endif // QT_H
 
-#ifndef QT_NO_IMAGEIO_MNG
+#ifndef TQT_NO_IMAGEIO_MNG
 
 void qInitMngIO();
 
-#endif // QT_NO_IMAGEIO_MNG
+#endif // TQT_NO_IMAGEIO_MNG
 
 #endif // TQMNGIO_H
diff --git a/src/kernel/ntqmovie.h b/src/kernel/ntqmovie.h
index 9f5238fc7..5c1b5f745 100644
--- a/src/kernel/ntqmovie.h
+++ b/src/kernel/ntqmovie.h
@@ -45,7 +45,7 @@
 #include "ntqpixmap.h" // ### remove or keep for users' convenience?
 #endif // QT_H
 
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
 
 class TQDataSource;
 class TQObject;
@@ -115,6 +115,6 @@ private:
     TQMoviePrivate *d;
 };
 
-#endif	// QT_NO_MOVIE
+#endif	// TQT_NO_MOVIE
 
 #endif
diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h
index 2ac7a4d59..1877d168a 100644
--- a/src/kernel/ntqnetworkprotocol.h
+++ b/src/kernel/ntqnetworkprotocol.h
@@ -48,7 +48,7 @@
 #include "ntqobject.h"
 #endif // QT_H
 
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
 
 #if __GNUC__ - 0 > 3
 #pragma GCC system_header
@@ -243,6 +243,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_NETWORKPROTOCOL
+#endif // TQT_NO_NETWORKPROTOCOL
 
 #endif // TQNETWORKPROTOCOL_H
diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h
index d7e3a17a3..d65fe49df 100644
--- a/src/kernel/ntqobject.h
+++ b/src/kernel/ntqobject.h
@@ -59,7 +59,7 @@ class TQMetaProperty;
 class TQPostEventList;
 class TQSenderObjectList;
 class TQObjectPrivate;
-#ifndef QT_NO_USERDATA
+#ifndef TQT_NO_USERDATA
 class TQObjectUserData;
 #endif
 struct TQUObject;
@@ -146,22 +146,22 @@ public:
     TQStyleControlElementData* controlElementDataObject();
     TQStyleControlElementDataPrivate* controlElementDataPrivateObject();
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     virtual bool setProperty( const char *name, const TQVariant& value );
     virtual TQVariant property( const char *name ) const;
-#endif // QT_NO_PROPERTIES
+#endif // TQT_NO_PROPERTIES
 #ifdef TQT_NO_TRANSLATION
     static TQString tr( const char *sourceText, const char * = 0);
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     static TQString trUtf8( const char *sourceText, const char * = 0);
 #endif
 #endif //TQT_NO_TRANSLATION
 
-#ifndef QT_NO_USERDATA
+#ifndef TQT_NO_USERDATA
     static uint registerUserData();
     void setUserData( uint id, TQObjectUserData* data);
     TQObjectUserData* userData( uint id ) const;
-#endif // QT_NO_USERDATA
+#endif // TQT_NO_USERDATA
 
 signals:
     void	 destroyed();
@@ -244,7 +244,7 @@ private:
 };
 
 
-#ifndef QT_NO_USERDATA
+#ifndef TQT_NO_USERDATA
 class Q_EXPORT TQObjectUserData {
 public:
     virtual ~TQObjectUserData();
@@ -276,7 +276,7 @@ inline bool TQObject::disconnect( const TQObject *receiver, const char *member )
 inline TQString TQObject::tr( const char *sourceText, const char * ) {
     return TQString::fromLatin1( sourceText );
 }
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 inline TQString TQObject::trUtf8( const char *sourceText, const char * ) {
     return TQString::fromUtf8( sourceText );
 }
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h
index 43cd84cfb..4e2fbddfa 100644
--- a/src/kernel/ntqobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.h
@@ -47,7 +47,7 @@
 
 
 #ifndef TQT_NO_TRANSLATION
-# ifndef QT_NO_TEXTCODEC
+# ifndef TQT_NO_TEXTCODEC
 // full set of tr functions
 #  define TQT_TR_FUNCTIONS \
     static TQString tr( const char *, const char * = 0 ); \
@@ -62,7 +62,7 @@
 # define TQT_TR_FUNCTIONS
 #endif
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 # define QT_PROP_FUNCTIONS \
     virtual bool tqt_property( int id, int f, TQVariant* v); \
     static bool tqt_static_property( TQObject* , int, int, TQVariant* );
@@ -90,7 +90,7 @@ struct TQUObject;
 #else
 #define slots					// slots: in class
 #define signals protected			// signals: in class
-#ifndef QT_NO_EMIT
+#ifndef TQT_NO_EMIT
 #define emit					// emit signal
 #endif
 #define TQ_CLASSINFO( name, value )		// class info
diff --git a/src/kernel/ntqpainter.h b/src/kernel/ntqpainter.h
index a86dea4fb..2f95272f3 100644
--- a/src/kernel/ntqpainter.h
+++ b/src/kernel/ntqpainter.h
@@ -136,7 +136,7 @@ public:
     bool	hasViewXForm() const;
     bool	hasWorldXForm() const;
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     void	setViewXForm( bool );		// set xform on/off
     TQRect	window()       const;		// get window
     void	setWindow( const TQRect & );	// set window
@@ -217,7 +217,7 @@ public:
 			     int index=0, int npoints=-1 );
     void	drawConvexPolygon( const TQPointArray &,
 			     int index=0, int npoints=-1 );
-#ifndef QT_NO_BEZIER
+#ifndef TQT_NO_BEZIER
     void	drawCubicBezier( const TQPointArray &, int index=0 );
 #endif
     void	drawPixmap( int x, int y, const TQPixmap &,
@@ -239,7 +239,7 @@ public:
     void	drawTiledPixmap( const TQRect &, const TQPixmap &,
 				 const TQPoint & );
     void	drawTiledPixmap( const TQRect &, const TQPixmap & );
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     void	drawPicture( const TQPicture & );
     void	drawPicture( int x, int y, const TQPicture & );
     void	drawPicture( const TQPoint &, const TQPicture & );
@@ -302,7 +302,7 @@ private:
     void	updateFont();
     void	updatePen();
     void	updateBrush();
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     void	updateXForm();
     void	updateInvXForm();
 #endif
@@ -344,7 +344,7 @@ private:
     bool	block_ext;	// for temporary blocking of external devices
 
     // Transformations
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQCOORD	wx, wy, ww, wh;
     TQCOORD	vx, vy, vw, vh;
     TQWMatrix	wxmat;
@@ -499,7 +499,7 @@ inline const TQPoint &TQPainter::brushOrigin() const
 
 inline bool TQPainter::hasViewXForm() const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     return testf(VxF);
 #else
     return xlatex || xlatey;
@@ -508,7 +508,7 @@ inline bool TQPainter::hasViewXForm() const
 
 inline bool TQPainter::hasWorldXForm() const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     return testf(WxF);
 #else
     return xlatex || xlatey;
@@ -517,7 +517,7 @@ inline bool TQPainter::hasWorldXForm() const
 
 inline double TQPainter::translationX() const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     return worldMatrix().dx();
 #else
     return xlatex;
@@ -526,7 +526,7 @@ inline double TQPainter::translationX() const
 
 inline double TQPainter::translationY() const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     return worldMatrix().dy();
 #else
     return xlatey;
@@ -566,7 +566,7 @@ inline void TQPainter::setBrushOrigin( const TQPoint &p )
     setBrushOrigin( p.x(), p.y() );
 }
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 inline void TQPainter::setWindow( const TQRect &r )
 {
     setWindow( r.x(), r.y(), r.width(), r.height() );
diff --git a/src/kernel/ntqpalette.h b/src/kernel/ntqpalette.h
index 9bffe41bf..274228c4c 100644
--- a/src/kernel/ntqpalette.h
+++ b/src/kernel/ntqpalette.h
@@ -48,7 +48,7 @@
 #include "ntqbrush.h" // TQColor->TQBrush conversion
 #endif // QT_H
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 
 class TQColorGroupPrivate;
 
@@ -177,13 +177,13 @@ private:
   TQColorGroup/TQPalette stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQColorGroup & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQColorGroup & );
 
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPalette & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPalette & );
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
-#endif // QT_NO_PALETTE
+#endif // TQT_NO_PALETTE
 #endif // TQPALETTE_H
diff --git a/src/kernel/ntqpen.h b/src/kernel/ntqpen.h
index dc839dc7e..b3e471f17 100644
--- a/src/kernel/ntqpen.h
+++ b/src/kernel/ntqpen.h
@@ -94,7 +94,7 @@ private:
 /*****************************************************************************
   TQPen stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPen & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPen & );
 #endif
diff --git a/src/kernel/ntqpicture.h b/src/kernel/ntqpicture.h
index 9a76a7b5d..4acbdc33e 100644
--- a/src/kernel/ntqpicture.h
+++ b/src/kernel/ntqpicture.h
@@ -46,7 +46,7 @@
 #include "ntqbuffer.h"
 #endif // QT_H
 
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
 
 class Q_EXPORT TQPicture : public TQPaintDevice		// picture class
 {
@@ -122,6 +122,6 @@ inline const char* TQPicture::data() const
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPicture & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPicture & );
 
-#endif // QT_NO_PICTURE
+#endif // TQT_NO_PICTURE
 
 #endif // TQPICTURE_H
diff --git a/src/kernel/ntqpixmap.h b/src/kernel/ntqpixmap.h
index abf203690..e10988780 100644
--- a/src/kernel/ntqpixmap.h
+++ b/src/kernel/ntqpixmap.h
@@ -68,7 +68,7 @@ public:
     TQPixmap( const TQImage& image );
     TQPixmap( int w, int h,  int depth = -1, Optimization = DefaultOptim );
     TQPixmap( const TQSize &, int depth = -1, Optimization = DefaultOptim );
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     TQPixmap( const TQString& fileName, const char *format=0,
 	     ColorMode mode=Auto );
     TQPixmap( const TQString& fileName, const char *format,
@@ -102,17 +102,17 @@ public:
     bool	selfMask() const;
     bool	hasAlpha() const;
     bool	hasAlphaChannel() const;
-#ifndef QT_NO_IMAGE_HEURISTIC_MASK
+#ifndef TQT_NO_IMAGE_HEURISTIC_MASK
     TQBitmap	createHeuristicMask( bool clipTight = TRUE ) const;
 #endif
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     static TQPixmap fromMimeSource( const TQString& abs_name );
 #endif
     static  TQPixmap grabWindow( WId, int x=0, int y=0, int w=-1, int h=-1 );
     static  TQPixmap grabWidget( TQWidget * widget,
 				int x=0, int y=0, int w=-1, int h=-1 );
 
-#ifndef QT_NO_PIXMAP_TRANSFORMATION
+#ifndef TQT_NO_PIXMAP_TRANSFORMATION
     TQPixmap	    xForm( const TQWMatrix & ) const;
     static TQWMatrix trueMatrix( const TQWMatrix &, int w, int h );
 #endif
@@ -120,7 +120,7 @@ public:
     TQImage	convertToImage() const;
     bool	convertFromImage( const TQImage &, ColorMode mode=Auto );
     bool	convertFromImage( const TQImage &, int conversion_flags );
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     static const char* imageFormat( const TQString &fileName );
     bool	load( const TQString& fileName, const char *format=0,
 		      ColorMode mode=Auto );
@@ -232,7 +232,7 @@ protected:
 #endif
     } *data;
 private:
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
     bool doImageIO( TQImageIO* io, int quality ) const;
 #endif
     TQPixmap( int w, int h, int depth, bool, Optimization );
@@ -329,7 +329,7 @@ inline bool TQPixmap::isMultiCellPixmap() const
   TQPixmap stream functions
  *****************************************************************************/
 
-#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO)
+#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO)
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPixmap & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & );
 #endif
@@ -338,7 +338,7 @@ Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPixmap & );
   TQPixmap (and TQImage) helper functions
  *****************************************************************************/
 
-#ifndef QT_NO_PIXMAP_TRANSFORMATION
+#ifndef TQT_NO_PIXMAP_TRANSFORMATION
 #  define QT_XFORM_TYPE_MSBFIRST 0
 #  define QT_XFORM_TYPE_LSBFIRST 1
 #  if defined(Q_WS_WIN)
diff --git a/src/kernel/ntqpngio.h b/src/kernel/ntqpngio.h
index ce41e7d55..f0a3819a9 100644
--- a/src/kernel/ntqpngio.h
+++ b/src/kernel/ntqpngio.h
@@ -45,7 +45,7 @@
 #include "ntqimage.h"
 #endif // QT_H
 
-#ifndef QT_NO_IMAGEIO_PNG
+#ifndef TQT_NO_IMAGEIO_PNG
 
 void qInitPngIO();
 
@@ -102,6 +102,6 @@ private:
     int alignx;
 };
 
-#endif // QT_NO_IMAGEIO_PNG
+#endif // TQT_NO_IMAGEIO_PNG
 
 #endif // TQPNGIO_H
diff --git a/src/kernel/ntqpoint.h b/src/kernel/ntqpoint.h
index 731683a4c..62b60f3a6 100644
--- a/src/kernel/ntqpoint.h
+++ b/src/kernel/ntqpoint.h
@@ -99,7 +99,7 @@ private:
 /*****************************************************************************
   TQPoint stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPoint & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPoint & );
 #endif
diff --git a/src/kernel/ntqpointarray.h b/src/kernel/ntqpointarray.h
index a0aa8ea74..85c05e534 100644
--- a/src/kernel/ntqpointarray.h
+++ b/src/kernel/ntqpointarray.h
@@ -85,7 +85,7 @@ public:
     void    makeEllipse( int x, int y, int w, int h );
     void    makeArc( int x, int y, int w, int h, int a1, int a2,
 		     const TQWMatrix& );
-#ifndef QT_NO_BEZIER
+#ifndef TQT_NO_BEZIER
     TQPointArray cubicBezier() const;
 #endif
     void*  shortPoints( int index = 0, int nPoints = -1 ) const;
@@ -100,7 +100,7 @@ protected:
 /*****************************************************************************
   TQPointArray stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQPointArray & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQPointArray & );
 #endif
diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h
index a72d3d9cf..bb854be2d 100644
--- a/src/kernel/ntqprinter.h
+++ b/src/kernel/ntqprinter.h
@@ -47,7 +47,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
 
 #if defined(B0)
 #undef B0 // Terminal hang-up.  We assume that you do not want that.
@@ -279,6 +279,6 @@ inline bool TQPrinter::collateCopies() const
 { return usercolcopies; }
 
 
-#endif // QT_NO_PRINTER
+#endif // TQT_NO_PRINTER
 
 #endif // TQPRINTER_H
diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h
index 6dfba30f4..7b243c7ae 100644
--- a/src/kernel/ntqprocess.h
+++ b/src/kernel/ntqprocess.h
@@ -47,7 +47,7 @@
 #include "ntqdir.h"
 #endif // QT_H
 
-#ifndef QT_NO_PROCESS
+#ifndef TQT_NO_PROCESS
 
 class TQProcessPrivate;
 class TQMembuf;
@@ -67,7 +67,7 @@ public:
     void clearArguments();
     virtual void setArguments( const TQStringList& args );
     virtual void addArgument( const TQString& arg );
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
     TQDir workingDirectory() const;
     virtual void setWorkingDirectory( const TQDir& dir );
 #endif
@@ -146,7 +146,7 @@ private slots:
 
 private:
     TQProcessPrivate *d;
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
     TQDir        workingDir;
 #endif
     TQStringList _arguments;
@@ -173,6 +173,6 @@ private:
 #endif
 };
 
-#endif // QT_NO_PROCESS
+#endif // TQT_NO_PROCESS
 
 #endif // TQPROCESS_H
diff --git a/src/kernel/ntqrect.h b/src/kernel/ntqrect.h
index 426c17560..97cc62e80 100644
--- a/src/kernel/ntqrect.h
+++ b/src/kernel/ntqrect.h
@@ -158,7 +158,7 @@ Q_EXPORT bool operator!=( const TQRect &, const TQRect & );
 /*****************************************************************************
   TQRect stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRect & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRect & );
 #endif
diff --git a/src/kernel/ntqregion.h b/src/kernel/ntqregion.h
index 798b33cde..911f085c8 100644
--- a/src/kernel/ntqregion.h
+++ b/src/kernel/ntqregion.h
@@ -107,7 +107,7 @@ public:
     void * handle() const { return data->rgn; }
 #endif
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & );
     friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & );
 #endif
@@ -168,7 +168,7 @@ private:
   TQRegion stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQRegion & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQRegion & );
 #endif
diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h
index d203f951c..e39cd7626 100644
--- a/src/kernel/ntqsessionmanager.h
+++ b/src/kernel/ntqsessionmanager.h
@@ -47,7 +47,7 @@
 #include "ntqstring.h"
 #include "ntqstringlist.h"
 #endif // QT_H
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
 
 class TQSessionManagerData;
 
@@ -95,5 +95,5 @@ private:
     TQSessionManagerData* d;
 };
 
-#endif // QT_NO_SESSIONMANAGER
+#endif // TQT_NO_SESSIONMANAGER
 #endif // TQSESSIONMANAGER_H
diff --git a/src/kernel/ntqsignal.h b/src/kernel/ntqsignal.h
index 8d14385ac..55384f3a7 100644
--- a/src/kernel/ntqsignal.h
+++ b/src/kernel/ntqsignal.h
@@ -63,24 +63,24 @@ public:
 #ifndef TQT_NO_COMPAT
     bool	isBlocked()	 const		{ return TQObject::signalsBlocked(); }
     void	block( bool b )		{ TQObject::blockSignals( b ); }
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     void	setParameter( int value );
     int		parameter() const;
 #endif
 #endif
 
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     void	setValue( const TQVariant &value );
     TQVariant	value() const;
 #endif
 signals:
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     void signal( const TQVariant& );
 #endif
     void intSignal( int );
 
 private:
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     TQVariant val;
 #endif
 private:	// Disabled copy constructor and operator=
diff --git a/src/kernel/ntqsignalmapper.h b/src/kernel/ntqsignalmapper.h
index a7dc9aad0..50cbb29b2 100644
--- a/src/kernel/ntqsignalmapper.h
+++ b/src/kernel/ntqsignalmapper.h
@@ -44,7 +44,7 @@
 #ifndef QT_H
 #include "ntqobject.h"
 #endif // QT_H
-#ifndef QT_NO_SIGNALMAPPER
+#ifndef TQT_NO_SIGNALMAPPER
 class  TQSignalMapperData;
 struct TQSignalMapperRec;
 
@@ -74,5 +74,5 @@ private slots:
     void removeMapping();
 };
 
-#endif // QT_NO_SIGNALMAPPER
+#endif // TQT_NO_SIGNALMAPPER
 #endif // TQSIGNALMAPPER_H
diff --git a/src/kernel/ntqsimplerichtext.h b/src/kernel/ntqsimplerichtext.h
index 928dbb855..8b0a28fe9 100644
--- a/src/kernel/ntqsimplerichtext.h
+++ b/src/kernel/ntqsimplerichtext.h
@@ -47,7 +47,7 @@
 #include "ntqregion.h"
 #endif // QT_H
 
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 
 class TQPainter;
 class TQWidget;
@@ -99,6 +99,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_RICHTEXT
+#endif // TQT_NO_RICHTEXT
 
 #endif // TQSIMPLERICHTEXT_H
diff --git a/src/kernel/ntqsizegrip.h b/src/kernel/ntqsizegrip.h
index c55e9b76a..37a5a337d 100644
--- a/src/kernel/ntqsizegrip.h
+++ b/src/kernel/ntqsizegrip.h
@@ -45,7 +45,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
 
 class Q_EXPORT TQSizeGrip: public TQWidget
 {
@@ -70,5 +70,5 @@ private:
     TQWidget *tlw;
 };
 
-#endif //QT_NO_SIZEGRIP
+#endif //TQT_NO_SIZEGRIP
 #endif
diff --git a/src/kernel/ntqsound.h b/src/kernel/ntqsound.h
index 5c6a41b06..02b2e881c 100644
--- a/src/kernel/ntqsound.h
+++ b/src/kernel/ntqsound.h
@@ -44,7 +44,7 @@
 #include "ntqobject.h"
 #endif // QT_H
 
-#ifndef QT_NO_SOUND
+#ifndef TQT_NO_SOUND
 
 class TQSoundData;
 
@@ -120,6 +120,6 @@ protected:
     int decLoop(TQSound*);
 };
 
-#endif // QT_NO_SOUND
+#endif // TQT_NO_SOUND
 
 #endif
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index 51bf61b1b..c6a3b424d 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -50,7 +50,7 @@
 #endif // QT_H
 
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 
 class TQPopupMenu;
 class TQStylePrivate;
@@ -1239,5 +1239,5 @@ Q_EXPORT TQStyle::ControlElementFlags getControlElementFlagsForObject(const TQOb
 Q_EXPORT TQStringList getObjectTypeListForObject(const TQObject* object);
 Q_EXPORT const TQStyleControlElementData &populateControlElementDataFromWidget(const TQWidget* widget, const TQStyleOption& opt, bool populateReliantFields, bool populateMinimumNumberOfFields);
 
-#endif // QT_NO_STYLE
+#endif // TQT_NO_STYLE
 #endif // TQSTYLE_H
diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h
index 7e13ad2f0..2e91b36ca 100644
--- a/src/kernel/ntqstylesheet.h
+++ b/src/kernel/ntqstylesheet.h
@@ -49,7 +49,7 @@
 #include "ntqobject.h"
 #endif // QT_H
 
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 
 class TQStyleSheet;
 class TQTextDocument;
@@ -201,7 +201,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQValueList &attr,
 				  const TQString& context,
@@ -248,6 +248,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_RICHTEXT
+#endif // TQT_NO_RICHTEXT
 
 #endif // TQSTYLESHEET_H
diff --git a/src/kernel/ntqurl.h b/src/kernel/ntqurl.h
index 5069849fe..7286648f9 100644
--- a/src/kernel/ntqurl.h
+++ b/src/kernel/ntqurl.h
@@ -45,7 +45,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#ifndef QT_NO_URL
+#ifndef TQT_NO_URL
 
 class TQUrlPrivate;
 
@@ -125,6 +125,6 @@ private:
 
 };
 
-#endif //QT_NO_URL
+#endif //TQT_NO_URL
 
 #endif
diff --git a/src/kernel/ntqurloperator.h b/src/kernel/ntqurloperator.h
index 1c1acf262..d7ab440f7 100644
--- a/src/kernel/ntqurloperator.h
+++ b/src/kernel/ntqurloperator.h
@@ -49,7 +49,7 @@
 #include "ntqstringlist.h" // TQString->TQStringList conversion
 #endif // QT_H
 
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
 
 class TQUrlInfo;
 class TQUrlOperatorPrivate;
@@ -124,6 +124,6 @@ private:
     TQUrlOperatorPrivate *d;
 };
 
-#endif // QT_NO_NETWORKPROTOCOL
+#endif // TQT_NO_NETWORKPROTOCOL
 
 #endif // TQURLOPERATOR_H
diff --git a/src/kernel/ntqvariant.h b/src/kernel/ntqvariant.h
index 8a7be5c0e..f794eeb1f 100644
--- a/src/kernel/ntqvariant.h
+++ b/src/kernel/ntqvariant.h
@@ -45,7 +45,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
 class TQString;
 class TQCString;
 class TQFont;
@@ -74,7 +74,7 @@ class TQKeySequence;
 class TQPen;
 // Some headers rejected after TQVariant declaration for GCC 2.7.* compatibility
 class TQVariant;
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 template  class TQValueList;
 template  class TQValueListConstIterator;
 template  class TQValueListNode;
@@ -126,13 +126,13 @@ public:
     TQVariant();
     ~TQVariant();
     TQVariant( const TQVariant& );
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     TQVariant( TQDataStream& s );
 #endif
     TQVariant( const TQString& );
     TQVariant( const TQCString& );
     TQVariant( const char* );
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     TQVariant( const TQStringList& );
 #endif
     TQVariant( const TQFont& );
@@ -155,11 +155,11 @@ public:
     TQVariant( const TQDateTime& );
     TQVariant( const TQByteArray& );
     TQVariant( const TQBitArray& );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQVariant( const TQKeySequence& );
 #endif
     TQVariant( const TQPen& );
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     TQVariant( const TQValueList& );
     TQVariant( const TQMap& );
 #endif
@@ -189,7 +189,7 @@ public:
 
     const TQString toString() const;
     const TQCString toCString() const;
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     const TQStringList toStringList() const;
 #endif
     const TQFont toFont() const;
@@ -212,7 +212,7 @@ public:
     const TQDateTime toDateTime() const;
     const TQByteArray toByteArray() const;
     const TQBitArray toBitArray() const;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     const TQKeySequence toKeySequence() const;
 #endif
     const TQPen toPen() const;
@@ -222,13 +222,13 @@ public:
     TQ_ULLONG toULongLong( bool * ok=0 ) const;
     bool toBool() const;
     double toDouble( bool * ok=0 ) const;
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     const TQValueList toList() const;
     const TQMap toMap() const;
 #endif
     TQSizePolicy toSizePolicy() const;
 
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     TQValueListConstIterator stringListBegin() const;
     TQValueListConstIterator stringListEnd() const;
     TQValueListConstIterator listBegin() const;
@@ -239,7 +239,7 @@ public:
 #endif
     TQString& asString();
     TQCString& asCString();
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     TQStringList& asStringList();
 #endif
     TQFont& asFont();
@@ -262,7 +262,7 @@ public:
     TQDateTime& asDateTime();
     TQByteArray& asByteArray();
     TQBitArray& asBitArray();
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQKeySequence& asKeySequence();
 #endif
     TQPen& asPen();
@@ -272,13 +272,13 @@ public:
     TQ_ULLONG& asULongLong();
     bool& asBool();
     double& asDouble();
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     TQValueList& asList();
     TQMap& asMap();
 #endif
     TQSizePolicy& asSizePolicy();
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     void load( TQDataStream& );
     void save( TQDataStream& ) const;
 #endif
@@ -334,7 +334,7 @@ inline bool TQVariant::isValid() const
     return (d->typ != Invalid);
 }
 
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 inline TQValueListConstIterator TQVariant::stringListBegin() const
 {
     if ( d->typ != StringList )
@@ -385,12 +385,12 @@ inline TQMapConstIterator TQVariant::mapFind( const TQString
 }
 #endif
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant& p );
 Q_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant& p );
 Q_EXPORT TQDataStream& operator>> ( TQDataStream& s, TQVariant::Type& p );
 Q_EXPORT TQDataStream& operator<< ( TQDataStream& s, const TQVariant::Type p );
 #endif
 
-#endif //QT_NO_VARIANT
+#endif //TQT_NO_VARIANT
 #endif // TQVARIANT_H
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index 2dbb6701d..b6c261cca 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -52,7 +52,7 @@
 #include "ntqsizepolicy.h"
 #endif // QT_H
 
-#if defined(Q_WS_X11) && !defined(QT_NO_IM)
+#if defined(Q_WS_X11) && !defined(TQT_NO_IM)
 class TQInputContext;
 #endif
 
@@ -107,11 +107,11 @@ class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice
     TQ_PROPERTY( bool ownPalette READ ownPalette )
     TQ_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont )
     TQ_PROPERTY( bool ownFont READ ownFont )
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     TQ_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor )
     TQ_PROPERTY( bool ownCursor READ ownCursor )
 #endif
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     TQ_PROPERTY( TQString caption READ caption WRITE setCaption )
     TQ_PROPERTY( TQPixmap icon READ icon WRITE setIcon )
     TQ_PROPERTY( TQString iconText READ iconText WRITE setIconText )
@@ -145,7 +145,7 @@ public:
 
     WId		 winId() const;
     void	 setName( const char *name );
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     // GUI style setting
 
     TQStyle     &style() const;
@@ -236,7 +236,7 @@ public:
     const TQPixmap *	erasePixmap() const;
     virtual void	setErasePixmap( const TQPixmap & );
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     const TQColorGroup & colorGroup() const;
     const TQPalette &	palette()    const;
     bool		ownPalette() const;
@@ -262,13 +262,13 @@ public:
     TQFontMetrics	fontMetrics() const;
     TQFontInfo	 	fontInfo() const;
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     const TQCursor      &cursor() const;
     bool		ownCursor() const;
     virtual void	setCursor( const TQCursor & );
     virtual void	unsetCursor();
 #endif
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     TQString		caption() const;
     const TQPixmap      *icon() const;
     TQString		iconText() const;
@@ -286,7 +286,7 @@ public:
     virtual void	setBackgroundPixmap( const TQPixmap & ); // obsolete, use setErasePixmap()
 
 public slots:
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     virtual void	setCaption( const TQString &);
     virtual void	setIcon( const TQPixmap & );
     virtual void	setIconText( const TQString &);
@@ -323,7 +323,7 @@ public:
     // Grab functions
 
     void		grabMouse();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     void		grabMouse( const TQCursor & );
 #endif
     void		releaseMouse();
@@ -406,7 +406,7 @@ public slots:
     virtual void  	adjustSize();
 
 public:
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
     TQLayout *		layout() const { return lay_out; }
 #endif
     void		updateGeometry();
@@ -499,7 +499,7 @@ protected:
     virtual void mouseReleaseEvent( TQMouseEvent * );
     virtual void mouseDoubleClickEvent( TQMouseEvent * );
     virtual void mouseMoveEvent( TQMouseEvent * );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     virtual void wheelEvent( TQWheelEvent * );
 #endif
     virtual void keyPressEvent( TQKeyEvent * );
@@ -518,7 +518,7 @@ protected:
     virtual void imEndEvent( TQIMEvent * );
     virtual void tabletEvent( TQTabletEvent * );
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     virtual void dragEnterEvent( TQDragEnterEvent * );
     virtual void dragMoveEvent( TQDragMoveEvent * );
     virtual void dragLeaveEvent( TQDragLeaveEvent * );
@@ -547,11 +547,11 @@ protected:
 
     // Misc. protected functions
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     virtual void styleChange( TQStyle& );
 #endif
     virtual void enabledChange( bool oldEnabled );
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     virtual void paletteChange( const TQPalette & );
 #endif
     virtual void fontChange( const TQFont & );
@@ -560,7 +560,7 @@ protected:
     int		 metric( int )	const;
 
 #if defined(Q_WS_X11)
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM_EXTENSIONS)
     virtual TQWidget *icHolderWidget();
 #else
     TQWidget *icHolderWidget();
@@ -614,7 +614,7 @@ private:
     void	 unfocusInputContext();
     void	 checkChildrenDnd();
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
     void        createSyncCounter();
     void        destroySyncCounter();
     void        incrementSyncCounter();
@@ -640,7 +640,7 @@ private:
     friend class TQDragManager;
 #endif
 
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
     void 	 setLayout( TQLayout *l );
 #endif
     void	 setWinId( WId );
@@ -689,14 +689,14 @@ private:
     uint		im_enabled : 1;
     TQRect		crect;
     TQColor		bg_col;
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     TQPalette	 pal;
 #endif
     TQFont	 fnt;
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
     TQLayout 	*lay_out;
 #endif
-#if defined(Q_WS_X11) && !defined(QT_NO_IM) && !defined(QT_NO_IM_EXTENSIONS)
+#if defined(Q_WS_X11) && !defined(TQT_NO_IM) && !defined(TQT_NO_IM_EXTENSIONS)
     TQInputContext *ic;				// Input Context
 #endif
     TQWExtra	*extra;
@@ -721,7 +721,7 @@ private:
     TQRegion paintableRegion() const;
 
     void updateGraphicsContext( TQGfx *qgfx_qws, bool clip_children ) const;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     void updateCursor( const TQRegion &r ) const;
 #endif
 
@@ -753,7 +753,7 @@ private:	// Disabled copy constructor and operator=
 #endif
 
 public: // obsolete functions to dissappear or to become inline in 3.0
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     void setPalette( const TQPalette &p, bool ) { setPalette( p ); }
 #endif
     void setFont( const TQFont &f, bool ) { setFont( f ); }
@@ -835,7 +835,7 @@ inline void TQWidget::setBaseSize( const TQSize &s )
 inline const TQColor &TQWidget::eraseColor() const
 { return bg_col; }
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 inline const TQPalette &TQWidget::palette() const
 { return pal; }
 #endif
@@ -951,7 +951,7 @@ inline void TQWidget::constPolish() const
         that->setWState(WState_Polished); // be on the safe side...
     }
 }
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 inline bool TQWidget::ownCursor() const
 {
     return testWState( WState_OwnCursor );
@@ -961,7 +961,7 @@ inline bool TQWidget::ownFont() const
 {
     return own_font;
 }
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 inline bool TQWidget::ownPalette() const
 {
     return own_palette;
@@ -992,7 +992,7 @@ class TQMacDndExtra;
 #endif
 
 struct Q_EXPORT TQTLWExtra {
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     TQString  caption;				// widget caption
     TQString  iconText;				// widget icon text
     TQPixmap *icon;				// widget icon
@@ -1015,10 +1015,10 @@ struct Q_EXPORT TQTLWExtra {
     uint     dnd : 1;				// DND properties installed
     uint     uspos : 1;				// User defined position
     uint     ussize : 1;			// User defined size
-#if defined(QT_NO_IM_EXTENSIONS)
+#if defined(TQT_NO_IM_EXTENSIONS)
     void    *xic;				// Input Context
 #endif
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
     ulong    syncCounter;
     uint     syncRequestValue[2];
 #endif
@@ -1028,7 +1028,7 @@ struct Q_EXPORT TQTLWExtra {
     uint     is_moved: 1;
     uint     resizer : 4;
 #endif
-#if defined(Q_WS_QWS) && !defined ( QT_NO_QWS_MANAGER )
+#if defined(Q_WS_QWS) && !defined ( TQT_NO_QWS_MANAGER )
     TQRegion decor_allocated_region;		// decoration allocated region
     TQWSManager *qwsManager;
 #endif
@@ -1051,7 +1051,7 @@ struct Q_EXPORT TQWExtra {
     TQ_INT16  maxw, maxh;			// maximum size
     TQPixmap *bg_pix;				// background pixmap
     TQWidget *focus_proxy;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     TQCursor *curs;
 #endif
     TQTLWExtra *topextra;			// only useful for TLWs
@@ -1082,7 +1082,7 @@ struct Q_EXPORT TQWExtra {
 #endif
     char     bg_mode;				// background mode
     char     bg_mode_visual;			// visual background mode
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     TQStyle* style;
 #endif
     TQRect micro_focus_hint;			// micro focus hint
diff --git a/src/kernel/ntqwmatrix.h b/src/kernel/ntqwmatrix.h
index bb3042f3d..f4e6c9bfb 100644
--- a/src/kernel/ntqwmatrix.h
+++ b/src/kernel/ntqwmatrix.h
@@ -48,7 +48,7 @@
 #include "ntqregion.h"
 #endif // QT_H
 
-#ifndef QT_NO_WMATRIX
+#ifndef TQT_NO_WMATRIX
 
 
 class Q_EXPORT TQWMatrix					// 2D transform matrix
@@ -124,6 +124,6 @@ Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQWMatrix & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQWMatrix & );
 
 
-#endif // QT_NO_WMATRIX
+#endif // TQT_NO_WMATRIX
 
 #endif // TQWMATRIX_H
diff --git a/src/kernel/qabstractlayout.cpp b/src/kernel/qabstractlayout.cpp
index 69cee62fd..f11611f92 100644
--- a/src/kernel/qabstractlayout.cpp
+++ b/src/kernel/qabstractlayout.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqlayout.h"
 
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 #include "ntqapplication.h"
 #include "qlayoutengine_p.h"
 #include "ntqmenubar.h"
@@ -48,7 +48,7 @@
 
 static int menuBarHeightForWidth( TQMenuBar *menubar, int w )
 {
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     if ( menubar && !menubar->isHidden() && !menubar->isTopLevel() )
 	return menubar->heightForWidth( TQMAX(w, menubar->minimumWidth()) );
     else
@@ -636,7 +636,7 @@ void TQLayout::init()
     autoMinimum = FALSE;
     autoResizeMode = TRUE;
     extraData = 0;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     menubar = 0;
 #endif
 }
@@ -858,7 +858,7 @@ bool TQLayout::eventFilter( TQObject *o, TQEvent *e )
 	if ( activated ) {
 	    TQResizeEvent *r = (TQResizeEvent *)e;
 	    int mbh = 0;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
 	    mbh = menuBarHeightForWidth( menubar, r->size().width() );
 #endif
 	    int b = marginImpl ? 0 : outsideBorder;
@@ -873,7 +873,7 @@ bool TQLayout::eventFilter( TQObject *o, TQEvent *e )
 	    TQChildEvent *c = (TQChildEvent *)e;
 	    if ( c->child()->isWidgetType() ) {
 		TQWidget *w = (TQWidget *)c->child();
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
 		if ( w == menubar )
 		    menubar = 0;
 #endif
@@ -890,7 +890,7 @@ bool TQLayout::eventFilter( TQObject *o, TQEvent *e )
 	    if ( c->child()->isWidgetType() ) {
 		TQWidget *w = (TQWidget *)c->child();
 		if ( !w->isTopLevel() ) {
-#if !defined(QT_NO_MENUBAR) && !defined(QT_NO_TOOLBAR)
+#if !defined(TQT_NO_MENUBAR) && !defined(TQT_NO_TOOLBAR)
 		    if ( ::tqt_cast(w) && !::tqt_cast(w->parentWidget()) )
 			menubar = (TQMenuBar *)w;
 		    else
@@ -949,7 +949,7 @@ int TQLayout::totalHeightForWidth( int w ) const
     }
     int b = ( topLevel && !marginImpl ) ? 2 * outsideBorder : 0;
     int h = heightForWidth( w - b ) + b;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     h += menuBarHeightForWidth( menubar, w );
 #endif
     return h;
@@ -970,7 +970,7 @@ TQSize TQLayout::totalMinimumSize() const
 
     TQSize s = minimumSize();
     int h = b;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     h += menuBarHeightForWidth( menubar, s.width() );
 #endif
     return s + TQSize( b, h );
@@ -993,7 +993,7 @@ TQSize TQLayout::totalSizeHint() const
     if ( hasHeightForWidth() )
 	s.setHeight( heightForWidth(s.width()) );
     int h = b;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     h += menuBarHeightForWidth( menubar, s.width() );
 #endif
     return s + TQSize( b, h );
@@ -1015,7 +1015,7 @@ TQSize TQLayout::totalMaximumSize() const
 
     TQSize s = maximumSize();
     int h = b;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     h += menuBarHeightForWidth( menubar, s.width() );
 #endif
 
@@ -1103,7 +1103,7 @@ void TQLayout::freeze( int w, int h )
     }
 }
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
 
 /*!
     Makes the geometry manager take account of the menu bar \a w. All
@@ -1198,7 +1198,7 @@ bool TQLayout::activate()
     TQSize s = mw->size();
     TQSize ms;
     int mbh = 0;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     mbh = menuBarHeightForWidth( menubar, s.width() );
 #endif
     int b = marginImpl ? 0 : outsideBorder;
@@ -1942,4 +1942,4 @@ void TQLayout::propagateSpacing( TQLayout *parent )
     }
 }
 
-#endif // QT_NO_LAYOUT
+#endif // TQT_NO_LAYOUT
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 3acc3da57..a5c344ed4 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqaccel.h"
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 #include "ntqsignal.h"
 #include "ntqapplication.h"
@@ -228,7 +228,7 @@ bool TQAccelManager::correctSubWindow( TQWidget* w, TQAccelPrivate* d ) {
 
     /* if we live in a floating dock window, keep our parent's
      * accelerators working */
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
     if ( tlw->isDialog() && tlw->parentWidget() && ::tqt_cast(tlw) )
 	return tlw->parentWidget()->topLevelWidget() == wtlw;
 
@@ -391,7 +391,7 @@ bool TQAccelManager::tryComposeUnicode( TQWidget* w, TQKeyEvent* e )
 */
 bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e )
 {
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
     // Needs to be declared and used here because of "goto doclash"
     TQStatusBar* mainStatusBar = 0;
 #endif
@@ -459,12 +459,12 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e )
 	pe = TQKeyEvent( TQEvent::Accel, pe.key(), pe.ascii(), pe.state()&~TQt::ShiftButton, pe.text() );
     } while ( hasShift-- && !matchFound && !identicalDisabled );
 
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
     mainStatusBar = (TQStatusBar*) w->topLevelWidget()->child( 0, "TQStatusBar" );
 #endif
     if ( n < 0 ) { // no match found
 	currentState = partial.count() ? PartialMatch : NoMatch;
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
 	// Only display message if we are, or were, in a partial match
 	if ( mainStatusBar && (PartialMatch == currentState || intermediate.count() ) ) {
 	    if ( currentState == TQt::PartialMatch ) {
@@ -489,7 +489,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e )
 	return eatKey;
     } else if ( n == 0 ) { // found exactly one match
 	clash = -1; // reset
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
 	if ( currentState == TQt::PartialMatch && mainStatusBar )
 		mainStatusBar->clear();
 #endif
@@ -501,7 +501,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e )
     }
 
  doclash: // found more than one match
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
     if ( !mainStatusBar ) // if "goto doclash", we need to get statusbar again.
 	mainStatusBar = (TQStatusBar*) w->topLevelWidget()->child( 0, "TQStatusBar" );
 #endif
@@ -511,7 +511,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e )
 	intermediate = TQKeySequence();
 	currentState = TQt::NoMatch; // Free sequence keylock
 	clash++;
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
 	if ( mainStatusBar &&
 	     !lastitem->signal &&
 	     !(lastaccel->parent->receivers( "activatedAmbiguously(int)" )) )
@@ -522,7 +522,7 @@ bool TQAccelManager::dispatchAccelEvent( TQWidget* w, TQKeyEvent* e )
 	intermediate = TQKeySequence();
 	currentState = TQt::NoMatch; // Free sequence keylock
 	clash = 0;
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
 	if ( mainStatusBar &&
 	     !firstitem->signal &&
 	     !(firstaccel->parent->receivers( "activatedAmbiguously(int)" )) )
@@ -827,7 +827,7 @@ bool TQAccel::disconnectItem( int id, const TQObject *receiver,
 
 void TQAccelPrivate::activate( TQAccelItem* item )
 {
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
     if ( TQWhatsThis::inWhatsThisMode() && !ignorewhatsthis ) {
 	TQWhatsThis::leaveWhatsThisMode( item->whatsthis );
 	return;
@@ -1086,4 +1086,4 @@ to help. Ask them for ISBN 1859121047.
 void TQAccel::repairEventFilter() {}
 /*! \obsolete	serves no purpose anymore */
 bool TQAccel::eventFilter( TQObject *, TQEvent * ) { return FALSE; }
-#endif // QT_NO_ACCEL
+#endif // TQT_NO_ACCEL
diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index 146659572..36c2ddea5 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -331,12 +331,12 @@ TQStyle   *TQApplication::app_style      = 0;	// default application style
 bool      tqt_explicit_app_style	       = FALSE; // style explicitly set by programmer
 
 int	  TQApplication::app_cspec      = TQApplication::NormalColor;
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 TQPalette *TQApplication::app_pal	       = 0;	// default application palette
 #endif
 TQFont	 *TQApplication::app_font       = 0;	// default application font
 bool	  tqt_app_has_font	       = FALSE;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 TQCursor	 *TQApplication::app_cursor     = 0;	// default application cursor
 #endif
 int	  TQApplication::app_tracking   = 0;	// global mouse tracking
@@ -349,7 +349,7 @@ TQWidget	 *TQApplication::active_window  = 0;	// toplevel with keyboard focus
 bool	  TQApplication::obey_desktop_settings = TRUE;	// use winsys resources
 int	  TQApplication::cursor_flash_time = 1000;	// text caret flash time
 int	  TQApplication::mouse_double_click_time = 400;	// mouse dbl click limit
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 int	  TQApplication::wheel_scroll_lines = 3;		// number of lines to scroll
 #endif
 bool	  tqt_is_gui_used;
@@ -369,7 +369,7 @@ bool	  TQApplication::fade_tooltip	= FALSE;
 bool	  TQApplication::animate_toolbox	= FALSE;
 bool	  TQApplication::widgetCount	= FALSE;
 TQApplication::Type tqt_appType=TQApplication::Tty;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 TQStringList *TQApplication::app_libpaths = 0;
 #endif
 bool	  TQApplication::metaComposeUnicode = FALSE;
@@ -410,7 +410,7 @@ TQEventLoop* TQApplication::currentEventLoop() {
 }
 #endif
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 extern bool tqt_dispatchAccelEvent( TQWidget*, TQKeyEvent* ); // def in qaccel.cpp
 extern bool tqt_tryComposeUnicode( TQWidget*, TQKeyEvent* ); // def in qaccel.cpp
 #endif
@@ -530,13 +530,13 @@ Q_EXPORT void tqRemovePostRoutine( TQtCleanUpFunction p )
 TQAsciiDict *TQApplication::app_palettes = 0;
 TQAsciiDict    *TQApplication::app_fonts = 0;
 
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
 TQString *TQApplication::session_key = 0;		// ## session key. Should be a member in 4.0
 #endif
 TQWidgetList *TQApplication::popupWidgets = 0;	// has keyboard input focus
 
 TQDesktopWidget *tqt_desktopWidget = 0;		// root window widgets
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 TQClipboard	      *tqt_clipboard = 0;	// global clipboard object
 #endif
 TQWidgetList * tqt_modal_stack=0;		// stack of modal widgets
@@ -617,7 +617,7 @@ uint qGlobalPostedEventsCount()
 
 static TQSingleCleanupHandler qapp_cleanup_events;
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 TQPalette *tqt_std_pal = 0;
 
 void tqt_create_std_palette()
@@ -675,7 +675,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
 	} else if ( qstrcmp(arg,"-style") == 0 && i < argc-1 ) {
 	    s = argv[++i];
 	    s = s.lower();
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
 	} else if ( qstrcmp(arg,"-session") == 0 && i < argc-1 ) {
 	    TQCString s = argv[++i];
 	    if ( !s.isEmpty() ) {
@@ -697,7 +697,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
 	} else {
 	    argv[j++] = argv[i];
 	}
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 	if ( !s.isEmpty() ) {
 	    setStyle( s );
 	}
@@ -733,7 +733,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
   to process command line arguments.
 
   TQt debugging options (not available if TQt was compiled with the
-  QT_NO_DEBUG flag defined):
+  TQT_NO_DEBUG flag defined):
   \list
   \i -nograb, tells TQt that it must never grab the mouse or the keyboard.
   \i -dograb (only under X11), running under a debugger can cause
@@ -1053,7 +1053,7 @@ void TQApplication::init_precmdline()
 {
     translators = 0;
     is_app_closing = FALSE;
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
     is_session_restored = FALSE;
 #endif
 #if defined(QT_CHECK_STATE)
@@ -1085,12 +1085,12 @@ void TQApplication::initialize( int argc, char **argv, bool enable_sm )
     quit_now = FALSE;
     quit_code = 0;
     TQWidget::createMapper(); // create widget mapper
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     (void) palette();  // trigger creation of application palette
 #endif
     is_app_running = TRUE; // no longer starting up
 
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
     if (enable_sm) {
 	// connect to the session manager
 	if ( !session_key )
@@ -1157,7 +1157,7 @@ TQWidget *TQApplication::activeModalWidget()
 
 TQApplication::~TQApplication()
 {
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     // flush clipboard contents
     if ( tqt_clipboard ) {
 	TQCustomEvent event( TQEvent::Clipboard );
@@ -1185,12 +1185,12 @@ TQApplication::~TQApplication()
     tqt_desktopWidget = 0;
     is_app_closing = TRUE;
 
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     delete tqt_clipboard;
     tqt_clipboard = 0;
 #endif
     TQWidget::destroyMapper();
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     delete tqt_std_pal;
     tqt_std_pal = 0;
     delete app_pal;
@@ -1202,11 +1202,11 @@ TQApplication::~TQApplication()
     app_font = 0;
     delete app_fonts;
     app_fonts = 0;
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     delete app_style;
     app_style = 0;
 #endif
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     delete app_cursor;
     app_cursor = 0;
 #endif
@@ -1214,14 +1214,14 @@ TQApplication::~TQApplication()
     delete translators;
 #endif
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     extern TQDragManager *qt_dnd_manager;
     delete qt_dnd_manager;
 #endif
 
     tqt_cleanup();
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     delete app_libpaths;
     app_libpaths = 0;
 #endif
@@ -1243,7 +1243,7 @@ TQApplication::~TQApplication()
     if ( widgetCount ) {
 	tqDebug( "Widgets left: %i    Max widgets: %i \n", TQWidget::instanceCounter, TQWidget::maxInstances );
     }
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
     if ( session_manager ) {
 	delete session_manager;
     }
@@ -1252,7 +1252,7 @@ TQApplication::~TQApplication()
 	delete session_key;
     }
     session_key = 0;
-#endif //QT_NO_SESSIONMANAGER
+#endif //TQT_NO_SESSIONMANAGER
 
 #ifdef TQT_THREAD_SUPPORT
     delete tqt_sharedMetaObjectMutex;
@@ -1271,7 +1271,7 @@ TQApplication::~TQApplication()
     obey_desktop_settings = TRUE;
     cursor_flash_time = 1000;
     mouse_double_click_time = 400;
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     wheel_scroll_lines = 3;
 #endif
     drag_time = 500;
@@ -1349,7 +1349,7 @@ TQApplication::~TQApplication()
 */
 
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 
 static TQString *qt_style_override = 0;
 
@@ -1360,7 +1360,7 @@ static TQString *qt_style_override = 0;
 */
 TQStyle& TQApplication::style()
 {
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     if ( app_style )
 	return *app_style;
     if ( !tqt_is_gui_used )
@@ -1408,7 +1408,7 @@ TQStyle& TQApplication::style()
 	     !(app_style = TQStyleFactory::create( "Aqua" ) ) &&
 	     !(app_style = TQStyleFactory::create( "SGI" ) ) &&
 	     !(app_style = TQStyleFactory::create( "Compact" ) )
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 	    && !(app_style = TQStyleFactory::create( TQStyleFactory::keys()[0]  ) )
 #endif
 	)
@@ -1699,7 +1699,7 @@ void TQApplication::setGlobalStrut( const TQSize& strut )
 extern const char *tqAppFileName();
 #endif
 
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 #ifndef Q_WS_WIN
 static TQString resolveSymlinks( const TQString& path, int depth = 0 )
 {
@@ -1840,9 +1840,9 @@ TQString TQApplication::applicationFilePath()
     }
 #endif
 }
-#endif // QT_NO_DIR
+#endif // TQT_NO_DIR
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 /*!
   Returns a list of paths that the application will search when
@@ -1953,7 +1953,7 @@ void TQApplication::removeLibraryPath( const TQString &path )
     if ( app_libpaths->contains( path ) )
 	app_libpaths->remove( path );
 }
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
 /*!
   Returns the application palette.
@@ -1967,7 +1967,7 @@ void TQApplication::removeLibraryPath( const TQString &path )
 
   \sa setPalette(), TQWidget::palette()
 */
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 TQPalette TQApplication::palette(const TQWidget* w)
 {
 #if defined(QT_CHECK_STATE)
@@ -2051,7 +2051,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets,
 {
     TQPalette pal = palette;
     TQPalette *oldpal = 0;
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     if ( !startingUp() ) // on startup this has been done already
 	tqApp->style().polish( pal );	// NB: non-const reference
 #endif
@@ -2090,7 +2090,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets,
     }
 }
 
-#endif // QT_NO_PALETTE
+#endif // TQT_NO_PALETTE
 
 /*!
   Returns the default font for the widget \a w, or the default
@@ -2196,7 +2196,7 @@ void TQApplication::setFont( const TQFont &font, bool informWidgets,
 
 void TQApplication::polish( TQWidget *w )
 {
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     w->style().polish( w );
 #endif
 }
@@ -2387,9 +2387,9 @@ void TQApplication::closeAllWindows()
 */
 void TQApplication::aboutTQt()
 {
-#ifndef QT_NO_MESSAGEBOX
+#ifndef TQT_NO_MESSAGEBOX
     TQMessageBox::aboutTQt( mainWidget() );
-#endif // QT_NO_MESSAGEBOX
+#endif // TQT_NO_MESSAGEBOX
 }
 
 
@@ -2558,7 +2558,7 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e )
 	res = internalNotify( receiver, e );
     }
     else switch ( e->type() ) {
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     case TQEvent::Accel:
 	{
 	    TQKeyEvent* key = (TQKeyEvent*) e;
@@ -2575,14 +2575,14 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e )
 	    }
 	}
     break;
-#endif //QT_NO_ACCEL
+#endif //TQT_NO_ACCEL
     case TQEvent::KeyPress:
     case TQEvent::KeyRelease:
     case TQEvent::AccelOverride:
 	{
 	    TQWidget* w = (TQWidget*)receiver;
 	    TQKeyEvent* key = (TQKeyEvent*) e;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	    if ( tqt_tryComposeUnicode( w, key ) )
 		break;
 #endif
@@ -2635,7 +2635,7 @@ bool TQApplication::notify( TQObject *receiver, TQEvent *e )
 		mouse->ignore();
 	}
     break;
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     case TQEvent::Wheel:
 	{
 	    if ( e->spontaneous() ) {
@@ -2833,7 +2833,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e)
 		handled = TRUE;
 		consumed = TRUE;
 		break;
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 	    case TQEvent::DragEnter:
 	    case TQEvent::DragMove:
 		( (TQDragMoveEvent*) e)->ignore();
@@ -2850,7 +2850,7 @@ bool TQApplication::internalNotify( TQObject *receiver, TQEvent * e)
 		handled = TRUE;
 		break;
 #endif
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 	    case TQEvent::Wheel:
 		( (TQWheelEvent*) e)->ignore();
 		handled = TRUE;
@@ -3238,7 +3238,7 @@ void TQApplication::removeTranslator( TQTranslator * mf )
     }
 }
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 /*! \obsolete
   This is the same as TQTextCodec::setCodecForTr().
 */
@@ -3254,7 +3254,7 @@ TQTextCodec* TQApplication::defaultCodec() const
 {
     return TQTextCodec::codecForTr();
 }
-#endif //QT_NO_TEXTCODEC
+#endif //TQT_NO_TEXTCODEC
 
 /*! \enum TQApplication::Encoding
 
@@ -3322,7 +3322,7 @@ TQString TQApplication::translate( const char * context, const char * sourceText
 		return result;
 	}
     }
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( encoding == UnicodeUTF8 )
 	return TQString::fromUtf8( sourceText );
     else if ( TQTextCodec::codecForTr() != 0 )
@@ -3426,7 +3426,7 @@ void TQApplication::postEvent( TQObject *receiver, TQEvent *event )
 	};
     }
 
-#if !defined(QT_NO_IM)
+#if !defined(TQT_NO_IM)
     // if this is one of the compressible IM events, do compression
     else if ( event->type() == TQEvent::IMCompose ) {
 	l->last();
@@ -3734,7 +3734,7 @@ void TQApplication::removePostedEvent( TQEvent *  event )
 	    case TQEvent::MouseMove:
 		n = "MouseMove";
 		break;
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 	    case TQEvent::Wheel:
 		n = "Wheel";
 		break;
@@ -3862,7 +3862,7 @@ void TQApplication::setActiveWindow( TQWidget* act )
     // first the activation/deactivation events
     if ( active_window ) {
 	TQWidgetList deacts;
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 	if ( style().styleHint(TQStyle::SH_Widget_ShareActivation, active_window ) ) {
 	    TQWidgetList *list = topLevelWidgets();
 	    if ( list ) {
@@ -3885,7 +3885,7 @@ void TQApplication::setActiveWindow( TQWidget* act )
     if ( active_window ) {
 	TQEvent e( TQEvent::WindowActivate );
 	TQWidgetList acts;
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 	if ( style().styleHint(TQStyle::SH_Widget_ShareActivation, active_window ) ) {
 	    TQWidgetList *list = topLevelWidgets();
 	    if ( list ) {
@@ -4096,7 +4096,7 @@ TQDesktopWidget *TQApplication::desktop()
     return tqt_desktopWidget;
 }
 
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 /*!
   Returns a pointer to the application global clipboard.
 */
@@ -4108,7 +4108,7 @@ TQClipboard *TQApplication::clipboard()
     }
     return tqt_clipboard;
 }
-#endif // QT_NO_CLIPBOARD
+#endif // TQT_NO_CLIPBOARD
 
 /*!
   By default, TQt will try to use the current standard colors, fonts
@@ -4283,7 +4283,7 @@ bool TQApplication::tryLock()
 
   \sa isSessionRestored(), sessionId(), saveState(), \link session.html the Session Management overview\endlink
 */
-#ifndef QT_NO_SESSIONMANAGER
+#ifndef TQT_NO_SESSIONMANAGER
 void TQApplication::commitData( TQSessionManager& sm  )
 {
 
@@ -4345,7 +4345,7 @@ void TQApplication::commitData( TQSessionManager& sm  )
 void TQApplication::saveState( TQSessionManager& /* sm */ )
 {
 }
-#endif //QT_NO_SESSIONMANAGER
+#endif //TQT_NO_SESSIONMANAGER
 /*!
   Sets the time after which a drag should start to \a ms ms.
 
@@ -4807,8 +4807,8 @@ void MyApplication::commitData( TQSessionManager& sm ) {
 /*****************************************************************************
   Stubbed session management support
  *****************************************************************************/
-#ifndef QT_NO_SESSIONMANAGER
-#if defined( QT_NO_SM_SUPPORT ) || defined( Q_WS_WIN ) || defined( Q_WS_MAC ) || defined( Q_WS_QWS )
+#ifndef TQT_NO_SESSIONMANAGER
+#if defined( TQT_NO_SM_SUPPORT ) || defined( Q_WS_WIN ) || defined( Q_WS_MAC ) || defined( Q_WS_QWS )
 
 class TQSessionManagerData
 {
@@ -4932,5 +4932,5 @@ void TQSessionManager::requestPhase2()
 {
 }
 
-#endif // QT_NO_SM_SUPPORT
-#endif //QT_NO_SESSIONMANAGER
+#endif // TQT_NO_SM_SUPPORT
+#endif //TQT_NO_SESSIONMANAGER
diff --git a/src/kernel/qapplication_p.h b/src/kernel/qapplication_p.h
index 766a8c405..c0c59d59e 100644
--- a/src/kernel/qapplication_p.h
+++ b/src/kernel/qapplication_p.h
@@ -70,7 +70,7 @@ extern Q_EXPORT void tqt_enter_modal( TQWidget* );
 extern Q_EXPORT void tqt_leave_modal( TQWidget* );
 
 extern bool tqt_is_gui_used;
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 extern TQClipboard *tqt_clipboard;
 #endif
 
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 08402bb1d..23d5969a1 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -89,9 +89,9 @@
 #include "ntqfileinfo.h"
 
 // Input method stuff - UNFINISHED
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 #include "ntqinputcontext.h"
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 #include "qinternal_p.h" // shared double buffer cleanup
 
 #if defined(TQT_THREAD_SUPPORT)
@@ -104,7 +104,7 @@
 
 #include "qt_x11_p.h"
 
-#if !defined(QT_NO_XFTFREETYPE)
+#if !defined(TQT_NO_XFTFREETYPE)
 // XFree86 4.0.3 implementation is missing XftInitFtLibrary forward
 extern "C" Bool XftInitFtLibrary(void);
 #endif
@@ -302,7 +302,7 @@ Window		*qt_net_virtual_root_list	= 0;
 
 
 // X11 SYNC support
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 Atom		qt_net_wm_sync_request_counter	= 0;
 Atom		qt_net_wm_sync_request     	= 0;
 #endif
@@ -319,7 +319,7 @@ static const int FocusModel_Other = 0;
 static const int FocusModel_PointerRoot = 1;
 static int qt_focus_model = -1;
 
-#ifndef QT_NO_XRANDR
+#ifndef TQT_NO_XRANDR
 // TRUE if TQt is compiled w/ XRandR support and XRandR exists on the connected
 // Display
 bool	qt_use_xrandr	= FALSE;
@@ -330,7 +330,7 @@ static int xrandr_eventbase;
 // Display
 Q_EXPORT bool tqt_use_xrender = FALSE;
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 // True if SYNC extension exists on the connected display
 bool qt_use_xsync = FALSE;
 static int xsync_eventbase;
@@ -423,7 +423,7 @@ static bool qt_x11EventFilter( XEvent* ev )
 
 
 
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
 //XIM		qt_xim			= 0;
 Q_EXPORT XIMStyle	qt_xim_style		= 0;
 Q_EXPORT XIMStyle	qt_xim_preferred_style	= 0;
@@ -666,16 +666,16 @@ TQString TQApplication::defaultInputMethod()
 }
 
 
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM_EXTENSIONS)
 /*! \internal
     Creates the application input method.
 */
 void TQApplication::create_im()
 {
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
     if ( ! qt_xim_preferred_style ) // no configured input style, use the default
 	qt_xim_preferred_style = xim_default_style;
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
 }
 
 
@@ -700,10 +700,10 @@ void TQApplication::close_im()
 */
 void TQApplication::create_xim()
 {
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
     if ( ! qt_xim_preferred_style ) // no configured input style, use the default
 	qt_xim_preferred_style = xim_default_style;
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
 
     TQWidgetList *list= tqApp->topLevelWidgets();
     TQWidgetListIt it(*list);
@@ -721,7 +721,7 @@ void TQApplication::create_xim()
  */
 void TQApplication::close_xim()
 {
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
     // Calling XCloseIM gives a Purify FMR error
     // XCloseIM( qt_xim );
     // We prefer a less serious memory leak
@@ -729,7 +729,7 @@ void TQApplication::close_xim()
     // if ( qt_xim )
     // 	qt_xim = 0;
 
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
     TQWidgetList *list = tqApp->topLevelWidgets();
     TQWidgetListIt it(*list);
     while(it.current()) {
@@ -1108,7 +1108,7 @@ bool TQApplication::x11_apply_settings()
     qt_use_rtl_extensions =
     	settings.readBoolEntry("/qt/useRtlExtensions", FALSE);
 
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
     if (qt_xim_preferred_style == 0) {
         TQString ximInputStyle =
             settings.readEntry( "/qt/XIMInputStyle",
@@ -1124,7 +1124,7 @@ bool TQApplication::x11_apply_settings()
     }
 #endif
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     /*
 	The identifier name of an input method is acquired from the
 	configuration file as a default. If a environment variable
@@ -1134,7 +1134,7 @@ bool TQApplication::x11_apply_settings()
      */
     if ( getenv( "QT_IM_SWITCHER" ) )
         defaultIM = getenv( "QT_IM_SWITCHER" );
-#ifndef QT_NO_IM_EXTENSIONS
+#ifndef TQT_NO_IM_EXTENSIONS
     else
         defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" );
 #endif
@@ -1742,7 +1742,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 			// ### Should we honor any others?
 		    }
 		}
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
 	    } else if ( arg == "-inputstyle" ) {
 		if ( ++i < argc ) {
 		    TQCString s = TQCString(argv[i]).lower();
@@ -2060,7 +2060,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 	qt_x11_intern_atom( "UTF8_STRING", &qt_utf8_string );
         qt_x11_intern_atom( "_SGI_DESKS_MANAGER", &qt_sgi_desks_manager );
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 	qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST_COUNTER", &qt_net_wm_sync_request_counter );
 	qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST", &qt_net_wm_sync_request );
 #endif
@@ -2078,7 +2078,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 	qt_get_net_supported();
 	qt_get_net_virtual_roots();
 
-#ifndef QT_NO_XRANDR
+#ifndef TQT_NO_XRANDR
 	// See if XRandR is supported on the connected display
 	int xrandr_errorbase;
 	Q_UNUSED( xrandr_eventbase );
@@ -2086,9 +2086,9 @@ void tqt_init_internal( int *argcptr, char **argv,
 	    // XRandR is supported
 	    qt_use_xrandr = TRUE;
 	}
-#endif // QT_NO_XRANDR
+#endif // TQT_NO_XRANDR
 
-#ifndef QT_NO_XRENDER
+#ifndef TQT_NO_XRENDER
 	// See if XRender is supported on the connected display
 	int xrender_eventbase, xrender_errorbase;
 	if (XRenderQueryExtension(appDpy, &xrender_eventbase, &xrender_errorbase)) {
@@ -2099,9 +2099,9 @@ void tqt_init_internal( int *argcptr, char **argv,
 					(Visual *) TQPaintDevice::x_appvisual);
 	    tqt_use_xrender = (format != 0) && (TQPaintDevice::x_appdepth != 8);
 	}
-#endif // QT_NO_XRENDER
+#endif // TQT_NO_XRENDER
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 	// Try to initialize SYNC extension on the connected display
 	int xsync_major, xsync_minor;
 	if ( XSyncQueryExtension( appDpy, &xsync_eventbase, &xsync_errorbase ) && 
@@ -2110,14 +2110,14 @@ void tqt_init_internal( int *argcptr, char **argv,
 	}
 #endif 
 
-#ifndef QT_NO_XKB
+#ifndef TQT_NO_XKB
 	// If XKB is detected, set the GrabsUseXKBState option so input method
 	// compositions continue to work (ie. deadkeys)
 	unsigned int state = XkbPCF_GrabsUseXKBStateMask;
 	(void) XkbSetPerClientControls(appDpy, state, &state);
 #endif
 
-#if !defined(QT_NO_XFTFREETYPE)
+#if !defined(TQT_NO_XFTFREETYPE)
 	// defined in qfont_x11.cpp
 	extern bool tqt_has_xft;
 #ifndef QT_XFT2
@@ -2141,7 +2141,7 @@ void tqt_init_internal( int *argcptr, char **argv,
                 }
             }
         }
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 	// look at the modifier mapping, and get the correct masks for alt/meta
 	// find the alt/meta masks
@@ -2220,10 +2220,10 @@ void tqt_init_internal( int *argcptr, char **argv,
 			  KeymapStateMask | EnterWindowMask | LeaveWindowMask |
 			  PropertyChangeMask );
 
-#ifndef QT_NO_XRANDR
+#ifndef TQT_NO_XRANDR
 	    if (qt_use_xrandr)
 		XRRSelectInput( appDpy, TQPaintDevice::x11AppRootWindow( screen ), True );
-#endif // QT_NO_XRANDR
+#endif // TQT_NO_XRANDR
 	}
     }
 
@@ -2246,8 +2246,8 @@ void tqt_init_internal( int *argcptr, char **argv,
 	    TQApplication::setFont( f );
 	}
 
-#if !defined(QT_NO_IM)
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM)
+#if !defined(TQT_NO_IM_EXTENSIONS)
     TQApplication::create_im();
 #else
     TQApplication::create_xim();
@@ -2414,7 +2414,7 @@ void tqt_init_internal( int *argcptr, char **argv,
     }
 
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     // run-time search for default style
 void TQApplication::x11_initialize_style()
 {
@@ -2506,8 +2506,8 @@ void tqt_cleanup()
 	XCloseDevice( appDpy, devEraser );
 #endif
 
-#if !defined(QT_NO_IM)
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM)
+#if !defined(TQT_NO_IM_EXTENSIONS)
     TQApplication::close_im();
 #else
     TQApplication::close_xim();
@@ -2825,7 +2825,7 @@ void TQApplication::setMainWidget( TQWidget *mainWidget )
     }
 }
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 
 /*****************************************************************************
   TQApplication cursor stack
@@ -3252,10 +3252,10 @@ int TQApplication::x11ClientMessage(TQWidget* w, XEvent* event, bool passive_onl
 			amw->setActiveWindow();
 		    }
 		}
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	    } else if ( a == qt_net_wm_context_help ) {
 		TQWhatsThis::enterWhatsThisMode();
-#endif // QT_NO_WHATSTHIS
+#endif // TQT_NO_WHATSTHIS
 	    } else if ( a == qt_net_wm_ping ) {
 		// avoid send/reply loops
 		Window root = TQPaintDevice::x11AppRootWindow( w->x11Screen() );
@@ -3264,7 +3264,7 @@ int TQApplication::x11ClientMessage(TQWidget* w, XEvent* event, bool passive_onl
 		    XSendEvent( event->xclient.display, event->xclient.window,
 				False, SubstructureNotifyMask|SubstructureRedirectMask, event );
 		}
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 	    } else if (a == qt_net_wm_sync_request ) {
 		    widget->handleSyncRequest( event );
 #endif
@@ -3374,7 +3374,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 	}
     }
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     // Filtering input events by the input context. It has to be taken
     // place before any other key event consumers such as eventfilters
     // and accelerators because some input methods require quite
@@ -3383,7 +3383,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
     // filtering opportunity first to ensure all input methods work
     // properly regardless of application design.
 
-// #ifndef QT_NO_IM_EXTENSIONS
+// #ifndef TQT_NO_IM_EXTENSIONS
     if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) {
 // #else
 //    if( keywidget && keywidget->isEnabled() ) {
@@ -3423,7 +3423,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 		return TRUE;
 	}
     } else
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
     {
 	if ( XFilterEvent( event, None ) )
 	    return TRUE;
@@ -3472,7 +3472,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 	return 0;
     }
 
-#ifndef QT_NO_XRANDR
+#ifndef TQT_NO_XRANDR
     // XRandR doesn't care if TQt doesn't know about the widget, so handle XRandR stuff before the !widget check below
     if (event->type == xrandr_eventbase + RRScreenChangeNotify
 	|| ( event->type == ConfigureNotify && event->xconfigure.window == TQPaintDevice::x11AppRootWindow())) {
@@ -3504,7 +3504,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 	    }
 	}
     }
-#endif // QT_NO_XRANDR
+#endif // TQT_NO_XRANDR
 
     if ( !widget ) {				// don't know this windows
 	TQWidget* popup = TQApplication::activePopupWidget();
@@ -5044,7 +5044,7 @@ static void deleteKeyDicts()
     textDict = 0;
 }
 
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
 static const unsigned short katakanaKeysymsToUnicode[] = {
     0x0000, 0x3002, 0x300C, 0x300D, 0x3001, 0x30FB, 0x30F2, 0x30A1,
     0x30A3, 0x30A5, 0x30A7, 0x30A9, 0x30E3, 0x30E5, 0x30E7, 0x30C3,
@@ -5231,7 +5231,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count,
 
     type = (event->type == XKeyPress)
            ? TQEvent::KeyPress : TQEvent::KeyRelease;
-#if defined(QT_NO_XIM)
+#if defined(TQT_NO_XIM)
 
     count = XLookupString( &xkeyevent, chars.data(), chars.size(), &key, 0 );
 
@@ -5337,7 +5337,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count,
 	    ascii = (char)(s-256);
 	}
     }
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
 
     state = qt_x11_translateButtonState( keystate );
 
@@ -5615,13 +5615,13 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab )
 	translateKeyEventInternal( event, count, text, state, ascii, code, type );
     }
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     TQInputContext *qic = getInputContext();
 #endif
 
     // compress keys
     if ( !text.isEmpty() && testWState(WState_CompressKeys) &&
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 	 // Ordinary input methods require discrete key events to work
 	 // properly, so key compression has to be disabled when input
 	 // context exists.
@@ -5642,7 +5642,7 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab )
 	 // such as key repeat mechanism is required to implement such
 	 // feature.
 	 ! qic &&
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 	 // do not compress keys if the key event we just got above matches
 	 // one of the key ranges used to compute stopCompression
 	 ! ( ( code >= Key_Escape && code <= Key_SysReq ) ||
@@ -5702,10 +5702,10 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab )
     // autorepeat compression makes sense for all widgets (Windows
     // does it automatically .... )
     if ( event->type == XKeyPress && text.length() <= 1
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 	 // input methods need discrete key events
 	 && ! qic
-#endif// QT_NO_IM
+#endif// TQT_NO_IM
 	 ) {
 	XEvent dummy;
 
@@ -5917,7 +5917,7 @@ bool TQETWidget::translateScrollDoneEvent( const XEvent *event )
 #if defined(Q_C_CALLBACKS)
 extern "C" {
 #endif
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 static Bool qt_net_wm_sync_request_scanner(Display*, XEvent* event, XPointer arg)
 {
     return (event->type == ClientMessage && event->xclient.window == *(Window*)arg
@@ -5983,7 +5983,7 @@ bool TQETWidget::translateConfigEvent( const XEvent *event )
                 }
                 ++compressed_configs;
             }
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
             // _NET_WM_SYNC_REQUEST compression 
             Window wid = winId();
             while ( compressed_configs &&
@@ -6234,7 +6234,7 @@ bool TQApplication::isEffectEnabled( TQt::UIEffect effect )
   Session management support
  *****************************************************************************/
 
-#ifndef QT_NO_SM_SUPPORT
+#ifndef TQT_NO_SM_SUPPORT
 
 #include 
 
@@ -6712,4 +6712,4 @@ void TQSessionManager::requestPhase2()
 }
 
 
-#endif // QT_NO_SM_SUPPORT
+#endif // TQT_NO_SM_SUPPORT
diff --git a/src/kernel/qasyncimageio.cpp b/src/kernel/qasyncimageio.cpp
index e26ef399d..a8196e93a 100644
--- a/src/kernel/qasyncimageio.cpp
+++ b/src/kernel/qasyncimageio.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqasyncimageio.h"
 
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
 
 #include "ntqptrlist.h"
 #include "ntqgif.h"
@@ -1313,4 +1313,4 @@ TQRgb TQGIFFormat::color( uchar index ) const
 
 #endif // QT_BUILTIN_GIF_READER
 
-#endif // QT_NO_ASYNC_IMAGE_IO
+#endif // TQT_NO_ASYNC_IMAGE_IO
diff --git a/src/kernel/qasyncio.cpp b/src/kernel/qasyncio.cpp
index 0bccc14d8..bf5890ac1 100644
--- a/src/kernel/qasyncio.cpp
+++ b/src/kernel/qasyncio.cpp
@@ -42,7 +42,7 @@
 #include "ntqiodevice.h"
 #include 
 
-#ifndef QT_NO_ASYNC_IO
+#ifndef TQT_NO_ASYNC_IO
 
 /*!
   \class TQAsyncIO ntqasyncio.h
@@ -356,5 +356,5 @@ void TQDataPump::tryToPump()
     timer.start(0, TRUE);
 }
 
-#endif // QT_NO_ASYNC_IO
+#endif // TQT_NO_ASYNC_IO
 
diff --git a/src/kernel/qbitmap.cpp b/src/kernel/qbitmap.cpp
index 1e341e545..9a075b8f4 100644
--- a/src/kernel/qbitmap.cpp
+++ b/src/kernel/qbitmap.cpp
@@ -191,7 +191,7 @@ TQBitmap::TQBitmap( const TQBitmap &bitmap )
 {
 }
 
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 /*!
     Constructs a bitmap from the file \a fileName. If the file does
     not exist or is of an unknown format, the bitmap becomes a null
@@ -277,7 +277,7 @@ TQBitmap &TQBitmap::operator=( const TQImage &image )
 }
 
 
-#ifndef QT_NO_PIXMAP_TRANSFORMATION
+#ifndef TQT_NO_PIXMAP_TRANSFORMATION
 /*!
     Returns a transformed copy of this bitmap by using \a matrix.
 
@@ -298,7 +298,7 @@ TQBitmap TQBitmap::xForm( const TQWMatrix &matrix ) const
     bm = pm;
     return bm;
 }
-#endif // QT_NO_TRANSFORMATIONS
+#endif // TQT_NO_TRANSFORMATIONS
 
 
 
diff --git a/src/kernel/qclipboard.cpp b/src/kernel/qclipboard.cpp
index 77b1235e7..ae5328806 100644
--- a/src/kernel/qclipboard.cpp
+++ b/src/kernel/qclipboard.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqclipboard.h"
 
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 
 #include "ntqapplication.h"
 #include "qapplication_p.h"
@@ -208,7 +208,7 @@ TQClipboard::~TQClipboard()
   TQApplication member functions related to TQClipboard.
  *****************************************************************************/
 
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
 // text handling is done directly in qclipboard_qws, for now
 
 /*!
@@ -563,5 +563,5 @@ void TQClipboard::clear()
     clear( selectionModeEnabled() ? Selection : Clipboard );
 }
 
-#endif // QT_NO_MIMECLIPBOARD
-#endif // QT_NO_CLIPBOARD
+#endif // TQT_NO_MIMECLIPBOARD
+#endif // TQT_NO_CLIPBOARD
diff --git a/src/kernel/qclipboard_x11.cpp b/src/kernel/qclipboard_x11.cpp
index 4a16e6da4..468eff81d 100644
--- a/src/kernel/qclipboard_x11.cpp
+++ b/src/kernel/qclipboard_x11.cpp
@@ -62,7 +62,7 @@
 
 #include "ntqclipboard.h"
 
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 
 #include "ntqapplication.h"
 #include "ntqeventloop.h"
@@ -1670,4 +1670,4 @@ bool qt_check_clipboard_sentinel()
     return doIt;
 }
 
-#endif // QT_NO_CLIPBOARD
+#endif // TQT_NO_CLIPBOARD
diff --git a/src/kernel/qcolor.cpp b/src/kernel/qcolor.cpp
index af11e67a7..1b0895ba8 100644
--- a/src/kernel/qcolor.cpp
+++ b/src/kernel/qcolor.cpp
@@ -486,7 +486,7 @@ bool TQColor::isDirty() const
 
 TQString TQColor::name() const
 {
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_SPRINTF
     TQString s;
     s.sprintf( "#%02x%02x%02x", red(), green(), blue() );
     return s;
@@ -920,7 +920,7 @@ uint TQColor::pixel() const
 /*****************************************************************************
   TQColor stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQColor
     Writes a color object, \a c to the stream, \a s.
diff --git a/src/kernel/qcolor_p.cpp b/src/kernel/qcolor_p.cpp
index 97a3e4882..e7e33c9cb 100644
--- a/src/kernel/qcolor_p.cpp
+++ b/src/kernel/qcolor_p.cpp
@@ -47,7 +47,7 @@
 
 #include "ntqcolor.h"
 
-#ifndef QT_NO_COLORNAMES
+#ifndef TQT_NO_COLORNAMES
 
 #include 
 
@@ -766,7 +766,7 @@ uint qt_get_rgb_val( const char *name )
     qt_get_named_rgb(name,&r);
     return r;
 }
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 TQStringList TQColor::colorNames()
 {
     int i = 0;
@@ -788,10 +788,10 @@ uint qt_get_rgb_val( const char * )
 {
     return 0;
 }
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 TQStringList TQColor::colorNames()
 {
     return TQStringList();
 }
 #endif
-#endif // QT_NO_COLORNAMES
+#endif // TQT_NO_COLORNAMES
diff --git a/src/kernel/qcursor.cpp b/src/kernel/qcursor.cpp
index ecb21333f..7d128c159 100644
--- a/src/kernel/qcursor.cpp
+++ b/src/kernel/qcursor.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqcursor.h"
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 
 #include "ntqbitmap.h"
 #include "ntqimage.h"
@@ -147,7 +147,7 @@
   TQCursor stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 
 
 /*!
@@ -161,7 +161,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQCursor &c )
 {
     s << (TQ_INT16)c.shape();			// write shape id to stream
     if ( c.shape() == TQt::BitmapCursor ) {		// bitmap cursor
-#if !defined(QT_NO_IMAGEIO)
+#if !defined(TQT_NO_IMAGEIO)
 	s << *c.bitmap() << *c.mask();
 	s << c.hotSpot();
 #else
@@ -183,7 +183,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCursor &c )
     TQ_INT16 shape;
     s >> shape;					// read shape id from stream
     if ( shape == TQt::BitmapCursor ) {		// read bitmap cursor
-#if !defined(QT_NO_IMAGEIO)
+#if !defined(TQT_NO_IMAGEIO)
 	TQBitmap bm, bmm;
 	TQPoint	hot;
 	s >> bm >> bmm >> hot;
@@ -196,7 +196,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCursor &c )
     }
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
 
 /*!
@@ -282,6 +282,6 @@ TQCursor::TQCursor( const TQBitmap &bitmap, const TQBitmap &mask,
     setBitmap(bitmap,mask,hotX,hotY);
 }
 
-#endif // QT_NO_CURSOR
+#endif // TQT_NO_CURSOR
 
 
diff --git a/src/kernel/qcursor_x11.cpp b/src/kernel/qcursor_x11.cpp
index 8f5114f97..cea5646ce 100644
--- a/src/kernel/qcursor_x11.cpp
+++ b/src/kernel/qcursor_x11.cpp
@@ -47,9 +47,9 @@
 #include "qt_x11_p.h"
 #include 
 
-#ifndef QT_NO_XCURSOR
+#ifndef TQT_NO_XCURSOR
 #  include 
-#endif // QT_NO_XCURSOR
+#endif // TQT_NO_XCURSOR
 
 // Define QT_USE_APPROXIMATE_CURSORS when compiling if you REALLY want to
 // use the ugly X11 cursors.
@@ -515,7 +515,7 @@ void TQCursor::update() const
 	return;
     }
 
-#ifndef QT_NO_XCURSOR
+#ifndef TQT_NO_XCURSOR
     static const char *cursorNames[] = {
 	"left_ptr",
 	"up_arrow",
@@ -539,7 +539,7 @@ void TQCursor::update() const
     d->hcurs = XcursorLibraryLoadCursor( dpy, cursorNames[d->cshape] );
     if ( d->hcurs )
 	return;
-#endif // QT_NO_XCURSOR
+#endif // TQT_NO_XCURSOR
 
     static uchar cur_blank_bits[] = {
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/src/kernel/qdesktopwidget_x11.cpp b/src/kernel/qdesktopwidget_x11.cpp
index d8c10605b..449af4ffc 100644
--- a/src/kernel/qdesktopwidget_x11.cpp
+++ b/src/kernel/qdesktopwidget_x11.cpp
@@ -120,7 +120,7 @@ void TQDesktopWidgetPrivate::init()
     // get the screen count
     int newScreenCount;
 
-#ifndef QT_NO_XINERAMA
+#ifndef TQT_NO_XINERAMA
     XineramaScreenInfo *xinerama_screeninfo = 0;
     int unused;
     use_xinerama = (XineramaQueryExtension(TQPaintDevice::x11AppDisplay(),
@@ -134,7 +134,7 @@ void TQDesktopWidgetPrivate::init()
     if (xinerama_screeninfo)
 	defaultScreen = 0;
     } else
-#endif // QT_NO_XINERAMA
+#endif // TQT_NO_XINERAMA
     {
 	defaultScreen = DefaultScreen(TQPaintDevice::x11AppDisplay());
 	newScreenCount = ScreenCount(TQPaintDevice::x11AppDisplay());
@@ -150,14 +150,14 @@ void TQDesktopWidgetPrivate::init()
     int i, j, x, y, w, h;
     for ( i = 0, j = 0; i < newScreenCount; i++ ) {
 
-#ifndef QT_NO_XINERAMA
+#ifndef TQT_NO_XINERAMA
 	if (use_xinerama) {
 	    x = xinerama_screeninfo[i].x_org;
 	    y = xinerama_screeninfo[i].y_org;
 	    w = xinerama_screeninfo[i].width;
 	    h = xinerama_screeninfo[i].height;
 	} else
-#endif // QT_NO_XINERAMA
+#endif // TQT_NO_XINERAMA
 	    {
 		x = 0;
 		y = 0;
@@ -188,13 +188,13 @@ void TQDesktopWidgetPrivate::init()
 
     screenCount = j;
 
-#ifndef QT_NO_XINERAMA
+#ifndef TQT_NO_XINERAMA
     if (use_xinerama && screenCount == 1)
         use_xinerama = false;
 
     if (xinerama_screeninfo)
 	XFree(xinerama_screeninfo);
-#endif // QT_NO_XINERAMA
+#endif // TQT_NO_XINERAMA
 
 }
 
@@ -314,7 +314,7 @@ int TQDesktopWidget::screenNumber( TQWidget *widget ) const
     if ( !widget )
 	return d->defaultScreen;
 
-#ifndef QT_NO_XINERAMA
+#ifndef TQT_NO_XINERAMA
     if (d->use_xinerama) {
 	// this is how we do it for xinerama
 	TQRect frame = widget->frameGeometry();
@@ -334,7 +334,7 @@ int TQDesktopWidget::screenNumber( TQWidget *widget ) const
 	}
 	return maxScreen;
     }
-#endif // QT_NO_XINERAMA
+#endif // TQT_NO_XINERAMA
 
     return widget->x11Screen();
 }
diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp
index 42892ca0b..bad09d3cd 100644
--- a/src/kernel/qdnd_x11.cpp
+++ b/src/kernel/qdnd_x11.cpp
@@ -42,7 +42,7 @@
 
 #include "ntqapplication.h"
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 #include "ntqwidget.h"
 #include "ntqintdict.h"
@@ -1123,7 +1123,7 @@ void TQDragManager::updateCursor()
 	//if ( qt_xdnd_deco )
 	//    qt_xdnd_deco->hide();
     }
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( c )
 	tqApp->setOverrideCursor( *c, TRUE );
 #endif
@@ -1143,7 +1143,7 @@ void TQDragManager::cancel( bool deleteSource )
 	qt_xdnd_send_leave();
     }
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( restoreCursor ) {
 	TQApplication::restoreOverrideCursor();
 	restoreCursor = FALSE;
@@ -1449,7 +1449,7 @@ void TQDragManager::drop()
 	XSendEvent( TQPaintDevice::x11AppDisplay(), qt_xdnd_current_proxy_target, False,
 		    NoEventMask, (XEvent*)&drop );
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( restoreCursor ) {
 	TQApplication::restoreOverrideCursor();
 	restoreCursor = FALSE;
@@ -1794,7 +1794,7 @@ bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode )
     heartbeat = startTimer(200);
     need_modifiers_check = FALSE;
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     tqApp->setOverrideCursor( arrowCursor );
     restoreCursor = TRUE;
     updateCursor();
@@ -1808,7 +1808,7 @@ bool TQDragManager::drag( TQDragObject * o, TQDragObject::DragMode mode )
 
     tqApp->enter_loop(); // Do the DND.
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     tqApp->restoreOverrideCursor();
 #endif
 
@@ -1856,4 +1856,4 @@ void TQDragManager::updatePixmap()
     updatePixmap( TQCursor::pos());
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
diff --git a/src/kernel/qdragobject.cpp b/src/kernel/qdragobject.cpp
index 428000a36..efc086164 100644
--- a/src/kernel/qdragobject.cpp
+++ b/src/kernel/qdragobject.cpp
@@ -43,7 +43,7 @@
 # undef open
 #endif
 
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 
 #include "ntqdragobject.h"
 #include "ntqtextcodec.h"
@@ -257,7 +257,7 @@ static const char * const link_xpm[] = {
 ".............aXXXXXXXXXa",
 ".............aaaaaaaaaaa"};
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 // the universe's only drag manager
 TQDragManager * qt_dnd_manager = 0;
@@ -287,7 +287,7 @@ TQDragManager::TQDragManager()
 
 TQDragManager::~TQDragManager()
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( restoreCursor )
 	TQApplication::restoreOverrideCursor();
 #endif
@@ -311,7 +311,7 @@ TQDragObject::TQDragObject( TQWidget * dragSource, const char * name )
 {
     d = new TQDragObjectData();
     d->pm_cursor = 0;
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !qt_dnd_manager && tqApp )
 	(void)new TQDragManager();
 #endif
@@ -325,7 +325,7 @@ TQDragObject::TQDragObject( TQWidget * dragSource, const char * name )
 
 TQDragObject::~TQDragObject()
 {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( qt_dnd_manager && qt_dnd_manager->object == this )
 	qt_dnd_manager->cancel( FALSE );
     if ( d->pm_cursor ) {
@@ -337,7 +337,7 @@ TQDragObject::~TQDragObject()
     delete d;
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 /*!
     Set the pixmap \a pm to display while dragging the object. The
     platform-specific implementation will use this where it can - so
@@ -1684,7 +1684,7 @@ bool TQUriDrag::decodeToUnicodeUris( const TQMimeSource* e, TQStringList& l )
 }
 
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 /*!
     If the source of the drag operation is a widget in this
     application, this function returns that source, otherwise it
@@ -1808,4 +1808,4 @@ bool TQColorDrag::decode( TQMimeSource *e, TQColor &col )
     return TRUE;
 }
 
-#endif // QT_NO_MIME
+#endif // TQT_NO_MIME
diff --git a/src/kernel/qdrawutil.cpp b/src/kernel/qdrawutil.cpp
index 8dfb93297..0ac5bde33 100644
--- a/src/kernel/qdrawutil.cpp
+++ b/src/kernel/qdrawutil.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqdrawutil.h"
-#ifndef QT_NO_DRAWUTIL
+#ifndef TQT_NO_DRAWUTIL
 #include "ntqbitmap.h"
 #include "ntqpixmapcache.h"
 #include "ntqapplication.h"
@@ -629,7 +629,7 @@ void qDrawItem( TQPainter *p, TQt::GUIStyle gs,
 		}
 	    } else if ( pm.depth() == 1 ) {	// monochrome pixmap, no mask
 		pm.setMask( *((TQBitmap *)&pm) );
-#ifndef QT_NO_IMAGE_HEURISTIC_MASK
+#ifndef TQT_NO_IMAGE_HEURISTIC_MASK
 	    } else {				// color pixmap, no mask
 		TQString k;
 		k.sprintf( "$qt-drawitem-%x", pm.serialNumber() );
@@ -795,7 +795,7 @@ static void qDrawWinArrow( TQPainter *p, TQt::ArrowType type, bool down,
 #pragma warning(disable: 4244)
 #endif
 
-#ifndef QT_NO_STYLE_MOTIF
+#ifndef TQT_NO_STYLE_MOTIF
 // motif arrows look the same whether they are used or not
 // is this correct?
 static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down,
@@ -806,7 +806,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down,
     TQPointArray bTop;				// top shadow.
     TQPointArray bBot;				// bottom shadow.
     TQPointArray bLeft;				// left shadow.
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQWMatrix	matrix;				// xform matrix
 #endif
     bool vertical = type == TQt::UpArrow || type == TQt::DownArrow;
@@ -857,7 +857,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down,
     }
 
     if ( type == TQt::UpArrow || type == TQt::LeftArrow ) {
-#ifndef QT_NO_TRANSFORMATIONS	// #### fix me!
+#ifndef TQT_NO_TRANSFORMATIONS	// #### fix me!
 	matrix.translate( x, y );
 	if ( vertical ) {
 	    matrix.translate( 0, h - 1 );
@@ -873,7 +873,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down,
 	    colspec = horizontal ? 0x1443 : 0x1434;
     }
     else if ( type == TQt::DownArrow || type == TQt::RightArrow ) {
-#ifndef QT_NO_TRANSFORMATIONS	// #### fix me!
+#ifndef TQT_NO_TRANSFORMATIONS	// #### fix me!
 	matrix.translate( x, y );
 	if ( vertical ) {
 	    matrix.translate( w-1, 0 );
@@ -899,7 +899,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down,
 
     TQPen     savePen   = p->pen();		// save current pen
     TQBrush   saveBrush = p->brush();		// save current brush
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQWMatrix wxm = p->worldMatrix();
 #endif
     TQPen     pen( TQt::NoPen );
@@ -907,7 +907,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down,
 
     p->setPen( pen );
     p->setBrush( brush );
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     p->setWorldMatrix( matrix, TRUE );		// set transformation matrix
 #endif
     p->drawPolygon( bFill );			// fill arrow
@@ -920,7 +920,7 @@ static void qDrawMotifArrow( TQPainter *p, TQt::ArrowType type, bool down,
     p->setPen( CBOT );
     p->drawLineSegments( bBot );
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     p->setWorldMatrix( wxm );
 #endif
     p->setBrush( saveBrush );			// restore brush
@@ -941,7 +941,7 @@ void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style, bool do
 	case TQt::WindowsStyle:
 	    qDrawWinArrow( p, type, down, x, y, w, h, g, enabled );
 	    break;
-#ifndef QT_NO_STYLE_MOTIF
+#ifndef TQT_NO_STYLE_MOTIF
 	case TQt::MotifStyle:
 	    qDrawMotifArrow( p, type, down, x, y, w, h, g, enabled );
 	    break;
@@ -954,4 +954,4 @@ void qDrawArrow( TQPainter *p, TQt::ArrowType type, TQt::GUIStyle style, bool do
 #endif
     }
 }
-#endif //QT_NO_DRAWUTIL
+#endif //TQT_NO_DRAWUTIL
diff --git a/src/kernel/qdropsite.cpp b/src/kernel/qdropsite.cpp
index 07dd965dc..8dd44a2cc 100644
--- a/src/kernel/qdropsite.cpp
+++ b/src/kernel/qdropsite.cpp
@@ -38,7 +38,7 @@
 
 #include "ntqdropsite.h"
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 #include "ntqwidget.h"
 
@@ -78,4 +78,4 @@ TQDropSite::~TQDropSite()
 {
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
diff --git a/src/kernel/qevent.cpp b/src/kernel/qevent.cpp
index 2e1ce96ef..3a4af436f 100644
--- a/src/kernel/qevent.cpp
+++ b/src/kernel/qevent.cpp
@@ -523,7 +523,7 @@ TQt::ButtonState TQMouseEvent::stateAfter() const
 
     \sa pos(), delta(), state()
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 TQWheelEvent::TQWheelEvent( const TQPoint &pos, int delta, int state, Orientation orient )
     : TQEvent(Wheel), p(pos), d(delta), s((ushort)state),
       accpt(TRUE), o(orient)
diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp
index 856db67dc..455941123 100644
--- a/src/kernel/qfont.cpp
+++ b/src/kernel/qfont.cpp
@@ -1369,7 +1369,7 @@ void TQFont::setDefaultFont( const TQFont &f )
 
 
 
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 
 /*****************************************************************************
   TQFont substitution management
@@ -1540,7 +1540,7 @@ TQStringList TQFont::substitutions()
     return ret;
 }
 
-#endif // QT_NO_STRINGLIST
+#endif // TQT_NO_STRINGLIST
 
 
 /*  \internal
@@ -1572,7 +1572,7 @@ static TQ_UINT8 get_font_bits( const TQFontPrivate *f )
 }
 
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 
 /*  \internal
     Internal function. Sets boolean font settings from an unsigned
@@ -1639,7 +1639,7 @@ TQString TQFont::toString() const
  */
 bool TQFont::fromString(const TQString &descrip)
 {
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     TQStringList l(TQStringList::split(',', descrip));
 
     int count = (int)l.count();
@@ -1654,7 +1654,7 @@ bool TQFont::fromString(const TQString &descrip)
 	from = to+1;
 	to = descrip.find( ',', from );
     }
-#endif // QT_NO_STRINGLIST
+#endif // TQT_NO_STRINGLIST
     if ( !count || ( count > 2 && count < 9 ) || count > 11 ) {
 
 #ifdef QT_CHECK_STATE
@@ -1708,7 +1708,7 @@ void TQFont::cacheStatistics()
 /*****************************************************************************
   TQFont stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 
 /*!
     \relates TQFont
@@ -1798,7 +1798,7 @@ TQDataStream &operator>>( TQDataStream &s, TQFont &font )
     return s;
 }
 
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
 
 
diff --git a/src/kernel/qfont_x11.cpp b/src/kernel/qfont_x11.cpp
index 6877c9a63..2bb65a4f0 100644
--- a/src/kernel/qfont_x11.cpp
+++ b/src/kernel/qfont_x11.cpp
@@ -71,7 +71,7 @@
 
 Q_EXPORT bool tqt_has_xft = FALSE;
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 TQt::HANDLE qt_xft_handle(const TQFont &font)
 {
     TQFontEngine *engine = font.d->engineForScript( TQFontPrivate::defaultScript );
@@ -195,8 +195,8 @@ void TQFont::initialize()
     // create global font cache
     if ( ! TQFontCache::instance ) (void) new TQFontCache;
 
-#ifndef QT_NO_CODECS
-#ifndef QT_NO_BIG_CODECS
+#ifndef TQT_NO_CODECS
+#ifndef TQT_NO_BIG_CODECS
     static bool codecs_once = FALSE;
     if ( ! codecs_once ) {
 	(void) new TQFontJis0201Codec;
@@ -210,8 +210,8 @@ void TQFont::initialize()
 	(void) new TQFontLaoCodec;
 	codecs_once = TRUE;
     }
-#endif // QT_NO_BIG_CODECS
-#endif // QT_NO_CODECS
+#endif // TQT_NO_BIG_CODECS
+#endif // TQT_NO_CODECS
 
     extern int qt_encoding_id_for_mib( int mib ); // from qfontdatabase_x11.cpp
     TQTextCodec *codec = TQTextCodec::codecForLocale();
diff --git a/src/kernel/qfontdatabase.cpp b/src/kernel/qfontdatabase.cpp
index af4cf5993..3d0b1b5aa 100644
--- a/src/kernel/qfontdatabase.cpp
+++ b/src/kernel/qfontdatabase.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqfontdatabase.h"
 
-#ifndef QT_NO_FONTDATABASE
+#ifndef TQT_NO_FONTDATABASE
 
 #include 
 #include 
@@ -601,7 +601,7 @@ static const unsigned short sample_chars[TQFont::LastPrivateScript][14] =
     // Taiwan would be 0x201C, 0x3002, 0x4E00, 0x9F98, 0xFFE5
 };
 
-#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
+#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
 static inline bool requiresOpenType(TQFont::Script s)
 {
     return (s >= TQFont::Syriac && s <= TQFont::Sinhala)
@@ -631,7 +631,7 @@ static inline bool canRender( TQFontEngine *fe, TQFont::Script script )
         }
         ++i;
     }
-#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
+#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
     if (hasChar && requiresOpenType(script)) {
 	TQOpenType *ot = fe->openType();
 	if (!ot || !ot->supportsScript(script))
@@ -2488,4 +2488,4 @@ void TQFontDatabase::parseFontName(const TQString &name, TQString &foundry, TQSt
     }
 }
 
-#endif // QT_NO_FONTDATABASE
+#endif // TQT_NO_FONTDATABASE
diff --git a/src/kernel/qfontdatabase_x11.cpp b/src/kernel/qfontdatabase_x11.cpp
index bb555ed3b..c449b8961 100644
--- a/src/kernel/qfontdatabase_x11.cpp
+++ b/src/kernel/qfontdatabase_x11.cpp
@@ -53,7 +53,7 @@
 #include 
 #include 
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 #include 
 #include FT_FREETYPE_H
 #endif
@@ -831,7 +831,7 @@ static void loadXlfds( const char *reqFamily, int encoding_id )
 #endif // QT_XFT2
 }
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 static int getXftWeight(int xftweight)
 {
     int qtweight = TQFont::Black;
@@ -1281,7 +1281,7 @@ static inline void checkXftCoverage( TQtFontFamily *family )
     family->xftScriptCheck = TRUE;
 }
 #endif // QT_XFT2
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 static void load( const TQString &family = TQString::null, int script = -1 )
 {
@@ -1291,7 +1291,7 @@ static void load( const TQString &family = TQString::null, int script = -1 )
 #endif
 
     if ( family.isNull() ) {
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
         static bool xft_readall_done = false;
         if (tqt_has_xft && !xft_readall_done) {
             xft_readall_done = true;
@@ -1316,7 +1316,7 @@ static void load( const TQString &family = TQString::null, int script = -1 )
         if (tqt_has_xft)
             return;
 #endif
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 	if ( script == -1 )
 	    loadXlfds( 0, -1 );
 	else {
@@ -1329,7 +1329,7 @@ static void load( const TQString &family = TQString::null, int script = -1 )
 	TQtFontFamily *f = db->family( family, TRUE );
 	if ( !f->fullyLoaded ) {
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
             if (tqt_has_xft) {
                 TQString mfamily = family;
             redo:
@@ -1365,7 +1365,7 @@ static void load( const TQString &family = TQString::null, int script = -1 )
 		checkXftCoverage( f );
 	    }
 #endif
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 	    // could reduce this further with some more magic:
 	    // would need to remember the encodings loaded for the family.
 	    if ( ( script == -1 && !f->xlfdLoaded ) ||
@@ -1396,14 +1396,14 @@ static void initializeDb()
     TQTime t;
     t.start();
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     loadXft();
     FD_DEBUG("TQFontDatabase: loaded Xft: %d ms",  t.elapsed() );
 #endif
 
     t.start();
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     for ( int i = 0; i < db->count; i++ ) {
 #ifndef QT_XFT2
 	checkXftCoverage( db->families[i] );
@@ -1479,7 +1479,7 @@ void TQFontDatabase::createDatabase()
 // --------------------------------------------------------------------------------------
 #define MAXFONTSIZE_XFT 256
 #define MAXFONTSIZE_XLFD 128
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 static double addPatternProps(XftPattern *pattern, const TQtFontStyle::Key &key, bool fakeOblique,
 			      bool smoothScalable, const TQFontPrivate *fp, const TQFontDef &request)
 {
@@ -1566,7 +1566,7 @@ static double addPatternProps(XftPattern *pattern, const TQtFontStyle::Key &key,
 
     return scale;
 }
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 static
 TQFontEngine *loadEngine( TQFont::Script script,
@@ -1593,7 +1593,7 @@ TQFontEngine *loadEngine( TQFont::Script script,
 	return fe;
     }
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if ( encoding->encoding == -1 ) {
 
 	FM_DEBUG( "    using Xft" );
@@ -1683,7 +1683,7 @@ TQFontEngine *loadEngine( TQFont::Script script,
 	fe->setScale( scale );
 	return fe;
     }
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
     FM_DEBUG( "    using XLFD" );
 
diff --git a/src/kernel/qfontengine_p.h b/src/kernel/qfontengine_p.h
index bd3d33a3f..499a5598b 100644
--- a/src/kernel/qfontengine_p.h
+++ b/src/kernel/qfontengine_p.h
@@ -298,14 +298,14 @@ struct TransformedFont
     float yy;
     union {
 	Font xlfd_font;
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	XftFont *xft_font;
 #endif
     };
     TransformedFont *next;
 };
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 #include 
 #include FT_FREETYPE_H
 #include "ftxopen.h"
@@ -472,7 +472,7 @@ private:
 class TQScriptItem;
 class TQTextEngine;
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 
 #include "qscriptengine_p.h"
 #include "qtextengine_p.h"
@@ -525,7 +525,7 @@ private:
     int loadFlags;
 };
 
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 #elif defined( Q_WS_MAC )
 #include "qt_mac.h"
diff --git a/src/kernel/qfontengine_x11.cpp b/src/kernel/qfontengine_x11.cpp
index d9d2f1640..a736afa64 100644
--- a/src/kernel/qfontengine_x11.cpp
+++ b/src/kernel/qfontengine_x11.cpp
@@ -1433,7 +1433,7 @@ void TQFontEngineLatinXLFD::setScale( double scale )
 // ------------------------------------------------------------------
 // #define FONTENGINE_DEBUG
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 class Q_HackPaintDevice : public TQPaintDevice
 {
 public:
@@ -2232,7 +2232,7 @@ TQFontEngine::Type TQFontEngineXft::type() const
 // Open type support
 //  --------------------------------------------------------------------------------------------------------------------
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 
 #include "qscriptengine_p.h"
 
diff --git a/src/kernel/qgplugin.cpp b/src/kernel/qgplugin.cpp
index a8733b07b..ca5b4131f 100644
--- a/src/kernel/qgplugin.cpp
+++ b/src/kernel/qgplugin.cpp
@@ -38,7 +38,7 @@
 
 #include "ntqgplugin.h"
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 #include 
 
@@ -69,4 +69,4 @@ void TQGPlugin::setIface( TQUnknownInterface *iface )
     _iface = iface;
 }
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
diff --git a/src/kernel/qiconset.cpp b/src/kernel/qiconset.cpp
index 2ba52a7b8..fa571c5d0 100644
--- a/src/kernel/qiconset.cpp
+++ b/src/kernel/qiconset.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqiconset.h"
 
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 
 #include "ntqapplication.h"
 #include "ntqbitmap.h"
@@ -946,4 +946,4 @@ void TQIconFactory::installDefaultFactory( TQIconFactory *factory )
     q_cleanup_icon_factory.set( &defaultFac );
 }
 
-#endif // QT_NO_ICONSET
+#endif // TQT_NO_ICONSET
diff --git a/src/kernel/qimage.cpp b/src/kernel/qimage.cpp
index ab42e188b..2f7038bbf 100644
--- a/src/kernel/qimage.cpp
+++ b/src/kernel/qimage.cpp
@@ -64,8 +64,8 @@
 #endif
 
 // 16bpp images on supported on TQt/Embedded
-#if !defined( Q_WS_QWS ) && !defined(QT_NO_IMAGE_16_BIT)
-#define QT_NO_IMAGE_16_BIT
+#if !defined( Q_WS_QWS ) && !defined(TQT_NO_IMAGE_16_BIT)
+#define TQT_NO_IMAGE_16_BIT
 #endif
 
 
@@ -246,7 +246,7 @@
 #pragma message disable narrowptr
 #endif
 
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
 class TQImageDataMisc {
 public:
     TQImageDataMisc() { }
@@ -286,7 +286,7 @@ public:
 
     TQMap text_lang;
 };
-#endif // QT_NO_IMAGE_TEXT
+#endif // TQT_NO_IMAGE_TEXT
 
 
 
@@ -372,7 +372,7 @@ TQImage::TQImage( const TQSize& size, int depth, int numColors, Endian bitOrder
     create( size, depth, numColors, bitOrder );
 }
 
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 /*!
     Constructs an image and tries to load the image from the file \a
     fileName.
@@ -397,7 +397,7 @@ TQImage::TQImage( const TQString &fileName, const char* format )
     load( fileName, format );
 }
 
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
 // helper
 static void read_xpm_image_or_array( TQImageIO *, const char * const *, TQImage & );
 #endif
@@ -424,7 +424,7 @@ static void read_xpm_image_or_array( TQImageIO *, const char * const *, TQImage
 TQImage::TQImage( const char * const xpm[] )
 {
     init();
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
     read_xpm_image_or_array( 0, xpm, *this );
 #else
     // We use a tqFatal rather than disabling the whole function, as this
@@ -447,7 +447,7 @@ TQImage::TQImage( const TQByteArray &array )
     init();
     loadFromData(array);
 }
-#endif //QT_NO_IMAGEIO
+#endif //TQT_NO_IMAGEIO
 
 
 /*!
@@ -582,7 +582,7 @@ TQImage::~TQImage()
 
   \sa TQMimeSourceFactory, TQImage::fromMimeSource(), TQImageDrag::decode()
 */
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 TQImage TQImage::fromMimeSource( const TQString &abs_name )
 {
     const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( abs_name );
@@ -680,7 +680,7 @@ TQImage TQImage::copy() const
 	image.data->dpmx = dotsPerMeterX();
 	image.data->dpmy = dotsPerMeterY();
 	image.data->offset = offset();
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
 	if ( data->misc ) {
 	    image.data->misc = new TQImageDataMisc;
 	    *image.data->misc = misc();
@@ -747,7 +747,7 @@ TQImage TQImage::copy(int x, int y, int w, int h, int conversion_flags) const
     image.data->dpmx = dotsPerMeterX();
     image.data->dpmy = dotsPerMeterY();
     image.data->offset = offset();
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     if ( data->misc ) {
         image.data->misc = new TQImageDataMisc;
         *image.data->misc = misc();
@@ -960,7 +960,7 @@ void TQImage::reset()
 {
     freeBits();
     setNumColors( 0 );
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     delete data->misc;
 #endif
     reinit();
@@ -1005,7 +1005,7 @@ void TQImage::fill( uint pixel )
 	int bpl = bytesPerLine();
 	for ( int i=0; ibits = 0;
     data->bitordr = TQImage::IgnoreEndian;
     data->alpha = FALSE;
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     data->misc = 0;
 #endif
     data->dpmx = 0;
@@ -1382,7 +1382,7 @@ void TQImage::freeBits()
 //
 // if dithering is needed, only 1 color at most is available for alpha.
 //
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
 struct TQRgbMap {
     TQRgbMap() : rgb(0xffffffff) { }
     bool used() const { return rgb!=0xffffffff; }
@@ -1649,7 +1649,7 @@ static bool convert_32_to_8( const TQImage *src, TQImage *dst, int conversion_fl
 	    }
 	}
 
-#ifndef QT_NO_IMAGE_DITHER_TO_1
+#ifndef TQT_NO_IMAGE_DITHER_TO_1
 	if ( src->hasAlphaBuffer() ) {
 	    const int trans = 216;
 	    dst->setColor(trans, 0x00000000);	// transparent
@@ -1737,7 +1737,7 @@ static bool convert_1_to_32( const TQImage *src, TQImage *dst )
     }
     return TRUE;
 }
-#endif // QT_NO_IMAGE_TRUECOLOR
+#endif // TQT_NO_IMAGE_TRUECOLOR
 
 static bool convert_1_to_8( const TQImage *src, TQImage *dst )
 {
@@ -1776,7 +1776,7 @@ static bool convert_1_to_8( const TQImage *src, TQImage *dst )
     return TRUE;
 }
 
-#ifndef QT_NO_IMAGE_DITHER_TO_1
+#ifndef TQT_NO_IMAGE_DITHER_TO_1
 //
 // dither_to_1:  Uses selected dithering algorithm.
 //
@@ -1843,7 +1843,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst,
 	if ( use_gray ) {			// 8 bit image
 	    while ( p < end )
 		*b2++ = gray[*p++];
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
 	} else {				// 32 bit image
 	    if ( fromalpha ) {
 		while ( p < end ) {
@@ -1869,7 +1869,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst,
 		if ( use_gray ) {		// 8 bit image
 		    while ( p < end )
 			*b2++ = gray[*p++];
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
 		} else {			// 24 bit image
 		    if ( fromalpha ) {
 			while ( p < end ) {
@@ -1948,7 +1948,7 @@ static bool dither_to_1( const TQImage *src, TQImage *dst,
 
 	dst->fill( 0 );
 	uchar** mline = dst->jumpTable();
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
 	if ( d == 32 ) {
 	    uint** line = (uint**)src->jumpTable();
 	    for ( int i=0; ijumpTable();
 	    for ( int i=0; ifill( 0 );
 	uchar** mline = dst->jumpTable();
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
 	if ( d == 32 ) {
 	    uint** line = (uint**)src->jumpTable();
 	    for ( int i=0; ijumpTable();
 	    for ( int i=0; id == depth )
 	image = *this;				// no conversion
-#ifndef QT_NO_IMAGE_DITHER_TO_1
+#ifndef TQT_NO_IMAGE_DITHER_TO_1
     else if ( (data->d == 8 || data->d == 32) && depth == 1 ) // dither
 	dither_to_1( this, &image, conversion_flags, FALSE );
 #endif
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
     else if ( data->d == 32 && depth == 8 )	// 32 -> 8
 	convert_32_to_8( this, &image, conversion_flags );
     else if ( data->d == 8 && depth == 32 )	// 8 -> 32
@@ -2145,11 +2145,11 @@ TQImage TQImage::convertDepth( int depth, int conversion_flags ) const
 #endif
     else if ( data->d == 1 && depth == 8 )	// 1 -> 8
 	convert_1_to_8( this, &image );
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
     else if ( data->d == 1 && depth == 32 )	// 1 -> 32
 	convert_1_to_32( this, &image );
 #endif
-#ifndef QT_NO_IMAGE_16_BIT
+#ifndef TQT_NO_IMAGE_16_BIT
     else if ( data->d == 16 && depth != 16 ) {
 	TQImage tmp;
 	convert_16_to_32( this, &tmp );
@@ -2219,8 +2219,8 @@ int TQImage::pixelIndex( int x, int y ) const
 	    return (*(s + (x >> 3)) >> (7- (x & 7))) & 1;
     case 8:
 	return (int)s[x];
-#ifndef QT_NO_IMAGE_TRUECOLOR
-#ifndef QT_NO_IMAGE_16_BIT
+#ifndef TQT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_16_BIT
     case 16:
 #endif
     case 32:
@@ -2229,7 +2229,7 @@ int TQImage::pixelIndex( int x, int y ) const
 		 "(no palette)", depth() );
 #endif
 	return 0;
-#endif //QT_NO_IMAGE_TRUECOLOR
+#endif //TQT_NO_IMAGE_TRUECOLOR
     }
     return 0;
 }
@@ -2261,11 +2261,11 @@ TQRgb TQImage::pixel( int x, int y ) const
 	    return color( (*(s + (x >> 3)) >> (7- (x & 7))) & 1 );
     case 8:
 	return color( (int)s[x] );
-#ifndef QT_NO_IMAGE_16_BIT
+#ifndef TQT_NO_IMAGE_16_BIT
     case 16:
 	return qt_conv16ToRgb(((ushort*)s)[x]);
 #endif
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
     case 32:
 	return ((TQRgb*)s)[x];
 #endif
@@ -2324,12 +2324,12 @@ void TQImage::setPixel( int x, int y, uint index_or_rgb )
 	}
 	uchar * s = scanLine( y );
 	s[x] = index_or_rgb;
-#ifndef QT_NO_IMAGE_16_BIT
+#ifndef TQT_NO_IMAGE_16_BIT
     } else if ( depth() == 16 ) {
 	ushort * s = (ushort*)scanLine( y );
 	s[x] = qt_convRgbTo16(index_or_rgb);
 #endif
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
     } else if ( depth() == 32 ) {
 	TQRgb * s = (TQRgb*)scanLine( y );
 	s[x] = index_or_rgb;
@@ -2392,14 +2392,14 @@ bool isGray(TQRgb c)
 */
 bool TQImage::allGray() const
 {
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
     if (depth()==32) {
 	int p = width()*height();
 	TQRgb* b = (TQRgb*)bits();
 	while (p--)
 	    if (!isGray(*b++))
 		return FALSE;
-#ifndef QT_NO_IMAGE_16_BIT
+#ifndef TQT_NO_IMAGE_16_BIT
     } else if (depth()==16) {
 	int p = width()*height();
 	ushort* b = (ushort*)bits();
@@ -2408,7 +2408,7 @@ bool TQImage::allGray() const
 		return FALSE;
 #endif
     } else
-#endif //QT_NO_IMAGE_TRUECOLOR
+#endif //TQT_NO_IMAGE_TRUECOLOR
 	{
 	if (!data->ctbl) return TRUE;
 	for (int i=0; ictbl[i] != tqRgb(i,i,i))
@@ -2448,7 +2448,7 @@ bool TQImage::isGrayscale() const
     return FALSE;
 }
 
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
 static
 void pnmscale(const TQImage& src, TQImage& dst)
 {
@@ -2738,7 +2738,7 @@ void pnmscale(const TQImage& src, TQImage& dst)
 	be larger than the requested size.
 */
 
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
 /*!
     Returns a smoothly scaled copy of the image. The returned image
     has a size of width \a w by height \a h pixels if \a mode is \c
@@ -2779,7 +2779,7 @@ TQImage TQImage::smoothScale( int w, int h, ScaleMode mode ) const
 }
 #endif
 
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
 /*!
     \overload
 
@@ -2837,7 +2837,7 @@ TQImage TQImage::smoothScale( const TQSize& s, ScaleMode mode ) const
 
     \sa scaleWidth() scaleHeight() smoothScale() xForm()
 */
-#ifndef QT_NO_IMAGE_TRANSFORMATION
+#ifndef TQT_NO_IMAGE_TRANSFORMATION
 TQImage TQImage::scale( int w, int h, ScaleMode mode ) const
 {
     return scale( TQSize( w, h ), mode );
@@ -2849,7 +2849,7 @@ TQImage TQImage::scale( int w, int h, ScaleMode mode ) const
 
     The requested size of the image is \a s.
 */
-#ifndef QT_NO_IMAGE_TRANSFORMATION
+#ifndef TQT_NO_IMAGE_TRANSFORMATION
 TQImage TQImage::scale( const TQSize& s, ScaleMode mode ) const
 {
     if ( isNull() ) {
@@ -2887,7 +2887,7 @@ TQImage TQImage::scale( const TQSize& s, ScaleMode mode ) const
 
     \sa scale() scaleHeight() smoothScale() xForm()
 */
-#ifndef QT_NO_IMAGE_TRANSFORMATION
+#ifndef TQT_NO_IMAGE_TRANSFORMATION
 TQImage TQImage::scaleWidth( int w ) const
 {
     if ( isNull() ) {
@@ -2916,7 +2916,7 @@ TQImage TQImage::scaleWidth( int w ) const
 
     \sa scale() scaleWidth() smoothScale() xForm()
 */
-#ifndef QT_NO_IMAGE_TRANSFORMATION
+#ifndef TQT_NO_IMAGE_TRANSFORMATION
 TQImage TQImage::scaleHeight( int h ) const
 {
     if ( isNull() ) {
@@ -2946,7 +2946,7 @@ TQImage TQImage::scaleHeight( int h ) const
 
     \sa scale() TQPixmap::xForm() TQPixmap::trueMatrix() TQWMatrix
 */
-#ifndef QT_NO_IMAGE_TRANSFORMATION
+#ifndef TQT_NO_IMAGE_TRANSFORMATION
 TQImage TQImage::xForm( const TQWMatrix &matrix ) const
 {
     // This function uses the same algorithm as (and steals quite some
@@ -3054,7 +3054,7 @@ TQImage TQImage::xForm( const TQWMatrix &matrix ) const
 
     \sa createHeuristicMask() hasAlphaBuffer() setAlphaBuffer()
 */
-#ifndef QT_NO_IMAGE_DITHER_TO_1
+#ifndef TQT_NO_IMAGE_DITHER_TO_1
 TQImage TQImage::createAlphaMask( int conversion_flags ) const
 {
     if ( conversion_flags == 1 ) {
@@ -3078,7 +3078,7 @@ TQImage TQImage::createAlphaMask( int conversion_flags ) const
 }
 #endif
 
-#ifndef QT_NO_IMAGE_HEURISTIC_MASK
+#ifndef TQT_NO_IMAGE_HEURISTIC_MASK
 /*!
     Creates and returns a 1-bpp heuristic mask for this image. It
     works by selecting a color from one of the corners, then chipping
@@ -3190,9 +3190,9 @@ TQImage TQImage::createHeuristicMask( bool clipTight ) const
 
     return m;
 }
-#endif //QT_NO_IMAGE_HEURISTIC_MASK
+#endif //TQT_NO_IMAGE_HEURISTIC_MASK
 
-#ifndef QT_NO_IMAGE_MIRROR
+#ifndef TQT_NO_IMAGE_MIRROR
 /*
   This code is contributed by Philipp Lang,
   GeneriCom Software Germany (www.generi.com)
@@ -3238,8 +3238,8 @@ TQImage TQImage::mirror(bool horizontal, bool vertical) const
 		dsl[dx] = ssl[sx];
 	}
     }
-#ifndef QT_NO_IMAGE_TRUECOLOR
-#ifndef QT_NO_IMAGE_16_BIT
+#ifndef TQT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_16_BIT
     // 16 bit
     else if (depth() == 16) {
 	for (int sy = 0; sy < h; sy++, dy += dyi) {
@@ -3309,7 +3309,7 @@ TQImage TQImage::mirror() const
 {
     return mirror(FALSE,TRUE);
 }
-#endif //QT_NO_IMAGE_MIRROR
+#endif //TQT_NO_IMAGE_MIRROR
 
 /*!
     Returns a TQImage in which the values of the red and blue
@@ -3321,7 +3321,7 @@ TQImage TQImage::swapRGB() const
 {
     TQImage res = copy();
     if ( !isNull() ) {
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
 	if ( depth() == 32 ) {
 	    for ( int i=0; i < height(); i++ ) {
 		uint *p = (uint*)scanLine( i );
@@ -3334,12 +3334,12 @@ TQImage TQImage::swapRGB() const
 		    q++;
 		}
 	    }
-#ifndef QT_NO_IMAGE_16_BIT
+#ifndef TQT_NO_IMAGE_16_BIT
 	} else if ( depth() == 16 ) {
 	    tqWarning( "TQImage::swapRGB not implemented for 16bpp" );
 #endif
 	} else
-#endif //QT_NO_IMAGE_TRUECOLOR
+#endif //TQT_NO_IMAGE_TRUECOLOR
 	    {
 	    uint* p = (uint*)colorTable();
 	    uint* q = (uint*)res.colorTable();
@@ -3356,7 +3356,7 @@ TQImage TQImage::swapRGB() const
     return res;
 }
 
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 /*!
     Returns a string that specifies the image format of the file \a
     fileName, or 0 if the file cannot be read or if the format is not
@@ -3384,7 +3384,7 @@ TQStrList TQImage::inputFormats()
 {
     return TQImageIO::inputFormats();
 }
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 /*!
     Returns a list of image formats that are supported for image
     input.
@@ -3429,7 +3429,7 @@ TQStringList TQImage::outputFormatList()
 {
     return TQStringList::fromStrList(TQImageIO::outputFormats());
 }
-#endif //QT_NO_STRINGLIST
+#endif //TQT_NO_STRINGLIST
 
 /*!
     Returns a list of image formats that are supported for image
@@ -3568,12 +3568,12 @@ bool TQImage::doImageIO( TQImageIO* io, int quality ) const
 	io->setQuality( TQMIN(quality,100) );
     return io->write();
 }
-#endif //QT_NO_IMAGEIO
+#endif //TQT_NO_IMAGEIO
 
 /*****************************************************************************
   TQImage stream functions
  *****************************************************************************/
-#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO)
+#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO)
 /*!
     \relates TQImage
 
@@ -3640,31 +3640,31 @@ TQDataStream &operator>>( TQDataStream &s, TQImage &image )
  *****************************************************************************/
 
 // standard image io handlers (defined below)
-#ifndef QT_NO_IMAGEIO_BMP
+#ifndef TQT_NO_IMAGEIO_BMP
 static void read_bmp_image( TQImageIO * );
 static void write_bmp_image( TQImageIO * );
 #endif
-#ifndef QT_NO_IMAGEIO_PPM
+#ifndef TQT_NO_IMAGEIO_PPM
 static void read_pbm_image( TQImageIO * );
 static void write_pbm_image( TQImageIO * );
 #endif
-#ifndef QT_NO_IMAGEIO_XBM
+#ifndef TQT_NO_IMAGEIO_XBM
 static void read_xbm_image( TQImageIO * );
 static void write_xbm_image( TQImageIO * );
 #endif
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
 static void read_xpm_image( TQImageIO * );
 static void write_xpm_image( TQImageIO * );
 #endif
 
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
 static void read_async_image( TQImageIO * ); // Not in table of handlers
 #endif
 
 /*****************************************************************************
   Misc. utility functions
  *****************************************************************************/
-#if !defined(QT_NO_IMAGEIO_XPM) || !defined(QT_NO_IMAGEIO_XBM)
+#if !defined(TQT_NO_IMAGEIO_XPM) || !defined(TQT_NO_IMAGEIO_XBM)
 static TQString fbname( const TQString &fileName ) // get file basename (sort of)
 {
     TQString s = fileName;
@@ -3687,7 +3687,7 @@ static TQString fbname( const TQString &fileName ) // get file basename (sort of
 }
 #endif
 
-#ifndef QT_NO_IMAGEIO_BMP
+#ifndef TQT_NO_IMAGEIO_BMP
 static void swapPixel01( TQImage *image )	// 1-bpp: swap 0 and 1 pixels
 {
     int i;
@@ -3756,7 +3756,7 @@ static void swapPixel01( TQImage *image )	// 1-bpp: swap 0 and 1 pixels
     \sa TQImage TQPixmap TQFile TQMovie
 */
 
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 struct TQImageIOData
 {
     const char *parameters;
@@ -3855,7 +3855,7 @@ TQImageHandler::TQImageHandler( const char *f, const char *h, const TQCString& f
 
 typedef TQPtrList TQIHList;// list of image handlers
 static TQIHList *imageHandlers = 0;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 static TQPluginManager *plugin_manager = 0;
 #else
 static void *plugin_manager = 0;
@@ -3863,7 +3863,7 @@ static void *plugin_manager = 0;
 
 void tqt_init_image_plugins()
 {
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     if ( plugin_manager )
 	return;
 
@@ -3887,7 +3887,7 @@ static void cleanup()
     // make sure that image handlers are delete before plugin manager
     delete imageHandlers;
     imageHandlers = 0;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     delete plugin_manager;
     plugin_manager = 0;
 #endif
@@ -3900,11 +3900,11 @@ void tqt_init_image_handlers()		// initialize image handlers
 	TQ_CHECK_PTR( imageHandlers );
 	imageHandlers->setAutoDelete( TRUE );
 	tqAddPostRoutine( cleanup );
-#ifndef QT_NO_IMAGEIO_BMP
+#ifndef TQT_NO_IMAGEIO_BMP
 	TQImageIO::defineIOHandler( "BMP", "^BM", 0,
 				   read_bmp_image, write_bmp_image );
 #endif
-#ifndef QT_NO_IMAGEIO_PPM
+#ifndef TQT_NO_IMAGEIO_PPM
 	TQImageIO::defineIOHandler( "PBM", "^P1", "t",
 				   read_pbm_image, write_pbm_image );
 	TQImageIO::defineIOHandler( "PBMRAW", "^P4", "O",
@@ -3918,21 +3918,21 @@ void tqt_init_image_handlers()		// initialize image handlers
 	TQImageIO::defineIOHandler( "PPMRAW", "^P6", "O",
 				   read_pbm_image, write_pbm_image );
 #endif
-#ifndef QT_NO_IMAGEIO_XBM
+#ifndef TQT_NO_IMAGEIO_XBM
 	TQImageIO::defineIOHandler( "XBM", "^((/\\*(?!.XPM.\\*/))|#define)", "T",
 				   read_xbm_image, write_xbm_image );
 #endif
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
 	TQImageIO::defineIOHandler( "XPM", "/\\*.XPM.\\*/", "T",
 				   read_xpm_image, write_xpm_image );
 #endif
-#ifndef QT_NO_IMAGEIO_MNG
+#ifndef TQT_NO_IMAGEIO_MNG
 	qInitMngIO();
 #endif
-#ifndef QT_NO_IMAGEIO_PNG
+#ifndef TQT_NO_IMAGEIO_PNG
 	qInitPngIO();
 #endif
-#ifndef QT_NO_IMAGEIO_JPEG
+#ifndef TQT_NO_IMAGEIO_JPEG
 	qInitJpegIO();
 #endif
     }
@@ -4310,7 +4310,7 @@ const char *TQImageIO::imageFormat( TQIODevice *d )
 	}
     }
     d->at( pos );				// restore position
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
     if ( !format )
 	format = TQImageDecoder::formatName( (uchar*)buf2, rdlen );
 #endif
@@ -4329,7 +4329,7 @@ TQStrList TQImageIO::inputFormats()
     tqt_init_image_handlers();
     tqt_init_image_plugins();
 
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
     // Include asynchronous loaders first.
     result = TQImageDecoder::inputFormats();
 #endif
@@ -4451,7 +4451,7 @@ bool TQImageIO::read()
     if ( h && h->read_image ) {
 	(*h->read_image)( this );
     }
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
     else {
 	// Format name, but no handler - must be an asychronous reader
 	read_async_image( this );
@@ -4524,9 +4524,9 @@ bool TQImageIO::write()
     }
     return iostat == 0;				// image successfully written?
 }
-#endif //QT_NO_IMAGEIO
+#endif //TQT_NO_IMAGEIO
 
-#ifndef QT_NO_IMAGEIO_BMP
+#ifndef TQT_NO_IMAGEIO_BMP
 
 /*****************************************************************************
   BMP (DIB) image read/write functions
@@ -5115,9 +5115,9 @@ static void write_bmp_image( TQImageIO *iio )
 
 }
 
-#endif // QT_NO_IMAGEIO_BMP
+#endif // TQT_NO_IMAGEIO_BMP
 
-#ifndef QT_NO_IMAGEIO_PPM
+#ifndef TQT_NO_IMAGEIO_PPM
 
 /*****************************************************************************
   PBM/PGM/PPM (ASCII and RAW) image read/write functions
@@ -5423,9 +5423,9 @@ static void write_pbm_image( TQImageIO *iio )
     iio->setStatus(0);
 }
 
-#endif // QT_NO_IMAGEIO_PPM
+#endif // TQT_NO_IMAGEIO_PPM
 
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
 
 class TQImageIOFrameGrabber : public TQImageConsumer {
 public:
@@ -5493,9 +5493,9 @@ static void read_async_image( TQImageIO *iio )
     delete consumer;
 }
 
-#endif // QT_NO_ASYNC_IMAGE_IO
+#endif // TQT_NO_ASYNC_IMAGE_IO
 
-#ifndef QT_NO_IMAGEIO_XBM
+#ifndef TQT_NO_IMAGEIO_XBM
 
 /*****************************************************************************
   X bitmap image read/write functions
@@ -5651,10 +5651,10 @@ static void write_xbm_image( TQImageIO *iio )
     delete [] buf;
 }
 
-#endif // QT_NO_IMAGEIO_XBM
+#endif // TQT_NO_IMAGEIO_XBM
 
 
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
 
 /*****************************************************************************
   XPM image read/write functions
@@ -5993,7 +5993,7 @@ static void write_xpm_image( TQImageIO * iio )
     iio->setStatus( 0 );
 }
 
-#endif // QT_NO_IMAGEIO_XPM
+#endif // TQT_NO_IMAGEIO_XPM
 
 /*!
     Returns an image with depth \a d, using the \a palette_count
@@ -6013,7 +6013,7 @@ static void write_xpm_image( TQImageIO * iio )
 
     \sa TQt::ImageConversionFlags
 */
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
 TQImage TQImage::convertDepthWithPalette( int d, TQRgb* palette, int palette_count, int conversion_flags ) const
 {
     if ( depth() == 1 ) {
@@ -6096,7 +6096,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src,
 	{
 	    // easy to copy
 	} else if ( dst->depth() != 32 ) {
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
 
 	    TQImage dstconv = dst->convertDepth( 32 );
 	    bitBlt( &dstconv, dx, dy, src, sx, sy, sw, sh,
@@ -6180,7 +6180,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src,
 	    }
 	}
 	break;
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef TQT_NO_IMAGE_TRUECOLOR
     case 32:
 	if ( src->hasAlphaBuffer() ) {
 	    TQRgb* d = (TQRgb*)dst->scanLine(dy) + dx;
@@ -6232,7 +6232,7 @@ void bitBlt( TQImage* dst, int dx, int dy, const TQImage* src,
 	    }
 	}
 	break;
-#endif // QT_NO_IMAGE_TRUECOLOR
+#endif // TQT_NO_IMAGE_TRUECOLOR
     }
 }
 
@@ -6353,7 +6353,7 @@ void TQImage::setOffset(const TQPoint& p)
 {
     data->offset = p;
 }
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
 /*!
     \internal
 
@@ -6471,7 +6471,7 @@ void TQImage::setText(const char* key, const char* lang, const TQString& s)
     misc().text_lang.replace(x,s);
 }
 
-#endif // QT_NO_IMAGE_TEXT
+#endif // TQT_NO_IMAGE_TEXT
 
 #ifdef Q_WS_QWS
 /*!
diff --git a/src/kernel/qimageformatinterface_p.h b/src/kernel/qimageformatinterface_p.h
index 6d53be874..6d184ecf3 100644
--- a/src/kernel/qimageformatinterface_p.h
+++ b/src/kernel/qimageformatinterface_p.h
@@ -59,7 +59,7 @@
 //
 //
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 // {04903F05-54B1-4726-A849-FB5CB097CA87} 
 #ifndef IID_QImageFormat
@@ -76,6 +76,6 @@ struct Q_EXPORT TQImageFormatInterface : public TQFeatureListInterface
     virtual TQRESULT installIOHandler( const TQString & ) = 0;
 };
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
 
 #endif // TQIMAGEFORMATINTERFACE_P_H
diff --git a/src/kernel/qimageformatplugin.cpp b/src/kernel/qimageformatplugin.cpp
index 101f09bc0..9ad42a427 100644
--- a/src/kernel/qimageformatplugin.cpp
+++ b/src/kernel/qimageformatplugin.cpp
@@ -37,7 +37,7 @@
 **********************************************************************/
 
 #include "ntqimageformatplugin.h"
-#ifndef QT_NO_IMAGEFORMATPLUGIN
+#ifndef TQT_NO_IMAGEFORMATPLUGIN
 #include "qimageformatinterface_p.h"
 #include "ntqimage.h"
 
@@ -181,4 +181,4 @@ bool TQImageFormatPlugin::saveImage( const TQString &format, const TQString &fil
     return FALSE;
 }
 
-#endif // QT_NO_IMAGEFORMATPLUGIN
+#endif // TQT_NO_IMAGEFORMATPLUGIN
diff --git a/src/kernel/qinputcontext.cpp b/src/kernel/qinputcontext.cpp
index 7d609fa2a..9533d3eb2 100644
--- a/src/kernel/qinputcontext.cpp
+++ b/src/kernel/qinputcontext.cpp
@@ -33,11 +33,11 @@
 **
 **********************************************************************/
 
-//#define QT_NO_IM_PREEDIT_RELOCATION
+//#define TQT_NO_IM_PREEDIT_RELOCATION
 
 #include "ntqinputcontext.h"
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 
 #include "qplatformdefs.h"
 
@@ -54,7 +54,7 @@ public:
     TQInputContextPrivate()
 	: holderWidget( 0 ), composingWidget( 0 ), hasFocus( FALSE ),
 	  isComposing( FALSE ) 
-#if !defined(QT_NO_IM_PREEDIT_RELOCATION)
+#if !defined(TQT_NO_IM_PREEDIT_RELOCATION)
 	  , preeditString( TQString::null ),
 	  cursorPosition( -1 ), selLength ( 0 )
 #endif
@@ -67,7 +67,7 @@ public:
 
     void updateComposingState( const TQString &text,
 			       int newCursorPosition, int newSelLength ) {
-#if !defined(QT_NO_IM_PREEDIT_RELOCATION)
+#if !defined(TQT_NO_IM_PREEDIT_RELOCATION)
 	preeditString = text;
 	cursorPosition = newCursorPosition;
 	selLength = newSelLength;
@@ -76,14 +76,14 @@ public:
 
     void resetComposingState() {
 	isComposing = FALSE;
-#if !defined(QT_NO_IM_PREEDIT_RELOCATION)
+#if !defined(TQT_NO_IM_PREEDIT_RELOCATION)
 	preeditString = TQString::null;
 	cursorPosition = -1;
 	selLength = 0;
 #endif
     }
 
-#if !defined(QT_NO_IM_PREEDIT_RELOCATION)
+#if !defined(TQT_NO_IM_PREEDIT_RELOCATION)
     TQString preeditString;
     int cursorPosition;
     int selLength;
@@ -281,7 +281,7 @@ public:
     method dependent submenus.
 
     \code
-    #ifndef QT_NO_IM
+    #ifndef TQT_NO_IM
         TQInputContext *qic = getInputContext();
         if ( qic )
             qic->addMenusTo( popup );
@@ -384,7 +384,7 @@ void TQInputContext::setFocusWidget( TQWidget *w )
 	}
 	d->composingWidget = w;  // changes recipient of TQIMEvent
 	if ( isPreeditRelocation == TRUE ) {
-#if !defined(QT_NO_IM_PREEDIT_RELOCATION)
+#if !defined(TQT_NO_IM_PREEDIT_RELOCATION)
 	    if ( isPreeditRelocationEnabled() ) {
 		// copy preedit state to the widget that gaining focus
 		sendIMEventInternal( TQEvent::IMStart );
diff --git a/src/kernel/qinputcontext_x11.cpp b/src/kernel/qinputcontext_x11.cpp
index 38a6ae155..e4d36af6b 100644
--- a/src/kernel/qinputcontext_x11.cpp
+++ b/src/kernel/qinputcontext_x11.cpp
@@ -38,7 +38,7 @@
 
 #include "ntqinputcontext.h"
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 
 #include "qplatformdefs.h"
 
diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index 037acad57..91df6f976 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqimage.h"
 
-#ifndef QT_NO_IMAGEIO_JPEG
+#ifndef TQT_NO_IMAGEIO_JPEG
 
 #include "ntqiodevice.h"
 #include "ntqjpegio.h"
diff --git a/src/kernel/qkeysequence.cpp b/src/kernel/qkeysequence.cpp
index 67cbe9fbb..00bdfd1f4 100644
--- a/src/kernel/qkeysequence.cpp
+++ b/src/kernel/qkeysequence.cpp
@@ -40,12 +40,12 @@
 
 #include "ntqkeysequence.h"
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 #include "ntqaccel.h"
 #include "ntqshared.h"
 #include "ntqvaluelist.h"
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 # include "ntqregexp.h"
 #endif
 
@@ -421,7 +421,7 @@ int TQKeySequence::decodeString( const TQString& str )
     for( TQValueList::iterator it = modifs.begin(); it != modifs.end(); ++it ) {
 	if ( sl.contains( (*it).name ) ) {
 	    ret |= (*it).qt_key;
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 	    accel.remove( TQRegExp(TQRegExp::escape((*it).name), FALSE) );
 #else
 	    accel.remove( (*it).name );
@@ -676,7 +676,7 @@ bool TQKeySequence::operator!= ( const TQKeySequence& keysequence ) const
 /*****************************************************************************
   TQKeySequence stream functions
  *****************************************************************************/
-#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO)
+#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO)
 /*!
     \relates TQKeySequence
 
@@ -731,6 +731,6 @@ TQDataStream &operator>>( TQDataStream &s, TQKeySequence &keysequence )
     return s;
 }
 
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
-#endif //QT_NO_ACCEL
+#endif //TQT_NO_ACCEL
diff --git a/src/kernel/qlayout.cpp b/src/kernel/qlayout.cpp
index 8a992e632..c32689fff 100644
--- a/src/kernel/qlayout.cpp
+++ b/src/kernel/qlayout.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqlayout.h"
 
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 
 #include "ntqapplication.h"
 #include "ntqwidget.h"
@@ -2602,4 +2602,4 @@ TQBoxLayout *TQBoxLayout::createTmpCopy()
     return bl;
 }
 
-#endif // QT_NO_LAYOUT
+#endif // TQT_NO_LAYOUT
diff --git a/src/kernel/qlayoutengine.cpp b/src/kernel/qlayoutengine.cpp
index 558d42671..c37811c32 100644
--- a/src/kernel/qlayoutengine.cpp
+++ b/src/kernel/qlayoutengine.cpp
@@ -41,7 +41,7 @@
 #include "ntqlayout.h"
 #include "private/qlayoutengine_p.h"
 
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 
 static inline int toFixed( int i ) { return i * 256; }
 static inline int fRound( int i ) {
@@ -319,4 +319,4 @@ Q_EXPORT TQSize qSmartMaxSize( TQWidget *w, int align )
     return qSmartMaxSize( &item, align );
 }
 
-#endif // QT_NO_LAYOUT
+#endif // TQT_NO_LAYOUT
diff --git a/src/kernel/qlayoutengine_p.h b/src/kernel/qlayoutengine_p.h
index 2e49891aa..ddff6cd29 100644
--- a/src/kernel/qlayoutengine_p.h
+++ b/src/kernel/qlayoutengine_p.h
@@ -63,7 +63,7 @@
 #include "ntqabstractlayout.h"
 #endif // QT_H
 
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 
 struct TQLayoutStruct
 {
@@ -125,5 +125,5 @@ static inline void qMaxExpCalc( TQCOORD & max, bool &exp,
     exp = exp || boxexp;
 }
 
-#endif //QT_NO_LAYOUT
+#endif //TQT_NO_LAYOUT
 #endif
diff --git a/src/kernel/qlocalfs.cpp b/src/kernel/qlocalfs.cpp
index 95ba0dc61..6932c4152 100644
--- a/src/kernel/qlocalfs.cpp
+++ b/src/kernel/qlocalfs.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqlocalfs.h"
 
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
 
 #include "ntqfileinfo.h"
 #include "ntqfile.h"
@@ -404,4 +404,4 @@ int TQLocalFs::calcBlockSize( int totalSize ) const
     return s;
 }
 
-#endif // QT_NO_NETWORKPROTOCOL
+#endif // TQT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/qlock.cpp b/src/kernel/qlock.cpp
index 49edf98ca..f8b8be467 100644
--- a/src/kernel/qlock.cpp
+++ b/src/kernel/qlock.cpp
@@ -38,7 +38,7 @@
 
 #include "qlock_p.h"
 
-#ifndef QT_NO_QWS_MULTIPROCESS
+#ifndef TQT_NO_QWS_MULTIPROCESS
 
 #include 
 #include 
@@ -112,7 +112,7 @@ public:
 
 TQLock::TQLock( const TQString &filename, char id, bool create )
 {
-#ifndef QT_NO_QWS_MULTIPROCESS
+#ifndef TQT_NO_QWS_MULTIPROCESS
     data = new TQLockData;
     data->count = 0;
 #ifdef Q_NO_SEMAPHORE
@@ -153,7 +153,7 @@ TQLock::TQLock( const TQString &filename, char id, bool create )
 
 TQLock::~TQLock()
 {
-#ifndef QT_NO_QWS_MULTIPROCESS
+#ifndef TQT_NO_QWS_MULTIPROCESS
     if ( locked() )
 	unlock();
 #ifdef Q_NO_SEMAPHORE
@@ -181,7 +181,7 @@ TQLock::~TQLock()
 
 bool TQLock::isValid() const
 {
-#ifndef QT_NO_QWS_MULTIPROCESS
+#ifndef TQT_NO_QWS_MULTIPROCESS
     return (data->id != -1);
 #else
     return TRUE;
@@ -202,7 +202,7 @@ bool TQLock::isValid() const
 
 void TQLock::lock( Type t )
 {
-#ifndef QT_NO_QWS_MULTIPROCESS
+#ifndef TQT_NO_QWS_MULTIPROCESS
     if ( !data->count ) {
 #ifdef Q_NO_SEMAPHORE
 	int op = LOCK_SH;
@@ -248,7 +248,7 @@ void TQLock::lock( Type t )
 
 void TQLock::unlock()
 {
-#ifndef QT_NO_QWS_MULTIPROCESS
+#ifndef TQT_NO_QWS_MULTIPROCESS
     if( data->count ) {
 	data->count--;
 	if( !data->count ) {
@@ -289,7 +289,7 @@ void TQLock::unlock()
 
 bool TQLock::locked() const
 {
-#ifndef QT_NO_QWS_MULTIPROCESS
+#ifndef TQT_NO_QWS_MULTIPROCESS
     return (data->count > 0);
 #else
     return FALSE;
diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index 90a8efa49..0165f7002 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -142,13 +142,13 @@ class TQMetaObjectPrivate
 {
 public:
     TQMetaObjectPrivate() :
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 	enumData(0), numEnumData(0),
 	propData(0),numPropData(0),
 	tqt_static_property(0),
 #endif
 	classInfo(0), numClassInfo(0) {}
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     const TQMetaEnum *enumData;
     int numEnumData;
     const TQMetaProperty *propData;
@@ -210,7 +210,7 @@ static int optDictSize( int n )
 TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_class,
 			  const TQMetaData *const slot_data, int n_slots,
 			  const TQMetaData *const signal_data, int n_signals,
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 			  const TQMetaProperty *const prop_data, int n_props,
 			  const TQMetaEnum *const enum_data, int n_enums,
 #endif
@@ -225,7 +225,7 @@ TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_cl
     d = new TQMetaObjectPrivate;
     reserved = 0;
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     d->propData = prop_data;
     d->numPropData = n_props;
     d->enumData = enum_data;
@@ -236,12 +236,12 @@ TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_cl
 
     signaloffset = superclass ? ( superclass->signalOffset() + superclass->numSignals() ) : 0;
     slotoffset = superclass ? ( superclass->slotOffset() + superclass->numSlots() ) : 0;
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     propertyoffset = superclass ? ( superclass->propertyOffset() + superclass->numProperties() ) : 0;
 #endif
 }
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 /*!\internal
  */
 TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_class,
@@ -468,7 +468,7 @@ TQMetaObject *TQMetaObject::new_metaobject( const char *classname,
 					  TQMetaObject *superclassobject,
 					  const TQMetaData * const slot_data, int n_slots,
 					  const TQMetaData * const signal_data, int n_signals,
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 					  const TQMetaProperty * const prop_data, int n_props,
 					  const TQMetaEnum * const enum_data, int n_enums,
 #endif
@@ -476,14 +476,14 @@ TQMetaObject *TQMetaObject::new_metaobject( const char *classname,
 {
     return new TQMetaObject( classname, superclassobject, slot_data, n_slots,
 			    signal_data, n_signals,
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 			    prop_data, n_props,
 			    enum_data, n_enums,
 #endif
 			    class_info, n_info );
 }
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 /*!\internal
  */
 TQMetaObject *TQMetaObject::new_metaobject( const char *classname,
@@ -565,7 +565,7 @@ const char* TQMetaObject::classInfo( const char* name, bool super ) const
     return superclass->classInfo( name, super );
 }
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 
 /*!
     Returns the number of properties for this class.
@@ -773,7 +773,7 @@ const TQMetaEnum* TQMetaObject::enumerator( const char* name, bool super ) const
     return superclass->enumerator( name, super );
 }
 
-#endif // QT_NO_PROPERTIES
+#endif // TQT_NO_PROPERTIES
 
 
 /*!
@@ -821,7 +821,7 @@ bool TQMetaObject::hasMetaObject( const char *class_name )
     return !!qt_metaobjects->find( class_name );
 }
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 /*! \internal
 
 ### this functions will go away. It exists purely for the sake of meta
@@ -1194,7 +1194,7 @@ bool TQMetaProperty::reset( TQObject* o ) const
   \internal
 */
 
-#endif // QT_NO_PROPERTIES
+#endif // TQT_NO_PROPERTIES
 
 /*
  * TQMetaObjectCleanUp is used as static global object in the moc-generated cpp
diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp
index 22857f3e0..1c8606373 100644
--- a/src/kernel/qmime.cpp
+++ b/src/kernel/qmime.cpp
@@ -38,7 +38,7 @@
 
 #include "ntqmime.h"
 
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 
 #include "ntqmap.h"
 #include "ntqstringlist.h"
@@ -109,7 +109,7 @@ void TQMimeSource::clearCache()
 */
 TQMimeSource::~TQMimeSource()
 {
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     extern void tqt_clipboard_cleanup_mime_source(TQMimeSource *);
     tqt_clipboard_cleanup_mime_source(this);
 #endif
@@ -616,4 +616,4 @@ void TQMimeSourceFactory::removeFactory( TQMimeSourceFactory *f )
     TQMimeSourceFactory::defaultFactory()->d->factories.removeRef( f );
 }
 
-#endif // QT_NO_MIME
+#endif // TQT_NO_MIME
diff --git a/src/kernel/qmngio.cpp b/src/kernel/qmngio.cpp
index fa3f9bd5b..fad1aa9b3 100644
--- a/src/kernel/qmngio.cpp
+++ b/src/kernel/qmngio.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdatetime.h"
 
-#ifndef QT_NO_IMAGEIO_MNG
+#ifndef TQT_NO_IMAGEIO_MNG
 
 #include "ntqimage.h"
 #include "ntqasyncimageio.h"
@@ -58,7 +58,7 @@
 #include 
 
 
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
 
 class TQMNGFormat : public TQImageFormat {
 public:
@@ -270,7 +270,7 @@ TQImageFormat* TQMNGFormatType::decoderFor( const uchar* buffer, int length )
      && buffer[5]==10
      && buffer[6]==26
      && buffer[7]==10)
-#ifdef QT_NO_IMAGEIO_PNG // if we don't have native PNG support use libmng
+#ifdef TQT_NO_IMAGEIO_PNG // if we don't have native PNG support use libmng
      || (buffer[0]==137 // PNG signature
      && buffer[1]=='P'
      && buffer[2]=='N'
@@ -433,9 +433,9 @@ int TQMNGFormat::decode( TQImage& img, TQImageConsumer* cons,
 
 static TQMNGFormatType* globalMngFormatTypeObject = 0;
 
-#endif // QT_NO_ASYNC_IMAGE_IO
+#endif // TQT_NO_ASYNC_IMAGE_IO
 
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
 void qCleanupMngIO()
 {
     if ( globalMngFormatTypeObject ) {
@@ -450,11 +450,11 @@ void qInitMngIO()
     static bool done = FALSE;
     if ( !done ) {
 	done = TRUE;
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
 	globalMngFormatTypeObject = new TQMNGFormatType;
 	tqAddPostRoutine( qCleanupMngIO );
 #endif
     }
 }
 
-#endif // QT_NO_IMAGEIO_MNG
+#endif // TQT_NO_IMAGEIO_MNG
diff --git a/src/kernel/qmotifdnd_x11.cpp b/src/kernel/qmotifdnd_x11.cpp
index 58f87e78b..a95ed8d54 100644
--- a/src/kernel/qmotifdnd_x11.cpp
+++ b/src/kernel/qmotifdnd_x11.cpp
@@ -70,7 +70,7 @@ in doc/dnd.doc, where the documentation system can see it. */
 
 #include "ntqapplication.h"
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 #include "ntqwidget.h"
 #include "qt_x11_p.h"
@@ -975,4 +975,4 @@ void qt_motifdnd_handle_msg( TQWidget * /* w */ , const XEvent * xe, bool /* pas
     }   //  end of switch ( dnd_data.reason )
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
diff --git a/src/kernel/qmovie.cpp b/src/kernel/qmovie.cpp
index 3c6e634ec..3b98849e1 100644
--- a/src/kernel/qmovie.cpp
+++ b/src/kernel/qmovie.cpp
@@ -50,7 +50,7 @@
 #include "ntqobject.h"
 #include "ntqpixmapcache.h"
 
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
 
 #ifdef Q_WS_QWS
 #include "qgfx_qws.h"
@@ -361,7 +361,7 @@ void TQMoviePrivate::updatePixmapFromImage(const TQPoint& off,
     // Convert to pixmap and paste that onto myself
     TQPixmap lines;
 
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_SPRINTF
     if (!(frameperiod < 0 && loop == -1)) {
         // its an animation, lets see if we converted
         // this frame already.
@@ -1078,4 +1078,4 @@ void TQMovie::disconnectStatus(TQObject* receiver, const char *member)
 
 #include "qmovie.moc"
 
-#endif	// QT_NO_MOVIE
+#endif	// TQT_NO_MOVIE
diff --git a/src/kernel/qnetworkprotocol.cpp b/src/kernel/qnetworkprotocol.cpp
index b41dd97b7..53cb69169 100644
--- a/src/kernel/qnetworkprotocol.cpp
+++ b/src/kernel/qnetworkprotocol.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqnetworkprotocol.h"
 
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
 
 #include "ntqlocalfs.h"
 #include "ntqurloperator.h"
diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 7156df6be..2ba77326d 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -88,14 +88,14 @@ class TQStyleControlElementDataPrivate {
 		bool isTQWidget;
 };
 
-#ifndef QT_NO_USERDATA
+#ifndef TQT_NO_USERDATA
 class TQObjectPrivate : public TQPtrVector
 #else
 class TQObjectPrivate {
 #endif
 {
 public:
-#ifndef QT_NO_USERDATA
+#ifndef TQT_NO_USERDATA
     TQObjectPrivate( uint s ) : TQPtrVector(s) {
         ownThread = NULL;
         disableThreadPostedEvents = false;
@@ -507,7 +507,7 @@ TQThread* TQObject::contextThreadObject() const
 
 #endif
 
-#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY
+#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY
 /*
   Preliminary signal spy
  */
@@ -550,7 +550,7 @@ static void qt_spy_signal( TQObject* sender, int signal, TQUObject* o )
 /*
   End Preliminary signal spy
  */
-#endif // QT_NO_PRELIMINARY_SIGNAL_SPY
+#endif // TQT_NO_PRELIMINARY_SIGNAL_SPY
 
 static TQObjectList* object_trees = 0;
 
@@ -1419,7 +1419,7 @@ static void objSearch( TQObjectList *result,
 	if ( ok ) {
 	    if ( objName )
 		ok = ( qstrcmp(objName,obj->name()) == 0 );
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 	    else if ( rx )
 		ok = ( rx->search(TQString::fromLatin1(obj->name())) != -1 );
 #endif
@@ -1542,7 +1542,7 @@ TQObjectList *TQObject::queryList( const char *inheritsClass,
     TQObjectList *list = new TQObjectList;
     TQ_CHECK_PTR( list );
     bool onlyWidgets = ( inheritsClass && qstrcmp(inheritsClass, "TQWidget") == 0 );
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     if ( regexpMatch && objName ) {		// regexp matching
 	TQRegExp rx(TQString::fromLatin1(objName));
 	objSearch( list, (TQObjectList *)children(), inheritsClass, onlyWidgets,
@@ -1583,7 +1583,7 @@ TQConnectionList *TQObject::receivers( const char* signal ) const
 
 TQConnectionList *TQObject::receivers( int signal ) const
 {
-#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY
+#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY
     if ( tqt_preliminary_signal_spy && signal >= 0 ) {
 	if ( !connections ) {
 	    TQObject* that = (TQObject*) this;
@@ -1901,7 +1901,7 @@ static void err_info_about_candidates( int code,
 
 const TQObject *TQObject::sender()
 {
-#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY
+#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY
     if ( this == tqt_preliminary_signal_spy ) {
 #  ifdef TQT_THREAD_SUPPORT
 	// protect access to qt_spy_signal_sender
@@ -2639,7 +2639,7 @@ TQMetaObject* TQObject::staticTQtMetaObject()
     if ( qtMetaObject )
 	return qtMetaObject;
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     static const TQMetaEnum::Item enum_0[] = {
 	{ "AlignLeft",  (int) TQt::AlignLeft },
 	{ "AlignRight",  (int) TQt::AlignRight },
@@ -2704,7 +2704,7 @@ TQMetaObject* TQObject::staticTQtMetaObject()
     qtMetaObject = new TQMetaObject( "TQt", 0,
 			  0, 0,
 			  0, 0,
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 			  0, 0,
 			  enum_tbl, 5,
 #endif
@@ -2723,7 +2723,7 @@ TQMetaObject* TQObject::staticTQtMetaObject()
   */
 void TQObject::activate_signal( int signal )
 {
-#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY
+#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY
     if ( tqt_preliminary_signal_spy ) {
 	if ( !signalsBlocked() && signal >= 0 &&
 	     ( !connections || !connections->at( signal ) ) ) {
@@ -2755,7 +2755,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
 	return;
     }
 
-#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY
+#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY
     if ( tqt_preliminary_signal_spy ) {
 	qt_spy_signal( this, connections->findRef( clist), o );
     }
@@ -2932,7 +2932,7 @@ void TQObject::activate_signal( TQConnectionList *clist, TQUObject *o )
   only a typedef it cannot be a simple overload.
 */
 
-#ifndef QT_NO_PRELIMINARY_SIGNAL_SPY
+#ifndef TQT_NO_PRELIMINARY_SIGNAL_SPY
 #define ACTIVATE_SIGNAL_WITH_PARAM(FNAME,TYPE)					\
 void TQObject::FNAME( int signal, TYPE param )					\
 {										\
@@ -3090,7 +3090,7 @@ void TQObject::dumpObjectInfo()
 #endif
 }
 
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 
 /*!
     Sets the value of the object's \a name property to \a value.
@@ -3177,9 +3177,9 @@ TQVariant TQObject::property( const char *name ) const
     return v;
 }
 
-#endif // QT_NO_PROPERTIES
+#endif // TQT_NO_PROPERTIES
 
-#ifndef QT_NO_USERDATA
+#ifndef TQT_NO_USERDATA
 /*!\internal
  */
 uint TQObject::registerUserData()
@@ -3214,4 +3214,4 @@ TQObjectUserData* TQObject::userData( uint id ) const
     return 0;
 }
 
-#endif // QT_NO_USERDATA
+#endif // TQT_NO_USERDATA
diff --git a/src/kernel/qpaintdevice_x11.cpp b/src/kernel/qpaintdevice_x11.cpp
index f3c1747c0..c64b3e90e 100644
--- a/src/kernel/qpaintdevice_x11.cpp
+++ b/src/kernel/qpaintdevice_x11.cpp
@@ -289,11 +289,11 @@ TQt::HANDLE TQPaintDevice::handle() const
 */
 TQt::HANDLE TQPaintDevice::x11RenderHandle() const
 {
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     return rendhd ? XftDrawPicture( (XftDraw *) rendhd ) : 0;
 #else
     return 0;
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 }
 
 
@@ -985,7 +985,7 @@ void bitBlt( TQPaintDevice *dst, int dx, int dy,
 	return;
     }
 
-#ifndef QT_NO_XRENDER
+#ifndef TQT_NO_XRENDER
     if (src_pm && !mono_src && src_pm->data->alphapm && !ignoreMask ) {
 	// use RENDER to do the blit
 	TQPixmap *alpha = src_pm->data->alphapm;
diff --git a/src/kernel/qpainter.cpp b/src/kernel/qpainter.cpp
index 0dad68364..d408a3df8 100644
--- a/src/kernel/qpainter.cpp
+++ b/src/kernel/qpainter.cpp
@@ -59,7 +59,7 @@
 #include "qtextlayout_p.h"
 #include "qfontengine_p.h"
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 typedef TQPtrStack TQWMatrixStack;
 #endif
 
@@ -554,7 +554,7 @@ TQPainter::~TQPainter()
 	killPStack();
     if ( tabarray )				// delete tab array
 	delete [] tabarray;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( wm_stack )
 	delete (TQWMatrixStack *)wm_stack;
 #endif
@@ -662,7 +662,7 @@ struct TQPState {				// painter state
     uchar	rop;
     TQPoint	bro;
     TQRect	wr, vr;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQWMatrix	wm;
 #else
     int		xlatex;
@@ -729,7 +729,7 @@ void TQPainter::save()
     ps->bgm   = bg_mode;
     ps->rop   = rop;
     ps->bro   = bro;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     ps->wr    = TQRect( wx, wy, ww, wh );
     ps->vr    = TQRect( vx, vy, vw, vh );
     ps->wm    = wxmat;
@@ -786,7 +786,7 @@ void TQPainter::restore()
 	setRasterOp( (RasterOp)ps->rop );
     if ( ps->bro != bro || hardRestore )
 	setBrushOrigin( ps->bro );
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQRect wr( wx, wy, ww, wh );
     TQRect vr( vx, vy, vw, vh );
     if ( ps->wr != wr || hardRestore )
@@ -813,7 +813,7 @@ void TQPainter::restore()
     tabstops = ps->ts;
     tabarray = ps->ta;
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( wm_stack )
 	delete (TQWMatrixStack *)wm_stack;
     wm_stack = ps->wm_stack;
@@ -1206,7 +1206,7 @@ void TQPainter::setTabArray( int *ta )
   TQPainter xform settings
  *****************************************************************************/
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 
 /*!
     Enables view transformations if \a enable is TRUE, or disables
@@ -1504,7 +1504,7 @@ void TQPainter::restoreWorldMatrix()
     delete m;
 }
 
-#endif // QT_NO_TRANSFORMATIONS
+#endif // TQT_NO_TRANSFORMATIONS
 
 /*!
     Translates the coordinate system by \a (dx, dy). After this call,
@@ -1528,7 +1528,7 @@ void TQPainter::restoreWorldMatrix()
 
 void TQPainter::translate( double dx, double dy )
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQWMatrix m;
     m.translate( dx, dy );
     setWorldMatrix( m, TRUE );
@@ -1540,7 +1540,7 @@ void TQPainter::translate( double dx, double dy )
 }
 
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 /*!
     Scales the coordinate system by \a (sx, sy).
 
@@ -1680,7 +1680,7 @@ void TQPainter::resetXForm()
     xlatey = 0;
     clearf( VxF );
 }
-#endif // QT_NO_TRANSFORMATIONS
+#endif // TQT_NO_TRANSFORMATIONS
 
 
 extern bool qt_old_transformations;
@@ -1692,7 +1692,7 @@ extern bool qt_old_transformations;
 
 void TQPainter::map( int x, int y, int *rx, int *ry ) const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( qt_old_transformations ) {
 	switch ( txop ) {
 	    case TxNone:
@@ -1751,7 +1751,7 @@ void TQPainter::map( int x, int y, int *rx, int *ry ) const
 void TQPainter::map( int x, int y, int w, int h,
 		    int *rx, int *ry, int *rw, int *rh ) const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( qt_old_transformations ) {
 	switch ( txop ) {
 	    case TxNone:
@@ -1818,7 +1818,7 @@ void TQPainter::map( int x, int y, int w, int h,
 
 void TQPainter::mapInv( int x, int y, int *rx, int *ry ) const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 #if defined(QT_CHECK_STATE)
     if ( !txinv )
 	tqWarning( "TQPainter::mapInv: Internal error" );
@@ -1847,7 +1847,7 @@ void TQPainter::mapInv( int x, int y, int *rx, int *ry ) const
 void TQPainter::mapInv( int x, int y, int w, int h,
 		       int *rx, int *ry, int *rw, int *rh ) const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 #if defined(QT_CHECK_STATE)
     if ( !txinv || txop == TxRotShear )
 	tqWarning( "TQPainter::mapInv: Internal error" );
@@ -1885,7 +1885,7 @@ void TQPainter::mapInv( int x, int y, int w, int h,
 
 TQPoint TQPainter::xForm( const TQPoint &pv ) const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( txop == TxNone )
 	return pv;
     int x=pv.x(), y=pv.y();
@@ -1910,7 +1910,7 @@ TQPoint TQPainter::xForm( const TQPoint &pv ) const
 
 TQRect TQPainter::xForm( const TQRect &rv ) const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( txop == TxNone )
 	return rv;
     if ( txop == TxRotShear ) {			// rotation/shear
@@ -1938,7 +1938,7 @@ TQRect TQPainter::xForm( const TQRect &rv ) const
 TQPointArray TQPainter::xForm( const TQPointArray &av ) const
 {
     TQPointArray a = av;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( txop != TxNone )
     {
 	return xmat * av;
@@ -1978,7 +1978,7 @@ TQPointArray TQPainter::xForm( const TQPointArray &av, int index,
     int lastPoint = npoints < 0 ? av.size() : index+npoints;
     TQPointArray a( lastPoint-index );
     memcpy( a.data(), av.data()+index, (lastPoint-index)*sizeof( TQPoint ) );
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     return xmat*a;
 #else
     a.translate( xlatex, xlatey );
@@ -1997,7 +1997,7 @@ TQPointArray TQPainter::xForm( const TQPointArray &av, int index,
 
 TQPoint TQPainter::xFormDev( const TQPoint &pd ) const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( txop == TxNone )
 	return pd;
     if ( !txinv ) {
@@ -2022,7 +2022,7 @@ TQPoint TQPainter::xFormDev( const TQPoint &pd ) const
 
 TQRect TQPainter::xFormDev( const TQRect &rd ) const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( txop == TxNone )
 	return rd;
     if ( !txinv ) {
@@ -2051,7 +2051,7 @@ TQRect TQPainter::xFormDev( const TQRect &rd ) const
 
 TQPointArray TQPainter::xFormDev( const TQPointArray &ad ) const
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( txop == TxNone )
 	return ad;
     if ( !txinv ) {
@@ -2094,7 +2094,7 @@ TQPointArray TQPainter::xFormDev( const TQPointArray &ad, int index,
     int lastPoint = npoints < 0 ? ad.size() : index+npoints;
     TQPointArray a( lastPoint-index );
     memcpy( a.data(), ad.data()+index, (lastPoint-index)*sizeof( TQPoint ) );
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     if ( txop == TxNone )
 	return a;
     if ( !txinv ) {
@@ -2174,7 +2174,7 @@ TQRegion TQPainter::clipRegion( CoordinateMode m ) const
     // If the transformation mode is CoordPainter, we should transform the
     // clip region with painter transformations.
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQRegion r;
     if ( m == CoordDevice ) {
 	r = crgn;
@@ -2315,7 +2315,7 @@ void TQPainter::drawPixmap( const TQPoint &p, const TQPixmap &pm )
     drawPixmap( p.x(), p.y(), pm, 0, 0, pm.width(), pm.height() );
 }
 
-#if !defined(QT_NO_IMAGE_SMOOTHSCALE) || !defined(QT_NO_PIXMAP_TRANSFORMATION)
+#if !defined(TQT_NO_IMAGE_SMOOTHSCALE) || !defined(TQT_NO_PIXMAP_TRANSFORMATION)
 
 /*!
     \overload
@@ -2358,19 +2358,19 @@ void TQPainter::drawPixmap( const TQRect &r, const TQPixmap &pm )
     TQPixmap pixmap = pm;
 
     if ( scale ) {
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
-# ifndef QT_NO_PIXMAP_TRANSFORMATION
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
+# ifndef TQT_NO_PIXMAP_TRANSFORMATION
 	if ( smooth )
 # endif
 	{
 	    TQImage i = pm.convertToImage();
 	    pixmap = TQPixmap( i.smoothScale( rw, rh ) );
 	}
-# ifndef QT_NO_PIXMAP_TRANSFORMATION
+# ifndef TQT_NO_PIXMAP_TRANSFORMATION
 	else
 # endif
 #endif
-#ifndef QT_NO_PIXMAP_TRANSFORMATION
+#ifndef TQT_NO_PIXMAP_TRANSFORMATION
 	{
 	    pixmap = pm.xForm( TQWMatrix( scaleX, 0, 0, scaleY, 0, 0 ) );
 	}
@@ -2419,7 +2419,7 @@ void TQPainter::drawImage( int x, int y, const TQImage & image,
 {
 #ifdef Q_WS_QWS
     //### Hackish
-# ifndef QT_NO_TRANSFORMATIONS
+# ifndef TQT_NO_TRANSFORMATIONS
     if ( !image.isNull() && gfx &&
 	(txop==TxNone||txop==TxTranslate) && !testf(ExtDev) )
 # else
@@ -2525,7 +2525,7 @@ void TQPainter::drawImage( const TQPoint & p, const TQImage & i,
     drawImage(p, i, i.rect(), conversion_flags);
 }
 
-#if !defined(QT_NO_IMAGE_TRANSFORMATION) || !defined(QT_NO_IMAGE_SMOOTHSCALE)
+#if !defined(TQT_NO_IMAGE_TRANSFORMATION) || !defined(TQT_NO_IMAGE_SMOOTHSCALE)
 
 /*!
     \overload
@@ -2570,9 +2570,9 @@ void TQPainter::drawImage( const TQRect &r, const TQImage &i )
 
     TQImage img = scale
 	? (
-#if defined(QT_NO_IMAGE_TRANSFORMATION)
+#if defined(TQT_NO_IMAGE_TRANSFORMATION)
 		i.smoothScale( rw, rh )
-#elif defined(QT_NO_IMAGE_SMOOTHSCALE)
+#elif defined(TQT_NO_IMAGE_SMOOTHSCALE)
 		i.scale( rw, rh )
 #else
 		smooth ? i.smoothScale( rw, rh ) : i.scale( rw, rh )
@@ -3006,7 +3006,7 @@ void qt_format_text( const TQFont& font, const TQRect &_r,
 	bool painterHasClip = FALSE;
 	TQRegion painterClipRegion;
 	if ( !dontclip ) {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 	    TQRegion reg = painter->xmat * r;
 #else
 	    TQRegion reg = r;
@@ -3524,7 +3524,7 @@ bool TQPen::operator==( const TQPen &p ) const
 /*****************************************************************************
   TQPen stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQPen
 
@@ -3563,7 +3563,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPen &p )
     p = TQPen( color, (uint)width, (TQt::PenStyle)style );	// owl
     return s;
 }
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 /*****************************************************************************
   TQBrush member functions
@@ -3915,7 +3915,7 @@ bool TQBrush::operator==( const TQBrush &b ) const
 /*****************************************************************************
   TQBrush stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQBrush
 
@@ -3929,7 +3929,7 @@ TQDataStream &operator<<( TQDataStream &s, const TQBrush &b )
 {
     s << (TQ_UINT8)b.style() << b.color();
     if ( b.style() == TQt::CustomPattern )
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 	s << *b.pixmap();
 #else
 	tqWarning("No Image Brush I/O");
@@ -3953,7 +3953,7 @@ TQDataStream &operator>>( TQDataStream &s, TQBrush &b )
     s >> style;
     s >> color;
     if ( style == TQt::CustomPattern ) {
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 	TQPixmap pm;
 	s >> pm;
 	b = TQBrush( color, pm );
@@ -3965,4 +3965,4 @@ TQDataStream &operator>>( TQDataStream &s, TQBrush &b )
 	b = TQBrush( color, (TQt::BrushStyle)style );
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index bcc12af10..697dc784d 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -132,7 +132,7 @@ void qt_erase_rect( TQWidget* w, const TQRect& r)
 
 }
 
-#ifdef QT_NO_XFTFREETYPE
+#ifdef TQT_NO_XFTFREETYPE
 static const TQt::HANDLE rendhd = 0;
 #endif
 
@@ -153,12 +153,12 @@ static inline void x11SetClipRegion(Display *dpy, GC gc, GC gc2, TQt::HANDLE dra
     if (gc2)
         XSetClipRectangles( dpy, gc2, 0, 0, rects, num, YXBanded );
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (draw)
         XftDrawSetClipRectangles((XftDraw *) draw, 0, 0, rects, num);
 #else
     Q_UNUSED(draw);
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 }
 
 static inline void x11ClearClipRegion(Display *dpy, GC gc, GC gc2, TQt::HANDLE draw)
@@ -168,7 +168,7 @@ static inline void x11ClearClipRegion(Display *dpy, GC gc, GC gc2, TQt::HANDLE d
     if (gc2)
         XSetClipMask(dpy, gc2, None);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (draw) {
 #  ifdef QT_XFT2
 	XftDrawSetClip((XftDraw *) draw, None);
@@ -182,7 +182,7 @@ static inline void x11ClearClipRegion(Display *dpy, GC gc, GC gc2, TQt::HANDLE d
     }
 #else
     Q_UNUSED(draw);
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 }
 
 
@@ -1127,7 +1127,7 @@ bool TQPainter::begin( const TQPaintDevice *pd, bool unclipped )
             updateBrush();
             XSetSubwindowMode( dpy, gc, IncludeInferiors );
             XSetSubwindowMode( dpy, gc_brush, IncludeInferiors );
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	    if (rendhd)
                 XftDrawSetSubwindowMode((XftDraw *) rendhd, IncludeInferiors);
 #endif
@@ -1234,13 +1234,13 @@ bool TQPainter::end()                            // end painting
     if ( testf(ExtDev) )
         pdev->cmd( TQPaintDevice::PdcEnd, this, 0 );
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (rendhd) {
         // reset clipping/subwindow mode on our render picture
         XftDrawSetClip((XftDraw *) rendhd, None);
         XftDrawSetSubwindowMode((XftDraw *) rendhd, ClipByChildren);
     }
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
     if ( pfont ) {
 	delete pfont;
@@ -2744,7 +2744,7 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap,
         XSetTSOrigin( dpy, gc, 0, 0 );
         XSetFillStyle( dpy, gc, FillSolid );
     } else {
-#if !defined(QT_NO_XFTFREETYPE) && !defined(QT_NO_XRENDER)
+#if !defined(TQT_NO_XFTFREETYPE) && !defined(TQT_NO_XRENDER)
         Picture pict = rendhd ? XftDrawPicture((XftDraw *) rendhd) : None;
 	TQPixmap *alpha = pixmap.data->alphapm;
 
@@ -2754,7 +2754,7 @@ void TQPainter::drawPixmap( int x, int y, const TQPixmap &pixmap,
 			     alpha->x11RenderHandle(), pict,
 			     sx, sy, sx, sy, x, y, sw, sh);
 	} else
-#endif // !QT_NO_XFTFREETYPE && !QT_NO_XRENDER
+#endif // !TQT_NO_XFTFREETYPE && !TQT_NO_XRENDER
         {
             XCopyArea( dpy, pixmap.handle(), hd, gc, sx, sy, sw, sh, x, y );
         }
@@ -2858,7 +2858,7 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h,
         if ( txop == TxTranslate )
             map( x, y, &x, &y );
 
-#if !defined(QT_NO_XFTFREETYPE) && !defined(QT_NO_XRENDER)
+#if !defined(TQT_NO_XFTFREETYPE) && !defined(TQT_NO_XRENDER)
         Picture pict = rendhd ? XftDrawPicture((XftDraw *) rendhd) : None;
 	TQPixmap *alpha = pixmap.data->alphapm;
 
@@ -2889,7 +2889,7 @@ void TQPainter::drawTiledPixmap( int x, int y, int w, int h,
 	    }
 	    return;
 	}
-#endif // !QT_NO_XFTFREETYPE && !QT_NO_XRENDER
+#endif // !TQT_NO_XFTFREETYPE && !TQT_NO_XRENDER
 
 	XSetTile( dpy, gc, pixmap.handle() );
 	XSetFillStyle( dpy, gc, FillTiled );
diff --git a/src/kernel/qpalette.cpp b/src/kernel/qpalette.cpp
index add847a17..31f45c057 100644
--- a/src/kernel/qpalette.cpp
+++ b/src/kernel/qpalette.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqpalette.h"
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 #include "ntqdatastream.h"
 #include "ntqcleanuphandler.h"
 
@@ -943,7 +943,7 @@ bool TQPalette::operator==( const TQPalette &p ) const
   TQColorGroup/TQPalette stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQColorGroup
 
@@ -1080,7 +1080,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPalette &p )
     p = newpal;
     return s;
 }
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 /*!
     Returns TRUE if this palette and \a p are copies of each other,
@@ -1221,4 +1221,4 @@ TQColorGroup::ColorRole TQPalette::backgroundRoleFromMode( TQt::BackgroundMode m
     }
 }
 
-#endif // QT_NO_PALETTE
+#endif // TQT_NO_PALETTE
diff --git a/src/kernel/qpicture.cpp b/src/kernel/qpicture.cpp
index b9d350a0e..0fd609d79 100644
--- a/src/kernel/qpicture.cpp
+++ b/src/kernel/qpicture.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqpicture.h"
 
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
 
 #include "ntqpainter.h"
 #include "ntqpixmap.h"
@@ -49,7 +49,7 @@
 #include "ntqdatastream.h"
 #include "ntqpaintdevicemetrics.h"
 
-#ifndef QT_NO_SVG
+#ifndef TQT_NO_SVG
 #include "private/qsvgdevice_p.h"
 #endif
 
@@ -248,7 +248,7 @@ bool TQPicture::load( const TQString &fileName, const char *format )
 
 bool TQPicture::load( TQIODevice *dev, const char *format )
 {
-#ifndef QT_NO_SVG
+#ifndef TQT_NO_SVG
     if ( qstrcmp( format, "svg" ) == 0 ) {
 	TQSvgDevice svg;
 	if ( !svg.load( dev ) )
@@ -297,7 +297,7 @@ bool TQPicture::save( const TQString &fileName, const char *format )
 	return FALSE;
     }
 
-#ifndef QT_NO_SVG
+#ifndef TQT_NO_SVG
     // identical to TQIODevice* code below but the file name
     // makes a difference when it comes to saving pixmaps
     if ( tqstricmp( format, "svg" ) == 0 ) {
@@ -332,7 +332,7 @@ bool TQPicture::save( TQIODevice *dev, const char *format )
 	return FALSE;
     }
 
-#ifndef QT_NO_SVG
+#ifndef TQT_NO_SVG
     if ( tqstricmp( format, "svg" ) == 0 ) {
 	TQSvgDevice svg;
 	TQPainter p( &svg );
@@ -446,7 +446,7 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords )
     TQPen	pen;
     TQBrush	brush;
     TQRegion	rgn;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQWMatrix	matrix;
 #endif
 
@@ -517,7 +517,7 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords )
 		break;
 	    case PdcDrawCubicBezier:
 		s >> a;
-#ifndef QT_NO_BEZIER
+#ifndef TQT_NO_BEZIER
 		painter->drawCubicBezier( a );
 #endif
 		break;
@@ -623,35 +623,35 @@ bool TQPicture::exec( TQPainter *painter, TQDataStream &s, int nrecords )
 		break;
 	    case PdcSetVXform:
 		s >> i_8;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 		painter->setViewXForm( i_8 );
 #endif
 		break;
 	    case PdcSetWindow:
 		s >> r;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 		painter->setWindow( r );
 #endif
 		break;
 	    case PdcSetViewport:
 		s >> r;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 		painter->setViewport( r );
 #endif
 		break;
 	    case PdcSetWXform:
 		s >> i_8;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 		painter->setWorldXForm( i_8 );
 #endif
 		break;
 	    case PdcSetWMatrix:
-#ifndef QT_NO_TRANSFORMATIONS	// #### fix me!
+#ifndef TQT_NO_TRANSFORMATIONS	// #### fix me!
 		s >> matrix >> i_8;
 		painter->setWorldMatrix( matrix, i_8 );
 #endif
 		break;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 	    case PdcSaveWMatrix:
 		painter->saveWorldMatrix();
 		break;
@@ -782,7 +782,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
 	    br = p[0].ptarr->boundingRect();
 	    corr = TRUE;
 	    break;
-#ifndef QT_NO_BEZIER
+#ifndef TQT_NO_BEZIER
 	case PdcDrawCubicBezier:
 	    s << *p[0].ptarr;
 	    br = p[0].ptarr->cubicBezier().boundingRect();
@@ -884,7 +884,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
 	case PdcSetClip:
 	    s << (TQ_INT8)p[0].ival;
 	    break;
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 	case PdcSetWindow:
 	case PdcSetViewport:
 	    s << *p[0].rect;
@@ -924,7 +924,7 @@ bool TQPicture::TQPicturePrivate::cmd( int c, TQPainter *pt, TQPDevCmdParam *p )
 	    br.setCoords( br.left() - w2, br.top() - w2,
 			  br.right() + w2, br.bottom() + w2 );
 	}
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 	br = pt->worldMatrix().map( br );
 #endif
 	if ( pt->hasClipping() ) {
@@ -1225,5 +1225,5 @@ TQDataStream &operator>>( TQDataStream &s, TQPicture &r )
     return s;
 }
 
-#endif // QT_NO_PICTURE
+#endif // TQT_NO_PICTURE
 
diff --git a/src/kernel/qpixmap.cpp b/src/kernel/qpixmap.cpp
index 7dd6c0d77..6d802cfdd 100644
--- a/src/kernel/qpixmap.cpp
+++ b/src/kernel/qpixmap.cpp
@@ -258,7 +258,7 @@ TQPixmap::TQPixmap( const TQSize &size, int depth, Optimization optimization )
     init( size.width(), size.height(), depth, FALSE, optimization );
 }
 
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 /*!
     Constructs a pixmap from the file \a fileName. If the file does
     not exist or is of an unknown format, the pixmap becomes a null
@@ -351,7 +351,7 @@ TQPixmap::TQPixmap( const TQByteArray & img_data )
     init( 0, 0, 0, FALSE, defOptim );
     loadFromData( img_data );
 }
-#endif //QT_NO_IMAGEIO
+#endif //TQT_NO_IMAGEIO
 
 /*!
     Constructs a pixmap that is a copy of \a pixmap.
@@ -396,7 +396,7 @@ TQPixmap::~TQPixmap()
   \sa TQMimeSourceFactory, TQImage::fromMimeSource(), TQImageDrag::decode()
 */
 
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 TQPixmap TQPixmap::fromMimeSource( const TQString &abs_name )
 {
     const TQMimeSource *m = TQMimeSourceFactory::defaultFactory()->data( abs_name );
@@ -671,7 +671,7 @@ void TQPixmap::resize( int w, int h )
     if(data->alphapm) {
 	data->alphapm->resize(w, h);
     } else
-#elif defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
+#elif defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
     if (data->alphapm)
 	tqWarning("TQPixmap::resize: TODO: resize alpha data");
     else
@@ -751,11 +751,11 @@ void TQPixmap::setMask( const TQBitmap &newmask )
 #endif
 	return;
     }
-#if defined(Q_WS_MAC) || (defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE))
+#if defined(Q_WS_MAC) || (defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE))
     // when setting the mask, we get rid of the alpha channel completely
     delete data->alphapm;
     data->alphapm = 0;
-#endif // Q_WS_X11 && !QT_NO_XFTFREETYPE
+#endif // Q_WS_X11 && !TQT_NO_XFTFREETYPE
 
     delete data->mask;
     TQBitmap* newmaskcopy;
@@ -779,7 +779,7 @@ void TQPixmap::setMask( const TQBitmap &newmask )
     \sa mask()
 */
 
-#ifndef QT_NO_IMAGE_HEURISTIC_MASK
+#ifndef TQT_NO_IMAGE_HEURISTIC_MASK
 /*!
     Creates and returns a heuristic mask for this pixmap. It works by
     selecting a color from one of the corners and then chipping away
@@ -808,7 +808,7 @@ TQBitmap TQPixmap::createHeuristicMask( bool clipTight ) const
     return m;
 }
 #endif
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 /*!
     Returns a string that specifies the image format of the file \a
     fileName, or 0 if the file cannot be read or if the format cannot
@@ -886,7 +886,7 @@ bool TQPixmap::load( const TQString &fileName, const char *format,
     }
     return load( fileName, format, conversion_flags );
 }
-#endif //QT_NO_IMAGEIO
+#endif //TQT_NO_IMAGEIO
 
 /*!
     \overload
@@ -919,7 +919,7 @@ bool TQPixmap::convertFromImage( const TQImage &image, ColorMode mode )
     return convertFromImage( image, conversion_flags );
 }
 
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 /*!
     Loads a pixmap from the binary data in \a buf (\a len bytes).
     Returns TRUE if successful; otherwise returns FALSE.
@@ -1061,7 +1061,7 @@ bool TQPixmap::doImageIO( TQImageIO* io, int quality ) const
     return io->write();
 }
 
-#endif //QT_NO_IMAGEIO
+#endif //TQT_NO_IMAGEIO
 
 /*!
     \fn int TQPixmap::serialNumber() const
@@ -1234,7 +1234,7 @@ TQPixmap TQPixmap::grabWidget( TQWidget * widget, int x, int y, int w, int h )
 
     \sa xForm(), TQWMatrix
 */
-#ifndef QT_NO_PIXMAP_TRANSFORMATION
+#ifndef TQT_NO_PIXMAP_TRANSFORMATION
 TQWMatrix TQPixmap::trueMatrix( const TQWMatrix &matrix, int w, int h )
 {
     const double dt = (double)0.;
@@ -1275,7 +1275,7 @@ TQWMatrix TQPixmap::trueMatrix( const TQWMatrix &matrix, int w, int h )
     mat.setMatrix( matrix.m11(), matrix.m12(), matrix.m21(), matrix.m22(), -xmin, -ymin );
     return mat;
 }
-#endif // QT_NO_WMATRIX
+#endif // TQT_NO_WMATRIX
 
 
 
@@ -1284,7 +1284,7 @@ TQWMatrix TQPixmap::trueMatrix( const TQWMatrix &matrix, int w, int h )
 /*****************************************************************************
   TQPixmap stream functions
  *****************************************************************************/
-#if !defined(QT_NO_DATASTREAM) && !defined(QT_NO_IMAGEIO)
+#if !defined(TQT_NO_DATASTREAM) && !defined(TQT_NO_IMAGEIO)
 /*!
     \relates TQPixmap
 
@@ -1319,7 +1319,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPixmap &pixmap )
     return s;
 }
 
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 
 
@@ -1346,7 +1346,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPixmap &pixmap )
   line of the source data, \a sWidth and \a sHeight are the width and height of
   the source data.
 */
-#ifndef QT_NO_PIXMAP_TRANSFORMATION
+#ifndef TQT_NO_PIXMAP_TRANSFORMATION
 #undef IWX_MSB
 #define IWX_MSB(b)	if ( trigx < maxws && trigy < maxhs ) {			      \
 			    if ( *(sptr+sbpl*(trigy>>16)+(trigx>>19)) &		      \
@@ -1507,4 +1507,4 @@ bool qt_xForm_helper( const TQWMatrix &trueMat, int xoffset,
 #undef IWX_MSB
 #undef IWX_LSB
 #undef IWX_PIX
-#endif // QT_NO_PIXMAP_TRANSFORMATION
+#endif // TQT_NO_PIXMAP_TRANSFORMATION
diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp
index 00564b33c..1acdf16a2 100644
--- a/src/kernel/qpixmap_x11.cpp
+++ b/src/kernel/qpixmap_x11.cpp
@@ -374,12 +374,12 @@ static int defaultScreen = -1;
 extern bool tqt_use_xrender; // defined in qapplication_x11.cpp
 extern bool tqt_has_xft;     // defined in qfont_x11.cpp
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 #ifndef QT_XFT2
 // Xft1 doesn't have XftDrawCreateAlpha, so we fake it in qtaddons_x11.cpp
 extern "C" XftDraw *XftDrawCreateAlpha( Display *, TQt::HANDLE, int );
 #endif // QT_XFT2
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 /*****************************************************************************
   TQPixmap member functions
@@ -450,7 +450,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim )
     hd = (HANDLE)XCreatePixmap( x11Display(), RootWindow(x11Display(), x11Screen() ),
 				w, h, data->d );
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if ( tqt_has_xft ) {
 	if ( data->d == 1 ) {
 	    rendhd = (HANDLE) XftDrawCreateBitmap( x11Display(), hd );
@@ -460,7 +460,7 @@ void TQPixmap::init( int w, int h, int d, bool bitmap, Optimization optim )
 					     x11Colormap() );
 	}
     }
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 }
 
@@ -476,12 +476,12 @@ void TQPixmap::deref()
 	    XFreeGC( x11Display(), (GC)data->maskgc );
 	if ( tqApp && hd) {
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	    if (rendhd) {
 		XftDrawDestroy( (XftDraw *) rendhd );
 		rendhd = 0;
 	    }
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 	    XFreePixmap( x11Display(), hd );
 	    hd = 0;
@@ -520,10 +520,10 @@ TQPixmap::TQPixmap( int w, int h, const uchar *bits, bool isXbitmap)
 					RootWindow(x11Display(), x11Screen() ),
 					(char *)bits, w, h );
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if ( tqt_has_xft )
 	rendhd = (HANDLE) XftDrawCreateBitmap (x11Display (), hd);
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
     if ( flipped_bits )				// Avoid purify complaint
 	delete [] flipped_bits;
@@ -1159,12 +1159,12 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
     if ( d == 1 ) {				// 1 bit pixmap (bitmap)
 	if ( hd ) {				// delete old X pixmap
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	    if (rendhd) {
 		XftDrawDestroy( (XftDraw *) rendhd );
 		rendhd = 0;
 	    }
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 	    XFreePixmap( x11Display(), hd );
 	}
@@ -1220,10 +1220,10 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 					    RootWindow(x11Display(), x11Screen() ),
 					    bits, w, h );
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	if ( tqt_has_xft )
 	    rendhd = (HANDLE) XftDrawCreateBitmap( x11Display(), hd );
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 	if ( tmp_bits )				// Avoid purify complaint
 	    delete [] tmp_bits;
@@ -1775,12 +1775,12 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 
     if ( hd && (width() != (int)w || height() != (int)h || this->depth() != dd) ) {
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	if (rendhd) {
 	    XftDrawDestroy( (XftDraw *) rendhd );
 	    rendhd = 0;
 	}
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 	XFreePixmap( dpy, hd );			// don't reuse old pixmap
 	hd = 0;
@@ -1790,7 +1790,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 				    RootWindow(x11Display(), x11Screen() ),
 				    w, h, dd );
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	if ( tqt_has_xft ) {
 	    if ( data->d == 1 ) {
 		rendhd = (HANDLE) XftDrawCreateBitmap( x11Display (), hd );
@@ -1799,7 +1799,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 						 (Visual *) x11Visual(), x11Colormap() );
 	    }
 	}
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
     }
 
@@ -1826,7 +1826,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
 	m = image.createAlphaMask( conversion_flags );
 	setMask( m );
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	// does this image have an alphamap (and not just a 1bpp mask)?
 	bool alphamap = image.depth() == 32;
 	if (image.depth() == 8) {
@@ -1907,7 +1907,7 @@ bool TQPixmap::convertFromImage( const TQImage &img, int conversion_flags )
                 XFreeGC(x11Display(), gc);
 	    }
 	}
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
     }
 
 #ifdef QT_MITSHM_CONVERSIONS
@@ -2235,7 +2235,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
 	if ( data->mask ) // xform mask, too
 	    pm.setMask( data->mask->xForm(matrix) );
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	if ( tqt_use_xrender && tqt_has_xft && data->alphapm ) { // xform the alpha channel
 	    XImage *axi = 0;
 	    if ((axi = XGetImage(x11Display(), data->alphapm->handle(),
@@ -2286,7 +2286,7 @@ TQPixmap TQPixmap::xForm( const TQWMatrix &matrix ) const
 		qSafeXDestroyImage(axi);
 	    }
 	}
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 	return pm;
     }
@@ -2415,7 +2415,7 @@ Q_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy,
 		src->data->mask, sx, sy, sw, sh, TQt::CopyROP, TRUE );
     }
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     // copy alpha data
     extern bool tqt_use_xrender; // from qapplication_x11.cpp
     if ( ! tqt_use_xrender || ! src->data->alphapm )
@@ -2474,5 +2474,5 @@ Q_EXPORT void copyBlt( TQPixmap *dst, int dx, int dy,
     XCopyArea(dst->x11Display(), src->data->alphapm->hd, dst->data->alphapm->hd, gc,
 	      sx, sy, sw, sh, dx, dy);
     XFreeGC(dst->x11Display(), gc);
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 }
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index d391d5c4c..8033030b0 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqpngio.h"
 
-#ifndef QT_NO_IMAGEIO_PNG
+#ifndef TQT_NO_IMAGEIO_PNG
 
 #include "ntqasyncimageio.h"
 #include "ntqiodevice.h"
@@ -411,7 +411,7 @@ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
     image.setDotsPerMeterX(png_get_x_pixels_per_meter(png_ptr,info_ptr));
     image.setDotsPerMeterY(png_get_y_pixels_per_meter(png_ptr,info_ptr));
 
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     png_textp text_ptr;
     int num_text=0;
     png_get_text(png_ptr,info_ptr,&text_ptr,&num_text);
@@ -484,7 +484,7 @@ void TQPNGImageWriter::setGamma(float g)
 }
 
 
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
 static void set_text(const TQImage& image, png_structp png_ptr, png_infop info_ptr, bool short_not_long)
 {
     TQValueList keys = image.textList();
@@ -684,14 +684,14 @@ should be able to comment this out.
 		PNG_RESOLUTION_METER);
     }
 
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     // Write short texts early.
     set_text(image,png_ptr,info_ptr,TRUE);
 #endif
 
     png_write_info(png_ptr, info_ptr);
 
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     // Write long texts later.
     set_text(image,png_ptr,info_ptr,FALSE);
 #endif
@@ -935,7 +935,7 @@ bool TQPNGImagePacker::packImage(const TQImage& img)
 }
 
 
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
 
 class TQPNGFormat : public TQImageFormat {
 public:
@@ -1225,7 +1225,7 @@ void TQPNGFormat::end(png_structp png, png_infop info)
     image->setOffset(TQPoint(offx,offy));
     image->setDotsPerMeterX(png_get_x_pixels_per_meter(png,info));
     image->setDotsPerMeterY(png_get_y_pixels_per_meter(png,info));
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     png_textp text_ptr;
     int num_text=0;
     png_get_text(png,info,&text_ptr,&num_text);
@@ -1248,7 +1248,7 @@ void TQPNGFormat::end(png_structp png, png_infop info)
 #ifdef PNG_USER_CHUNKS_SUPPORTED
 
 /*
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
 static bool skip(png_uint_32& max, png_bytep& data)
 {
     while (*data) {
@@ -1292,7 +1292,7 @@ int TQPNGFormat::user_chunk(png_structp png,
     Q_UNUSED( length )
 #endif
 
-#ifndef QT_NO_IMAGE_TEXT
+#ifndef TQT_NO_IMAGE_TEXT
     /*
 
     libpng now supports this chunk.
@@ -1328,12 +1328,12 @@ int TQPNGFormat::user_chunk(png_structp png,
 
 static TQPNGFormatType* globalPngFormatTypeObject = 0;
 
-#endif // QT_NO_ASYNC_IMAGE_IO
+#endif // TQT_NO_ASYNC_IMAGE_IO
 
 static bool done = FALSE;
 void qCleanupPngIO()
 {
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
     if ( globalPngFormatTypeObject ) {
 	delete globalPngFormatTypeObject;
 	globalPngFormatTypeObject = 0;
@@ -1348,7 +1348,7 @@ void qInitPngIO()
 	done = TRUE;
 	TQImageIO::defineIOHandler( "PNG", "^.PNG\r", 0, read_png_image,
 				   write_png_image);
-#ifndef QT_NO_ASYNC_IMAGE_IO
+#ifndef TQT_NO_ASYNC_IMAGE_IO
 	globalPngFormatTypeObject = new TQPNGFormatType;
 #endif
 	tqAddPostRoutine( qCleanupPngIO );
@@ -1361,4 +1361,4 @@ void qt_zlib_compression_hack()
     uncompress(0,0,0,0);
 }
 
-#endif // QT_NO_IMAGEIO_PNG
+#endif // TQT_NO_IMAGEIO_PNG
diff --git a/src/kernel/qpoint.cpp b/src/kernel/qpoint.cpp
index d073ab1dc..d3c409ef3 100644
--- a/src/kernel/qpoint.cpp
+++ b/src/kernel/qpoint.cpp
@@ -384,7 +384,7 @@ void TQPoint::warningDivByZero()
 /*****************************************************************************
   TQPoint stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQPoint
 
@@ -426,7 +426,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPoint &p )
     }
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 /*!
     Returns the sum of the absolute values of x() and y(),
     traditionally known as the "Manhattan length" of the vector from
diff --git a/src/kernel/qpointarray.cpp b/src/kernel/qpointarray.cpp
index 5da55e2d4..dcca3278e 100644
--- a/src/kernel/qpointarray.cpp
+++ b/src/kernel/qpointarray.cpp
@@ -488,7 +488,7 @@ static inline int fix_angle( int a )
 
 void TQPointArray::makeArc( int x, int y, int w, int h, int a1, int a2 )
 {
-#if !defined(QT_OLD_MAKEELLIPSE) && !defined(QT_NO_TRANSFORMATIONS)
+#if !defined(QT_OLD_MAKEELLIPSE) && !defined(TQT_NO_TRANSFORMATIONS)
     TQWMatrix unit;
     makeArc(x,y,w,h,a1,a2,unit);
 #else
@@ -520,7 +520,7 @@ void TQPointArray::makeArc( int x, int y, int w, int h, int a1, int a2 )
 #endif
 }
 
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 // Based upon:
 //   parelarc.c from Graphics Gems III
 //   VanAken / Simar, "A Parametric Elliptical Arc Algorithm"
@@ -670,7 +670,7 @@ void TQPointArray::makeArc( int x, int y, int w, int h,
 #undef PIV2
 }
 
-#endif // QT_NO_TRANSFORMATIONS
+#endif // TQT_NO_TRANSFORMATIONS
 
 /*!
     Sets the points of the array to those describing an ellipse with
@@ -680,7 +680,7 @@ void TQPointArray::makeArc( int x, int y, int w, int h,
 */
 void TQPointArray::makeEllipse( int x, int y, int w, int h )
 {						// midpoint, 1/4 ellipse
-#if !defined(QT_OLD_MAKEELLIPSE) && !defined(QT_NO_TRANSFORMATIONS)
+#if !defined(QT_OLD_MAKEELLIPSE) && !defined(TQT_NO_TRANSFORMATIONS)
     TQWMatrix unit;
     makeArc(x,y,w,h,0,360*16,unit);
     return;
@@ -755,7 +755,7 @@ void TQPointArray::makeEllipse( int x, int y, int w, int h )
 #endif
 }
 
-#ifndef QT_NO_BEZIER
+#ifndef TQT_NO_BEZIER
 // Work functions for TQPointArray::cubicBezier()
 static
 void split(const double *p, double *l, double *r)
@@ -1001,12 +1001,12 @@ TQPointArray TQPointArray::cubicBezier() const
 
 #endif
 }
-#endif //QT_NO_BEZIER
+#endif //TQT_NO_BEZIER
 
 /*****************************************************************************
   TQPointArray stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQPointArray
 
@@ -1049,7 +1049,7 @@ TQDataStream &operator>>( TQDataStream &s, TQPointArray &a )
     }
     return s;
 }
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 
 
diff --git a/src/kernel/qprinter.cpp b/src/kernel/qprinter.cpp
index 4b8175d96..2c89b6ad3 100644
--- a/src/kernel/qprinter.cpp
+++ b/src/kernel/qprinter.cpp
@@ -41,7 +41,7 @@
 #include "ntqprinter.h"
 #include "qprinter_p.h"
 
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
 
 /*!
     \class TQPrinter ntqprinter.h
@@ -1024,5 +1024,5 @@ bool TQPrinter::isOptionEnabled( PrinterOption option )
 {
     return d->printerOptions & ( 1 << option );
 }
-#endif // QT_NO_PRINTER
+#endif // TQT_NO_PRINTER
 
diff --git a/src/kernel/qprinter_p.h b/src/kernel/qprinter_p.h
index b8733bec2..79c5f8271 100644
--- a/src/kernel/qprinter_p.h
+++ b/src/kernel/qprinter_p.h
@@ -40,7 +40,7 @@
 
 #ifndef TQPRINTER_P_H
 #define TQPRINTER_P_H
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
 
 #ifndef QT_H
 #include 
diff --git a/src/kernel/qprinter_unix.cpp b/src/kernel/qprinter_unix.cpp
index c1d234dfd..5141f7b19 100644
--- a/src/kernel/qprinter_unix.cpp
+++ b/src/kernel/qprinter_unix.cpp
@@ -49,7 +49,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode)
 
 #include "ntqprinter.h"
 
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
 
 #include "ntqpaintdevicemetrics.h"
 #include "qpsprinter_p.h"
@@ -250,7 +250,7 @@ static void deleteGlobalPrinterDefaults()
 
 bool TQPrinter::setup( TQWidget * parent )
 {
-#ifndef QT_NO_PRINTDIALOG
+#ifndef TQT_NO_PRINTDIALOG
     bool result = TQPrintDialog::getPrinterSetup( this, parent  );
 #else
     bool result = FALSE;
diff --git a/src/kernel/qprocess.cpp b/src/kernel/qprocess.cpp
index 1533a66a1..13fb195e3 100644
--- a/src/kernel/qprocess.cpp
+++ b/src/kernel/qprocess.cpp
@@ -43,7 +43,7 @@
 
 #include "ntqprocess.h"
 
-#ifndef QT_NO_PROCESS
+#ifndef TQT_NO_PROCESS
 
 #include "ntqapplication.h"
 #include "private/qinternal_p.h"
@@ -352,7 +352,7 @@ void TQProcess::addArgument( const TQString& arg )
     _arguments.append( arg );
 }
 
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 /*!
     Returns the working directory that was set with
     setWorkingDirectory(), or the current directory if none has been
@@ -379,7 +379,7 @@ void TQProcess::setWorkingDirectory( const TQDir& dir )
 {
     workingDir = dir;
 }
-#endif //QT_NO_DIR
+#endif //TQT_NO_DIR
 
 /*!
     Returns the communication required with the process, i.e. some
@@ -803,4 +803,4 @@ void TQProcess::disconnectNotify( const char * )
     }
 }
 
-#endif // QT_NO_PROCESS
+#endif // TQT_NO_PROCESS
diff --git a/src/kernel/qprocess_unix.cpp b/src/kernel/qprocess_unix.cpp
index 3bba1bca1..f41923fd2 100644
--- a/src/kernel/qprocess_unix.cpp
+++ b/src/kernel/qprocess_unix.cpp
@@ -47,7 +47,7 @@
 
 #include "ntqprocess.h"
 
-#ifndef QT_NO_PROCESS
+#ifndef TQT_NO_PROCESS
 
 #include "ntqapplication.h"
 #include "ntqptrqueue.h"
@@ -816,7 +816,7 @@ bool TQProcess::start( TQStringList *env )
 	if ( comms & DupStderr ) {
 	    ::dup2( STDOUT_FILENO, STDERR_FILENO );
 	}
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 	if (::chdir( workingDir.absPath().latin1() ) < 0) {
 		tqWarning( "Could not chdir" );
 	}
@@ -871,7 +871,7 @@ bool TQProcess::start( TQStringList *env )
 			if(!TQFile::exists(dir + "/" + command) && TQFile::exists(dir + "/" + command + ".app"))
 			    dir += "/" + command + ".app/Contents/MacOS";
 #endif
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 			TQFileInfo fileInfo( dir, command );
 #else
 			TQFileInfo fileInfo( dir + "/" + command );
@@ -1414,4 +1414,4 @@ TQProcess::PID TQProcess::processIdentifier()
     return d->proc->pid;
 }
 
-#endif // QT_NO_PROCESS
+#endif // TQT_NO_PROCESS
diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp
index 90d81223b..42c1b8bc1 100644
--- a/src/kernel/qpsprinter.cpp
+++ b/src/kernel/qpsprinter.cpp
@@ -52,7 +52,7 @@
 
 #include "qpsprinter_p.h"
 
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
 
 #undef Q_PRINTER_USE_TYPE42
 
@@ -1416,7 +1416,7 @@ public:
     bool dirtyBkColor;
     TQt::BGMode bkMode;
     bool dirtyBkMode;
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     TQTextCodec * currentFontCodec;
 #endif
     TQString currentFont;
@@ -4241,7 +4241,7 @@ void TQPSPrinterFontNotFound::download(TQTextStream& s, bool)
     TQPSPrinterFontPrivate::download(s, TRUE);
 }
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 // =================== A font file for asian ============
 
 class TQPSPrinterFontAsian
@@ -4923,7 +4923,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate
     bool xlfd = FALSE;
     //tqDebug("engine = %p name=%s, script=%d", engine, engine ? engine->name() : "(null)", script);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if ( tqt_has_xft && engine && engine->type() == TQFontEngine::Xft ) {
         XftPattern *pattern = static_cast( engine )->pattern();
         char *filename = 0;
@@ -4952,7 +4952,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate
         }
     }
 #endif // Q_WS_X11
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     // map some scripts to something more useful
     if ( script == TQFont::Han ) {
 	TQTextCodec *lc = TQTextCodec::codecForLocale();
@@ -5088,7 +5088,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate
     case NONE:
     default:
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 
         if ( script == TQFont::Hiragana )
             p = new TQPSPrinterFontJapanese( engine );
@@ -5145,7 +5145,7 @@ TQPSPrinterFont::TQPSPrinterFont(const TQFont &f, int script, TQPSPrinterPrivate
 TQPSPrinterPrivate::TQPSPrinterPrivate( TQPrinter *prt, int filedes )
     : buffer( 0 ), outDevice( 0 ), fd( filedes ), pageBuffer( 0 ), fonts(27, FALSE), fontBuffer(0), savedImage( 0 ),
       dirtypen( FALSE ), dirtybrush( FALSE ), dirtyBkColor( FALSE ), bkMode( TQt::TransparentMode ), dirtyBkMode( FALSE ),
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
       currentFontCodec( 0 ),
 #endif
       fm( TQFont() ), textY( 0 )
@@ -5275,10 +5275,10 @@ void TQPSPrinterPrivate::setFont( const TQFont & fnt, int script )
     if ( !fontsUsed.contains( ps ) )
         fontsUsed += ps;
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     TQTextCodec * codec = 0;
 // ###
-// #ifndef QT_NO_TEXTCODEC
+// #ifndef TQT_NO_TEXTCODEC
 //     i = 0;
 //     do {
 //      if ( unicodevalues[i].cs == f.charSet() )
@@ -5859,7 +5859,7 @@ void TQPSPrinterPrivate::drawImage( TQPainter *paint, float x, float y, float w,
 
 void TQPSPrinterPrivate::matrixSetup( TQPainter *paint )
 {
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
     TQWMatrix tmp;
     if ( paint->hasViewXForm() ) {
         TQRect viewport = paint->viewport();
@@ -6487,7 +6487,7 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p )
         TQRect r = *(p[0].rect);
         TQImage img = *(p[1].image);
 	TQImage mask;
-#ifndef QT_NO_IMAGE_DITHER_TO_1
+#ifndef TQT_NO_IMAGE_DITHER_TO_1
 	if ( img.hasAlphaBuffer() )
 	    mask = img.createAlphaMask();
 #endif
@@ -6579,4 +6579,4 @@ bool TQPSPrinter::cmd( int c , TQPainter *paint, TQPDevCmdParam *p )
     return TRUE;
 }
 
-#endif // QT_NO_PRINTER
+#endif // TQT_NO_PRINTER
diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/qpsprinter_p.h
index 070f43207..35513e12b 100644
--- a/src/kernel/qpsprinter_p.h
+++ b/src/kernel/qpsprinter_p.h
@@ -62,7 +62,7 @@
 #include "ntqtextstream.h"
 #endif // QT_H
 
-#ifndef QT_NO_PRINTER
+#ifndef TQT_NO_PRINTER
 
 class TQPSPrinterPrivate;
 
@@ -87,6 +87,6 @@ private:
     TQPSPrinter &operator=( const TQPSPrinter & );
 };
 
-#endif // QT_NO_PRINTER
+#endif // TQT_NO_PRINTER
 
 #endif // TQPSPRINTER_P_H
diff --git a/src/kernel/qrect.cpp b/src/kernel/qrect.cpp
index 2ca88a4c2..f3bc3ff65 100644
--- a/src/kernel/qrect.cpp
+++ b/src/kernel/qrect.cpp
@@ -913,7 +913,7 @@ bool operator!=( const TQRect &r1, const TQRect &r2 )
 /*****************************************************************************
   TQRect stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQRect
 
@@ -957,4 +957,4 @@ TQDataStream &operator>>( TQDataStream &s, TQRect &r )
     }
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
diff --git a/src/kernel/qregion.cpp b/src/kernel/qregion.cpp
index deb0ffa43..105f96430 100644
--- a/src/kernel/qregion.cpp
+++ b/src/kernel/qregion.cpp
@@ -141,7 +141,7 @@ void TQRegion::detach()
 	*this = copy();
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*
     Executes region commands in the internal buffer and rebuilds the
     original region.
@@ -280,7 +280,7 @@ TQDataStream &operator>>( TQDataStream &s, TQRegion &r )
     r.exec( b, s.version() );
     return s;
 }
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 // These are not inline - they can be implemented better on some platforms
 //  (eg. Windows at least provides 3-variable operations).  For now, simple.
diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp
index bc7766814..1790eb18d 100644
--- a/src/kernel/qrichtext.cpp
+++ b/src/kernel/qrichtext.cpp
@@ -40,7 +40,7 @@
 
 #include "qrichtext_p.h"
 
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 
 
 #include "ntqstringlist.h"
@@ -255,7 +255,7 @@ TQTextCursor *TQTextDeleteCommand::unexecute( TQTextCursor *c )
     cursor.setParagraph( s );
     cursor.setIndex( index );
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     if ( !styleInformation.isEmpty() ) {
 	TQDataStream styleStream( styleInformation, IO_ReadOnly );
 	int num;
@@ -377,7 +377,7 @@ TQTextStyleCommand::TQTextStyleCommand( TQTextDocument *d, int fParag, int lPara
 TQByteArray TQTextStyleCommand::readStyleInformation(  TQTextDocument* doc, int fParag, int lParag )
 {
     TQByteArray style;
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     TQTextParagraph *p = doc->paragAt( fParag );
     if ( !p )
 	return style;
@@ -394,7 +394,7 @@ TQByteArray TQTextStyleCommand::readStyleInformation(  TQTextDocument* doc, int
 
 void TQTextStyleCommand::writeStyleInformation(  TQTextDocument* doc, int fParag, const TQByteArray& style )
 {
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     TQTextParagraph *p = doc->paragAt( fParag );
     if ( !p )
 	return;
@@ -480,7 +480,7 @@ int TQTextCursor::totalOffsetY() const
     return yoff;
 }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 void TQTextCursor::gotoIntoNested( const TQPoint &globalPos )
 {
     if ( !para )
@@ -506,7 +506,7 @@ void TQTextCursor::invalidateNested()
 	    if ( *it == para )
 		continue;
 	    (*it)->invalidate( 0 );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	    if ( (*it)->at( *it2 )->isCustom() )
 		(*it)->at( *it2 )->customItem()->invalidate();
 #endif
@@ -611,7 +611,7 @@ void TQTextCursor::gotoPreviousLetter()
 
     if ( idx > 0 ) {
 	idx = para->string()->previousCursorPosition( idx );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	const TQTextStringChar *tsc = para->at( idx );
 	if ( tsc && tsc->isCustom() && tsc->customItem()->isNested() )
 	    processNesting( EnterEnd );
@@ -628,7 +628,7 @@ void TQTextCursor::gotoPreviousLetter()
 	    pop();
 	    if ( idx > 0 ) {
 		idx = para->string()->previousCursorPosition( idx );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
                 const TQTextStringChar *tsc = para->at( idx );
                 if ( tsc && tsc->isCustom() && tsc->customItem()->isNested() )
                     processNesting( EnterEnd );
@@ -731,7 +731,7 @@ bool TQTextCursor::place( const TQPoint &p, TQTextParagraph *s, bool link, bool
 	chr = s->at(i);
 	int cpos = x + chr->x;
 	cw = s->string()->width( i );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	if ( chr->isCustom() && chr->customItem()->isNested() ) {
 	    if ( pos.x() >= cpos && pos.x() <= cpos + cw &&
 		 pos.y() >= y + cy && pos.y() <= y + cy + chr->height() ) {
@@ -763,7 +763,7 @@ bool TQTextCursor::place( const TQPoint &p, TQTextParagraph *s, bool link, bool
     }
     setIndex( curpos );
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     if ( inCustom && para->document() && para->at( curpos )->isCustom() && para->at( curpos )->customItem()->isNested() ) {
 	TQTextDocument *oldDoc = para->document();
 	gotoIntoNested( pos );
@@ -789,7 +789,7 @@ bool TQTextCursor::processNesting( Operation op )
     oy = y + para->rect().y();
     bool ok = FALSE;
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     switch ( op ) {
     case EnterBegin:
 	ok = para->at( idx )->customItem()->enter( this, doc, para, idx, ox, oy );
@@ -828,7 +828,7 @@ void TQTextCursor::gotoNextLetter()
 {
    tmpX = -1;
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     const TQTextStringChar *tsc = para->at( idx );
     if ( tsc && tsc->isCustom() && tsc->customItem()->isNested() ) {
 	if ( processNesting( EnterBegin ) )
@@ -1198,7 +1198,7 @@ void TQTextCursor::splitAndInsertEmptyParagraph( bool ind, bool updateIds )
 	for ( uint i = 0; i < str.length(); ++i ) {
 	    TQTextStringChar* tsc = para->at( idx + i );
 	    s->setFormat( i, 1, tsc->format(), TRUE );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	    if ( tsc->isCustom() ) {
 		TQTextCustomItem * item = tsc->customItem();
 		s->at( i )->setCustomItem( item );
@@ -1318,7 +1318,7 @@ void TQTextCursor::fixCursorPosition()
 
 TQTextDocument::TQTextDocument( TQTextDocument *p )
     : par( p ), parentPar( 0 )
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     , tc( 0 )
 #endif
     , tArray( 0 ), tStopWidth( 0 )
@@ -1349,7 +1349,7 @@ void TQTextDocument::init()
     nSelections = 1;
 
     setStyleSheet( TQStyleSheet::defaultSheet() );
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     factory_ = TQMimeSourceFactory::defaultFactory();
 #endif
     contxt = TQString::null;
@@ -1695,7 +1695,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu
 		    }
 		}
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 		TQTextCustomItem* custom =  0;
 #else
 		bool custom = FALSE;
@@ -1712,12 +1712,12 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu
                         hasNewPar = false;
 		    }  else if ( tagname == "hr" ) {
 			emptyTag = space = TRUE;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 			custom = sheet_->tag( tagname, attr, contxt, *factory_ , emptyTag, this );
 #endif
 		    } else if ( tagname == "table" ) {
 			emptyTag = space = TRUE;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 			TQTextFormat format = curtag.format.makeTextFormat(  nstyle, attr, scaleFontsFactor );
 			curpar->setAlignment( curtag.alignment );
 			custom = parseTable( attr, format, doc, length, pos, curpar );
@@ -1728,7 +1728,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu
 			    setPaper( b );
 			}
 			if ( attr.contains( "background" ) ) {
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 			    TQImage img;
 			    TQString bg = attr["background"];
 			    const TQMimeSource* m = factory_->data( bg, contxt );
@@ -1786,7 +1786,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu
 		    }
 		} // end of well-known tag handling
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 		if ( !custom ) // try generic custom item
 		    custom = sheet_->tag( tagname, attr, contxt, *factory_ , emptyTag, this );
 #endif
@@ -1794,7 +1794,7 @@ void TQTextDocument::setRichTextInternal( const TQString &text, TQTextCursor* cu
 		    continue;
 
 		if ( custom ) {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 		    int index = TQMAX( curpar->length(),1) - 1;
 		    TQTextFormat format = curtag.format.makeTextFormat( nstyle, attr, scaleFontsFactor );
 		    curpar->append( TQChar('*') );
@@ -2263,7 +2263,7 @@ TQString TQTextDocument::plainText() const
 	    s = ts->toString(); // with FALSE we don't fix spaces (nbsp)
 	} else {
 	    for ( int i = 0; i < p->length() - 1; ++i ) {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 		if ( p->at( i )->isCustom() ) {
 		    if ( p->at( i )->customItem()->isNested() ) {
 			s += "\n";
@@ -2817,7 +2817,7 @@ TQString TQTextDocument::selectedText( int id, bool asRichText ) const
 	    s += p->string()->toString().mid( c1.index(), end - c1.index() );
 	} else {
 	    for ( int i = c1.index(); i < end; ++i ) {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 		if ( p->at( i )->isCustom() ) {
 		    if ( p->at( i )->customItem()->isNested() ) {
 			s += "\n";
@@ -2847,7 +2847,7 @@ TQString TQTextDocument::selectedText( int id, bool asRichText ) const
 		    s += "\n";
 	    } else {
 		for ( int i = start; i < end; ++i ) {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 		    if ( p->at( i )->isCustom() ) {
 			if ( p->at( i )->customItem()->isNested() ) {
 			    s += "\n";
@@ -3205,7 +3205,7 @@ void TQTextDocument::drawParagraph( TQPainter *p, TQTextParagraph *parag, int cx
     if ( resetChanged )
 	parag->setChanged( FALSE );
     TQRect ir( parag->rect() );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     if (!parag->tableCell())
 #endif
 	ir.setWidth(width());
@@ -3346,7 +3346,7 @@ void TQTextDocument::setDefaultFormat( const TQFont &font, const TQColor &color
     TQTextParagraph *p = fParag;
     while ( p ) {
 	p->invalidate( 0 );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	for ( int i = 0; i < p->length() - 1; ++i )
 	    if ( p->at( i )->isCustom() )
 		p->at( i )->customItem()->invalidate();
@@ -3355,7 +3355,7 @@ void TQTextDocument::setDefaultFormat( const TQFont &font, const TQColor &color
     }
 }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 void TQTextDocument::registerCustomItem( TQTextCustomItem *i, TQTextParagraph *p )
 {
     if ( i && i->placement() != TQTextCustomItem::PlaceInline ) {
@@ -3425,7 +3425,7 @@ bool TQTextDocument::focusNextPrevChild( bool next )
 			focusIndicator.len++;
 			i++;
 		    }
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 		} else if ( p->at( i )->isCustom() ) {
 		    if ( p->at( i )->customItem()->isNested() ) {
 			TQTextTable *t = (TQTextTable*)p->at( i )->customItem();
@@ -3496,7 +3496,7 @@ bool TQTextDocument::focusNextPrevChild( bool next )
 			focusIndicator.start--;
 			i--;
 		    }
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 		} else if ( p->at( i )->isCustom() ) {
 		    if ( p->at( i )->customItem()->isNested() ) {
 			TQTextTable *t = (TQTextTable*)p->at( i )->customItem();
@@ -3768,7 +3768,7 @@ void TQTextString::truncate( int index )
     if ( index < (int)data.size() ) {
 	for ( int i = index + 1; i < (int)data.size(); ++i ) {
 	    TQTextStringChar &ch = data[ i ];
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	    if ( !(ch.type == TQTextStringChar::Regular) ) {
 		delete ch.customItem();
 		if ( ch.d.custom->format )
@@ -3790,7 +3790,7 @@ void TQTextString::remove( int index, int len )
 {
     for ( int i = index; i < (int)data.size() && i - index < len; ++i ) {
 	TQTextStringChar &ch = data[ i ];
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	if ( !(ch.type == TQTextStringChar::Regular) ) {
 	    delete ch.customItem();
 	    if ( ch.d.custom->format )
@@ -3813,7 +3813,7 @@ void TQTextString::clear()
 {
     for ( int i = 0; i < (int)data.count(); ++i ) {
 	TQTextStringChar &ch = data[ i ];
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	if ( !(ch.type == TQTextStringChar::Regular) ) {
 	    if ( ch.customItem() && ch.customItem()->placement() == TQTextCustomItem::PlaceInline )
 		delete ch.customItem();
@@ -3931,7 +3931,7 @@ void TQTextStringChar::setFormat( TQTextFormat *f )
     if ( type == Regular ) {
  	d.format = f;
     } else {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
  	if ( !d.custom ) {
  	    d.custom = new CustomData;
  	    d.custom->custom = 0;
@@ -3941,7 +3941,7 @@ void TQTextStringChar::setFormat( TQTextFormat *f )
     }
 }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 void TQTextStringChar::setCustomItem( TQTextCustomItem *i )
 {
     if ( type == Regular ) {
@@ -3992,7 +3992,7 @@ void TQTextStringChar::setAnchor( const TQString& name, const TQString& href )
     if ( type == Regular ) {
 	TQTextFormat *f = format();
 	d.custom = new CustomData;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	d.custom->custom = 0;
 #endif
 	d.custom->format = f;
@@ -4011,7 +4011,7 @@ int TQTextString::width( int idx ) const
      TQTextStringChar *c = &at( idx );
      if ( !c->charStop || c->c.unicode() == 0xad || c->c.unicode() == 0x2028 )
 	 return 0;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
      if( c->isCustom() ) {
 	 if( c->customItem()->placement() == TQTextCustomItem::PlaceInline )
 	     w = c->customItem()->width;
@@ -4041,7 +4041,7 @@ TQTextParagraph::TQTextParagraph( TQTextDocument *d, TQTextParagraph *pr, TQText
       lastInFrame(FALSE), visible(TRUE), breakable(TRUE), movedDown(FALSE),
       mightHaveCustomItems(FALSE), hasdoc( d != 0 ), litem(FALSE), rtext(FALSE),
       align( 0 ), lstyle( TQStyleSheetItem::ListDisc ), invalid( 0 ), mSelections( 0 ),
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
       mFloatingItems( 0 ),
 #endif
       utm( 0 ), ubm( 0 ), ulm( 0 ), urm( 0 ), uflm( 0 ), ulinespacing( 0 ),
@@ -4110,7 +4110,7 @@ TQTextParagraph::~TQTextParagraph()
 	delete *it;
     if ( mSelections )
 	delete mSelections;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     if ( mFloatingItems )
 	delete mFloatingItems;
 #endif
@@ -4141,7 +4141,7 @@ void TQTextParagraph::invalidate( int chr )
 	invalid = chr;
     else
 	invalid = TQMIN( invalid, chr );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     if ( mFloatingItems ) {
 	for ( TQTextCustomItem *i = mFloatingItems->first(); i; i = mFloatingItems->next() )
 	    i->ypos = -1;
@@ -4184,7 +4184,7 @@ void TQTextParagraph::remove( int index, int len )
 {
     if ( index + len - str->length() > 0 )
 	return;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     for ( int i = index; i < index + len; ++i ) {
 	TQTextStringChar *c = at( i );
 	if ( hasdoc && c->isCustom() ) {
@@ -4218,7 +4218,7 @@ void TQTextParagraph::join( TQTextParagraph *s )
 	    s->str->at( i ).format()->addRef();
 	    str->setFormat( i + start, s->str->at( i ).format(), TRUE );
 	}
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	if ( s->str->at( i ).isCustom() ) {
 	    TQTextCustomItem * item = s->str->at( i ).customItem();
 	    str->at( i + start ).setCustomItem( item );
@@ -4267,7 +4267,7 @@ void TQTextParagraph::move( int &dy )
 	return;
     changed = TRUE;
     r.moveBy( 0, dy );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     if ( mFloatingItems ) {
 	for ( TQTextCustomItem *i = mFloatingItems->first(); i; i = mFloatingItems->next() )
 	    i->ypos += dy;
@@ -4311,7 +4311,7 @@ void TQTextParagraph::format( int start, bool doMove )
  formatAgain:
 
     r.setWidth( documentWidth() );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     if ( hasdoc && mFloatingItems ) {
 	for ( TQTextCustomItem *i = mFloatingItems->first(); i; i = mFloatingItems->next() ) {
 	    i->ypos = r.y();
@@ -4680,7 +4680,7 @@ void TQTextParagraph::paint( TQPainter &painter, const TQColorGroup &cg, TQTextC
 		    drawString( painter, qstr, paintStart, i - paintStart + (ignoreSoftHyphen ? 0 : 1), xstart, y,
 				baseLine, xend-xstart, h, drawSelections, fullSelectionWidth,
 				chr, cg, chr->rightToLeft );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 		else if ( chr->customItem()->placement() == TQTextCustomItem::PlaceInline ) {
 		    bool inSelection = FALSE;
 		    if (drawSelections) {
@@ -5004,7 +5004,7 @@ void TQTextParagraph::drawLabel( TQPainter* p, int x, int y, int w, int h, int b
     p->restore();
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 void TQTextParagraph::readStyleInformation( TQDataStream& stream )
 {
     int int_align, int_lstyle;
@@ -5087,7 +5087,7 @@ int TQTextParagraph::nextTab( int, int x )
 
 void TQTextParagraph::adjustToPainter( TQPainter *p )
 {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     for ( int i = 0; i < length(); ++i ) {
 	if ( at( i )->isCustom() )
 	    at( i )->customItem()->adjustToPainter( p );
@@ -5148,7 +5148,7 @@ TQString TQTextParagraph::richText() const
 	    s += "&";
 	else if ( c->c =='\"' )
 	    s += """;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	else if ( c->isCustom() )
 	    s += c->customItem()->richText();
 #endif
@@ -5315,7 +5315,7 @@ TQTextLineStart *TQTextFormatter::formatLine( TQTextParagraph *parag, TQTextStri
 {
     if ( lastChar < startChar )
 	return new TQTextLineStart;
-#ifndef QT_NO_COMPLEXTEXT
+#ifndef TQT_NO_COMPLEXTEXT
     if( string->isBidi() )
 	return bidiReorderLine( parag, string, line, startChar, lastChar, align, space );
 #endif
@@ -5372,7 +5372,7 @@ TQTextLineStart *TQTextFormatter::formatLine( TQTextParagraph *parag, TQTextStri
     return new TQTextLineStart;
 }
 
-#ifndef QT_NO_COMPLEXTEXT
+#ifndef TQT_NO_COMPLEXTEXT
 
 #ifdef BIDI_DEBUG
 #include 
@@ -5538,7 +5538,7 @@ int TQTextFormatter::formatVertically( TQTextDocument* doc, TQTextParagraph* par
 	TQTextLineStart * ls = it.data();
 	ls->y = h;
 	TQTextStringChar *c = ¶g->string()->at(it.key());
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	if ( c && c->customItem() && c->customItem()->ownLine() ) {
 	    int h = c->customItem()->height;
 	    c->customItem()->pageBreak( parag->rect().y() + ls->y + ls->baseLine - h, doc->flow() );
@@ -5636,7 +5636,7 @@ int TQTextFormatterBreakInWords::format( TQTextDocument *doc,TQTextParagraph *pa
 	    ww = c->format()->width( ' ' );
 	}
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	if ( c->isCustom() && c->customItem()->ownLine() ) {
 	    x = doc ? doc->flow()->adjustLMargin( y + parag->rect().y(), parag->rect().height(), left, 4 ) : left;
 	    w = dw - ( doc ? doc->flow()->adjustRMargin( y + parag->rect().y(), parag->rect().height(), rm, 4 ) : 0 );
@@ -5811,7 +5811,7 @@ int TQTextFormatterBreakWords::format( TQTextDocument *doc, TQTextParagraph *par
         if (col != 0 && ::category(c->c) == TQChar::Mark_NonSpacing)
             --col;
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	lastWasNonInlineCustom =  ( c->isCustom() && c->customItem()->placement() != TQTextCustomItem::PlaceInline );
 #endif
 
@@ -5833,7 +5833,7 @@ int TQTextFormatterBreakWords::format( TQTextDocument *doc, TQTextParagraph *par
 	    ww = c->format()->width( ' ' );
 	}
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	TQTextCustomItem* ci = c->customItem();
 	if ( c->isCustom() && ci->ownLine() ) {
 	    TQTextLineStart *lineStart2 = formatLine( parag, string, lineStart, firstChar, c-1, align, SPACE(w - x - ww) );
@@ -6556,7 +6556,7 @@ TQTextFormat TQTextFormat::makeTextFormat( const TQStyleSheetItem *style, const
     return format;
 }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 
 struct TQPixmapInt
 {
@@ -6621,7 +6621,7 @@ TQTextImage::TQTextImage( TQTextDocument *p, const TQMap &at
 		    }
 		}
 		if ( img.width() != width || img.height() != height ){
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
 		    img = img.smoothScale(width, height);
 #endif
 		    width = img.width();
@@ -6800,7 +6800,7 @@ void TQTextHorizontalLine::draw( TQPainter* p, int x, int y, int , int , int , i
 	qDrawShadeLine( p, r.left() - 1, y + height / 2, r.right() + 1, y + height / 2, g, TRUE, height / 8 );
     }
 }
-#endif //QT_NO_TEXTCUSTOMITEM
+#endif //TQT_NO_TEXTCUSTOMITEM
 
 /*****************************************************************/
 // Small set of utility functions to make the parser a bit simpler
@@ -6824,7 +6824,7 @@ bool TQTextDocument::hasPrefix( const TQChar* doc, int length, int pos, const TQ
     return TRUE;
 }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 static bool qt_is_cell_in_use( TQPtrList& cells, int row, int col )
 {
     for ( TQTextTableCell* c = cells.first(); c; c = cells.next() ) {
@@ -6930,7 +6930,7 @@ TQTextCustomItem* TQTextDocument::parseTable( const TQMap &a
     }
     return table;
 }
-#endif // QT_NO_TEXTCUSTOMITEM
+#endif // TQT_NO_TEXTCUSTOMITEM
 
 bool TQTextDocument::eatSpace(const TQChar* doc, int length, int& pos, bool includeNbsp )
 {
@@ -7443,7 +7443,7 @@ TQTextFlow::~TQTextFlow()
 
 void TQTextFlow::clear()
 {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     leftItems.setAutoDelete( TRUE );
     rightItems.setAutoDelete( TRUE );
     leftItems.clear();
@@ -7460,7 +7460,7 @@ void TQTextFlow::setWidth( int width )
 
 int TQTextFlow::adjustLMargin( int yp, int, int margin, int space )
 {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     for ( TQTextCustomItem* item = leftItems.first(); item; item = leftItems.next() ) {
 	if ( item->ypos == -1 )
 	    continue;
@@ -7473,7 +7473,7 @@ int TQTextFlow::adjustLMargin( int yp, int, int margin, int space )
 
 int TQTextFlow::adjustRMargin( int yp, int, int margin, int space )
 {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     for ( TQTextCustomItem* item = rightItems.first(); item; item = rightItems.next() ) {
 	if ( item->ypos == -1 )
 	    continue;
@@ -7498,7 +7498,7 @@ int TQTextFlow::adjustFlow( int y, int /*w*/, int h )
     return 0;
 }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 void TQTextFlow::unregisterFloatingItem( TQTextCustomItem* item )
 {
     leftItems.removeRef( item );
@@ -7515,12 +7515,12 @@ void TQTextFlow::registerFloatingItem( TQTextCustomItem* item )
 	leftItems.append( item );
     }
 }
-#endif // QT_NO_TEXTCUSTOMITEM
+#endif // TQT_NO_TEXTCUSTOMITEM
 
 TQRect TQTextFlow::boundingRect() const
 {
     TQRect br;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQPtrListIterator l( leftItems );
     while( l.current() ) {
 	br = br.unite( l.current()->geometry() );
@@ -7538,7 +7538,7 @@ TQRect TQTextFlow::boundingRect() const
 
 void TQTextFlow::drawFloatingItems( TQPainter* p, int cx, int cy, int cw, int ch, const TQColorGroup& cg, bool selected )
 {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQTextCustomItem *item;
     for ( item = leftItems.first(); item; item = leftItems.next() ) {
 	if ( item->xpos == -1 || item->ypos == -1 )
@@ -7556,13 +7556,13 @@ void TQTextFlow::drawFloatingItems( TQPainter* p, int cx, int cy, int cw, int ch
 
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 void TQTextCustomItem::pageBreak( int /*y*/ , TQTextFlow* /*flow*/ )
 {
 }
 #endif
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 TQTextTable::TQTextTable( TQTextDocument *p, const TQMap & attr  )
     : TQTextCustomItem( p )
 {
@@ -8257,4 +8257,4 @@ void TQTextTableCell::draw( TQPainter* p, int x, int y, int cx, int cy, int cw,
 }
 #endif
 
-#endif //QT_NO_RICHTEXT
+#endif //TQT_NO_RICHTEXT
diff --git a/src/kernel/qrichtext_p.cpp b/src/kernel/qrichtext_p.cpp
index 7e55b6038..4411b4d45 100644
--- a/src/kernel/qrichtext_p.cpp
+++ b/src/kernel/qrichtext_p.cpp
@@ -40,13 +40,13 @@
 
 #include "qrichtext_p.h"
 
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 
 TQTextCommand::~TQTextCommand() {}
 TQTextCommand::Commands TQTextCommand::type() const { return Invalid; }
 
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 TQTextCustomItem::~TQTextCustomItem() {}
 void TQTextCustomItem::adjustToPainter( TQPainter* p){ if ( p ) width = 0; }
 TQTextCustomItem::Placement TQTextCustomItem::placement() const { return PlaceInline; }
@@ -84,16 +84,16 @@ bool TQTextCustomItem::up( TQTextCursor *, TQTextDocument *&, TQTextParagraph *&
 {
     return TRUE;
 }
-#endif // QT_NO_TEXTCUSTOMITEM
+#endif // TQT_NO_TEXTCUSTOMITEM
 
 void TQTextFlow::setPageSize( int ps ) { pagesize = ps; }
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 bool TQTextFlow::isEmpty() { return leftItems.isEmpty() && rightItems.isEmpty(); }
 #else
 bool TQTextFlow::isEmpty() { return TRUE; }
 #endif
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 void TQTextTableCell::invalidate() { cached_width = -1; cached_sizehint = -1; }
 
 void TQTextTable::invalidate() { cachewidth = -1; }
@@ -612,7 +612,7 @@ TQMap &TQTextParagraph::selections() const
     return *mSelections;
 }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 TQPtrList &TQTextParagraph::floatingItems() const
 {
     if ( !mFloatingItems )
@@ -633,4 +633,4 @@ TQTextParagraphPseudoDocument::TQTextParagraphPseudoDocument():pFormatter(0),com
 TQTextParagraphPseudoDocument::~TQTextParagraphPseudoDocument(){ delete pFormatter; delete commandHistory; }
 
 
-#endif //QT_NO_RICHTEXT
+#endif //TQT_NO_RICHTEXT
diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h
index 48c7b0a47..4e26675ab 100644
--- a/src/kernel/qrichtext_p.h
+++ b/src/kernel/qrichtext_p.h
@@ -77,7 +77,7 @@
 #include "ntqapplication.h"
 #endif // QT_H
 
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 
 class TQTextDocument;
 class TQTextString;
@@ -89,7 +89,7 @@ class TQTextFormatter;
 class TQTextIndent;
 class TQTextFormatCollection;
 class TQStyleSheetItem;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 class TQTextCustomItem;
 #endif
 class TQTextFlow;
@@ -109,7 +109,7 @@ public:
     struct CustomData
     {
 	TQTextFormat *format;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 	TQTextCustomItem *custom;
 #endif
 	TQString anchorName;
@@ -142,15 +142,15 @@ public:
     int descent() const;
     bool isCustom() const { return (type & Custom) != 0; }
     TQTextFormat *format() const;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQTextCustomItem *customItem() const;
 #endif
     void setFormat( TQTextFormat *f );
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     void setCustomItem( TQTextCustomItem *i );
 #endif
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     void loseCustomItem();
 #endif
 
@@ -457,7 +457,7 @@ inline TQTextCommandHistory::~TQTextCommandHistory()
 
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 class Q_EXPORT TQTextCustomItem
 {
 public:
@@ -513,7 +513,7 @@ public:
 // MOC_SKIP_END
 #endif
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 class Q_EXPORT TQTextImage : public TQTextCustomItem
 {
 public:
@@ -540,7 +540,7 @@ private:
 };
 #endif
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 class Q_EXPORT TQTextHorizontalLine : public TQTextCustomItem
 {
 public:
@@ -562,7 +562,7 @@ private:
 };
 #endif
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 #if defined(Q_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
 Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList;
@@ -573,7 +573,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQPtrList;
 class Q_EXPORT TQTextFlow
 {
     friend class TQTextDocument;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     friend class TQTextTableCell;
 #endif
 
@@ -590,7 +590,7 @@ public:
     virtual int adjustLMargin( int yp, int h, int margin, int space );
     virtual int adjustRMargin( int yp, int h, int margin, int space );
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     virtual void registerFloatingItem( TQTextCustomItem* item );
     virtual void unregisterFloatingItem( TQTextCustomItem* item );
 #endif
@@ -607,7 +607,7 @@ private:
     int w;
     int pagesize;
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQPtrList leftItems;
     TQPtrList rightItems;
 #endif
@@ -615,7 +615,7 @@ private:
 
 inline int TQTextFlow::width() const { return w; }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 class TQTextTable;
 
 class Q_EXPORT TQTextTableCell : public TQLayoutItem
@@ -688,7 +688,7 @@ Q_TEMPLATE_EXTERN template class Q_EXPORT TQMap;
 // MOC_SKIP_END
 #endif
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 class Q_EXPORT TQTextTable: public TQTextCustomItem
 {
     friend class TQTextTableCell;
@@ -751,7 +751,7 @@ private:
 #endif
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 class TQTextTableCell;
 class TQTextParagraph;
 #endif
@@ -776,7 +776,7 @@ class Q_EXPORT TQTextDocument : public TQObject
 {
     TQ_OBJECT
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     friend class TQTextTableCell;
 #endif
     friend class TQTextCursor;
@@ -877,14 +877,14 @@ public:
     bool inSelection( int selId, const TQPoint &pos ) const;
 
     TQStyleSheet *styleSheet() const { return sheet_; }
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     TQMimeSourceFactory *mimeSourceFactory() const { return factory_; }
 #endif
     TQString context() const { return contxt; }
 
     void setStyleSheet( TQStyleSheet *s );
     void setDefaultFormat( const TQFont &font, const TQColor &color );
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     void setMimeSourceFactory( TQMimeSourceFactory *f ) { if ( f ) factory_ = f; }
 #endif
     void setContext( const TQString &c ) { if ( !c.isEmpty() ) contxt = c; }
@@ -906,7 +906,7 @@ public:
 		      bool onlyChanged = FALSE, bool drawCursor = FALSE, TQTextCursor *cursor = 0,
 		      bool resetChanged = TRUE );
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     void registerCustomItem( TQTextCustomItem *i, TQTextParagraph *p );
     void unregisterCustomItem( TQTextCustomItem *i, TQTextParagraph *p );
 #endif
@@ -920,7 +920,7 @@ public:
     void setUseFormatCollection( bool b ) { useFC = b; }
     bool useFormatCollection() const { return useFC; }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQTextTableCell *tableCell() const { return tc; }
     void setTableCell( TQTextTableCell *c ) { tc = c; }
 #endif
@@ -968,7 +968,7 @@ private:
     // HTML parser
     bool hasPrefix(const TQChar* doc, int length, int pos, TQChar c);
     bool hasPrefix(const TQChar* doc, int length, int pos, const TQString& s);
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQTextCustomItem* parseTable( const TQMap &attr, const TQTextFormat &fmt,
 				 const TQChar* doc, int length, int& pos, TQTextParagraph *curpar );
 #endif
@@ -1014,7 +1014,7 @@ private:
     TQTextFlow *flow_;
     TQTextDocument *par;
     TQTextParagraph *parentPar;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQTextTableCell *tc;
 #endif
     TQBrush *backBrush;
@@ -1026,7 +1026,7 @@ private:
     int rightmargin;
     TQTextParagraph *minwParag, *curParag;
     TQStyleSheet* sheet_;
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     TQMimeSourceFactory* factory_;
 #endif
     TQString contxt;
@@ -1272,7 +1272,7 @@ public:
     int rightMargin() const;
     int lineSpacing() const;
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     void registerFloatingItem( TQTextCustomItem *i );
     void unregisterFloatingItem( TQTextCustomItem *i );
 #endif
@@ -1280,7 +1280,7 @@ public:
     void setFullWidth( bool b ) { fullWidth = b; }
     bool isFullWidth() const { return fullWidth; }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQTextTableCell *tableCell() const;
 #endif
 
@@ -1338,7 +1338,7 @@ protected:
 
 private:
     TQMap &selections() const;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQPtrList &floatingItems() const;
 #endif
     TQBrush backgroundBrush( const TQColorGroup&cg ) { if ( bgcol ) return *bgcol; return cg.brush( TQColorGroup::Base ); }
@@ -1367,7 +1367,7 @@ private:
     int state, id;
     TQTextString *str;
     TQMap *mSelections;
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     TQPtrList *mFloatingItems;
 #endif
     short utm, ubm, ulm, urm, uflm, ulinespacing;
@@ -1405,7 +1405,7 @@ public:
 protected:
     virtual TQTextLineStart *formatLine( TQTextParagraph *parag, TQTextString *string, TQTextLineStart *line, TQTextStringChar *start,
 					       TQTextStringChar *last, int align = TQt::AlignAuto, int space = 0 );
-#ifndef QT_NO_COMPLEXTEXT
+#ifndef TQT_NO_COMPLEXTEXT
     virtual TQTextLineStart *bidiReorderLine( TQTextParagraph *parag, TQTextString *string, TQTextLineStart *line, TQTextStringChar *start,
 						    TQTextStringChar *last, int align, int space );
 #endif
@@ -2013,7 +2013,7 @@ inline TQTextParagraphPseudoDocument *TQTextParagraph::pseudoDocument() const
 }
 
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 inline TQTextTableCell *TQTextParagraph::tableCell() const
 {
     return hasdoc ? document()->tableCell () : 0;
@@ -2031,7 +2031,7 @@ inline int TQTextParagraph::alignment() const
     return align;
 }
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 inline void TQTextParagraph::registerFloatingItem( TQTextCustomItem *i )
 {
     floatingItems().append( i );
@@ -2045,7 +2045,7 @@ inline void TQTextParagraph::unregisterFloatingItem( TQTextCustomItem *i )
 
 inline TQBrush *TQTextParagraph::background() const
 {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     return tableCell() ? tableCell()->backGround() : 0;
 #else
     return 0;
@@ -2102,7 +2102,7 @@ inline TQTextFormat *TQTextStringChar::format() const
 }
 
 
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 inline TQTextCustomItem *TQTextStringChar::customItem() const
 {
     return isCustom() ? d.custom->custom : 0;
@@ -2111,7 +2111,7 @@ inline TQTextCustomItem *TQTextStringChar::customItem() const
 
 inline int TQTextStringChar::height() const
 {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     return !isCustom() ? format()->height() : ( customItem()->placement() == TQTextCustomItem::PlaceInline ? customItem()->height : 0 );
 #else
     return format()->height();
@@ -2120,7 +2120,7 @@ inline int TQTextStringChar::height() const
 
 inline int TQTextStringChar::ascent() const
 {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     return !isCustom() ? format()->ascent() : ( customItem()->placement() == TQTextCustomItem::PlaceInline ? customItem()->ascent() : 0 );
 #else
     return format()->ascent();
@@ -2129,13 +2129,13 @@ inline int TQTextStringChar::ascent() const
 
 inline int TQTextStringChar::descent() const
 {
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
     return !isCustom() ? format()->descent() : 0;
 #else
     return format()->descent();
 #endif
 }
 
-#endif //QT_NO_RICHTEXT
+#endif //TQT_NO_RICHTEXT
 
 #endif
diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp
index 202402556..40111e2be 100644
--- a/src/kernel/qscriptengine.cpp
+++ b/src/kernel/qscriptengine.cpp
@@ -404,7 +404,7 @@ static bool basic_shape(TQShaperItem *item)
 enum {
     CcmpProperty = 0x1
 };
-#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
+#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
 static const TQOpenType::Features hebrew_features[] = {
     { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },
     {0, 0}
@@ -419,7 +419,7 @@ static bool hebrew_shape(TQShaperItem *item)
 {
     Q_ASSERT(item->script == TQFont::Hebrew);
 
-#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
+#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
     TQOpenType *openType = item->font->openType();
 
     if (openType && openType->supportsScript(item->script)) {
@@ -1460,7 +1460,7 @@ static void shapedString(const TQString *uc, int from, int len, TQChar *shapeBuf
     *shapedLength = data - shapeBuffer;
 }
 
-#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
+#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
 
 enum {
     InitProperty = 0x2,
@@ -1582,7 +1582,7 @@ static bool arabic_shape(TQShaperItem *item)
 {
     Q_ASSERT(item->script == TQFont::Arabic);
 
-#if defined(Q_WS_X11) && !defined(QT_NO_XFTFREETYPE)
+#if defined(Q_WS_X11) && !defined(TQT_NO_XFTFREETYPE)
     TQOpenType *openType = item->font->openType();
 
     if (openType && openType->supportsScript(TQFont::Arabic)) {
diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/qscriptengine_x11.cpp
index e01888f50..97ae6828b 100644
--- a/src/kernel/qscriptengine_x11.cpp
+++ b/src/kernel/qscriptengine_x11.cpp
@@ -45,7 +45,7 @@ static bool syriac_shape(TQShaperItem *item)
 {
     Q_ASSERT(item->script == TQFont::Syriac);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     TQOpenType *openType = item->font->openType();
     if (openType && openType->supportsScript(TQFont::Syriac)) {
         bool ot_ok;
@@ -64,7 +64,7 @@ static bool thaana_shape(TQShaperItem *item)
 {
     Q_ASSERT(item->script == TQFont::Thaana);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     TQOpenType *openType = item->font->openType();
 
     if (openType && openType->supportsScript(item->script)) {
@@ -1167,7 +1167,7 @@ enum IndicProperties {
     CligProperty = 0x10000
 };
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 static const TQOpenType::Features indic_features[] = {
     { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },
     { FT_MAKE_TAG('i', 'n', 'i', 't'), InitProperty },
@@ -1571,7 +1571,7 @@ static bool indic_shape_syllable(TQOpenType *openType, TQShaperItem *item, bool
     for (i = 0; i < len; ++i)
         control |= (form(reordered[i]) == Control);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (openType) {
 
         // we need to keep track of where the base glyph is for some
@@ -1816,7 +1816,7 @@ static bool indic_shape(TQShaperItem *item)
 {
     Q_ASSERT(item->script >= TQFont::Devanagari && item->script <= TQFont::Sinhala);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     TQOpenType *openType = item->font->openType();
     if (openType)
         openType->selectScript(item->script, indic_features);
@@ -1905,12 +1905,12 @@ static void indic_attributes(int script, const TQString &text, int from, int len
 
 static void thaiWordBreaks(const TQChar *string, const int len, TQCharAttributes *attributes)
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     typedef int (*th_brk_def)(const char*, int[], int);
     static TQTextCodec *thaiCodec = TQTextCodec::codecForMib(2259);
     static th_brk_def th_brk = 0;
 
-#ifndef QT_NO_LIBRARY
+#ifndef TQT_NO_LIBRARY
     /* load libthai dynamically */
     if (!th_brk && thaiCodec) {
         th_brk = (th_brk_def)TQLibrary::resolve("thai", "th_brk");
@@ -2026,7 +2026,7 @@ static inline TibetanForm tibetan_form(const TQChar &c)
     return (TibetanForm)tibetanForm[c.unicode() - 0x0f40];
 }
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 static const TQOpenType::Features tibetan_features[] = {
     { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },
     { FT_MAKE_TAG('a', 'b', 'v', 's'), AboveSubstProperty },
@@ -2070,7 +2070,7 @@ static bool tibetan_shape_syllable(TQOpenType *openType, TQShaperItem *item, boo
 
     // now we have the syllable in the right order, and can start running it through open type.
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (openType && openType->supportsScript(TQFont::Tibetan)) {
         openType->selectScript(TQFont::Tibetan, tibetan_features);
 
@@ -2133,7 +2133,7 @@ static bool tibetan_shape(TQShaperItem *item)
 {
     Q_ASSERT(item->script == TQFont::Tibetan);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     TQOpenType *openType = item->font->openType();
     if (openType && !openType->supportsScript(item->script))
         openType = 0;
@@ -2509,7 +2509,7 @@ static inline int khmer_nextSyllableBoundary(const TQString &s, int start, int e
 }
 
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 static const TQOpenType::Features khmer_features[] = {
     { FT_MAKE_TAG( 'p', 'r', 'e', 'f' ), PreFormProperty },
     { FT_MAKE_TAG( 'b', 'l', 'w', 'f' ), BelowFormProperty },
@@ -2527,7 +2527,7 @@ static const TQOpenType::Features khmer_features[] = {
 
 static bool khmer_shape_syllable(TQOpenType *openType, TQShaperItem *item)
 {
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (openType)
         openType->selectScript(TQFont::Khmer, khmer_features);
 #endif
@@ -2723,7 +2723,7 @@ static bool khmer_shape_syllable(TQOpenType *openType, TQShaperItem *item)
 
     // now we have the syllable in the right order, and can start running it through open type.
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (openType) {
 	uint where[16];
 
@@ -2762,7 +2762,7 @@ static bool khmer_shape(TQShaperItem *item)
 {
     assert(item->script == TQFont::Khmer);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     TQOpenType *openType = item->font->openType();
     if (openType && !openType->supportsScript(item->script))
         openType = 0;
@@ -3033,7 +3033,7 @@ static inline int myanmar_nextSyllableBoundary(const TQString &s, int start, int
 }
 
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 // ###### might have to change order of above and below forms and substitutions,
 // but according to Unicode below comes before above
 static const TQOpenType::Features myanmar_features[] = {
@@ -3066,7 +3066,7 @@ static const TQOpenType::Features myanmar_features[] = {
 
 static bool myanmar_shape_syllable(TQOpenType *openType, TQShaperItem *item, bool invalid)
 {
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (openType)
         openType->selectScript(TQFont::Myanmar, myanmar_features);
 #endif
@@ -3230,7 +3230,7 @@ static bool myanmar_shape_syllable(TQOpenType *openType, TQShaperItem *item, boo
 
     // now we have the syllable in the right order, and can start running it through open type.
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (openType) {
 	uint where[32];
 
@@ -3269,7 +3269,7 @@ static bool myanmar_shape(TQShaperItem *item)
 {
     assert(item->script == TQFont::Myanmar);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     TQOpenType *openType = item->font->openType();
     if (openType && !openType->supportsScript(item->script))
         openType = 0;
@@ -3452,7 +3452,7 @@ static int hangul_nextSyllableBoundary(const TQString &s, int start, int end)
     return start+pos;
 }
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 static const TQOpenType::Features hangul_features [] = {
     { FT_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },
     { FT_MAKE_TAG('l', 'j', 'm', 'o'), CcmpProperty },
@@ -3510,7 +3510,7 @@ static bool hangul_shape_syllable(TQOpenType *openType, TQShaperItem *item)
         IDEBUG("    %d: %4x", i, ch[i].unicode());
     }
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (openType && !composed) {
 
         TQVarLengthArray logClusters(len);
@@ -3544,7 +3544,7 @@ static bool hangul_shape(TQShaperItem *item)
     }
 
     if (!allPrecomposed) {
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
         TQOpenType *openType = item->font->openType();
         if (openType && !openType->supportsScript(item->script))
             openType = 0;
diff --git a/src/kernel/qsignal.cpp b/src/kernel/qsignal.cpp
index 8d91f0e6f..c26106abb 100644
--- a/src/kernel/qsignal.cpp
+++ b/src/kernel/qsignal.cpp
@@ -115,7 +115,7 @@ TQSignal::TQSignal( TQObject *parent, const char *name )
     : TQObject( parent, name )
 {
     isSignal = TRUE;
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     val = 0;
 #endif
 }
@@ -127,7 +127,7 @@ TQSignal::TQSignal( TQObject *parent, const char *name )
 TQSignal::~TQSignal()
 {
 }
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
 // Returns TRUE if it matches ".+(.*int.*"
 static inline bool intSignature( const char *member )
 {
@@ -144,11 +144,11 @@ static inline bool intSignature( const char *member )
 
 bool TQSignal::connect( const TQObject *receiver, const char *member )
 {
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     if ( intSignature( member ) )
 #endif
 	return TQObject::connect( (TQObject *)this, SIGNAL(intSignal(int)), receiver, member );
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     return TQObject::connect( (TQObject *)this, SIGNAL(signal(const TQVariant&)),
 			     receiver, member );
 #endif
@@ -164,11 +164,11 @@ bool TQSignal::disconnect( const TQObject *receiver, const char *member )
 {
     if (!member)
 	return TQObject::disconnect( (TQObject *)this, 0, receiver, member);
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     if ( intSignature( member ) )
 #endif
 	return TQObject::disconnect( (TQObject *)this, SIGNAL(intSignal(int)), receiver, member );
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     return TQObject::disconnect( (TQObject *)this, SIGNAL(signal(const TQVariant&)),
 				receiver, member );
 #endif
@@ -205,7 +205,7 @@ bool TQSignal::disconnect( const TQObject *receiver, const char *member )
 */
 void  TQSignal::activate()
 {
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
     /* Create this TQGuardedPtr on this, if we get destroyed after the intSignal (but before the variant signal)
        we cannot just emit the signal (because val has been destroyed already) */
     TQGuardedPtr me = this;
@@ -218,7 +218,7 @@ void  TQSignal::activate()
 #endif
 }
 
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
 /*!
     Sets the signal's parameter to \a value
 */
@@ -254,4 +254,4 @@ int TQSignal::parameter() const
     return val.toInt();
 }
 #endif
-#endif //QT_NO_VARIANT
+#endif //TQT_NO_VARIANT
diff --git a/src/kernel/qsignalmapper.cpp b/src/kernel/qsignalmapper.cpp
index 0e23de826..ce6f21759 100644
--- a/src/kernel/qsignalmapper.cpp
+++ b/src/kernel/qsignalmapper.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqsignalmapper.h"
-#ifndef QT_NO_SIGNALMAPPER
+#ifndef TQT_NO_SIGNALMAPPER
 #include "ntqptrdict.h"
 
 struct TQSignalMapperRec {
@@ -180,4 +180,4 @@ TQSignalMapperRec* TQSignalMapper::getRec( const TQObject* sender )
 
     \sa setMapping()
 */
-#endif //QT_NO_SIGNALMAPPER
+#endif //TQT_NO_SIGNALMAPPER
diff --git a/src/kernel/qsimplerichtext.cpp b/src/kernel/qsimplerichtext.cpp
index e9fd7f1d4..a6e1271c4 100644
--- a/src/kernel/qsimplerichtext.cpp
+++ b/src/kernel/qsimplerichtext.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsimplerichtext.h"
 
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 #include "qrichtext_p.h"
 #include "ntqapplication.h"
 
@@ -193,7 +193,7 @@ TQSimpleRichText::TQSimpleRichText( const TQString& text, const TQFont& fnt,
     d->doc->setDefaultFormat( fnt, TQColor() );
     d->doc->flow()->setPageSize( pageBreak );
     d->doc->setPageBreakEnabled( TRUE );
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     d->doc->setMimeSourceFactory( (TQMimeSourceFactory*)factory );
 #endif
     d->doc->setUnderlineLinks( linkUnderline );
@@ -418,4 +418,4 @@ void TQSimpleRichText::setDefaultFont( const TQFont &f )
     d->doc->setText( d->doc->originalText(), d->doc->context() );
 }
 
-#endif //QT_NO_RICHTEXT
+#endif //TQT_NO_RICHTEXT
diff --git a/src/kernel/qsize.cpp b/src/kernel/qsize.cpp
index 2fbe1f4e8..988d54fe0 100644
--- a/src/kernel/qsize.cpp
+++ b/src/kernel/qsize.cpp
@@ -389,7 +389,7 @@ void TQSize::warningDivByZero()
 /*****************************************************************************
   TQSize stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
   \relates TQSize
   Writes the size \a sz to the stream \a s and returns a reference to
@@ -429,4 +429,4 @@ TQDataStream &operator>>( TQDataStream &s, TQSize &sz )
     }
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
diff --git a/src/kernel/qsizegrip.cpp b/src/kernel/qsizegrip.cpp
index ae46ca62a..5dbaaa326 100644
--- a/src/kernel/qsizegrip.cpp
+++ b/src/kernel/qsizegrip.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsizegrip.h"
 
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
 
 #include "ntqpainter.h"
 #include "ntqapplication.h"
@@ -111,7 +111,7 @@ static TQWidget* qt_sizegrip_workspace( TQWidget* w )
 TQSizeGrip::TQSizeGrip( TQWidget * parent, const char* name )
     : TQWidget( parent, name )
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 #ifndef Q_WS_MAC
     if ( TQApplication::reverseLayout() )
 	setCursor( sizeBDiagCursor );
@@ -283,4 +283,4 @@ bool TQSizeGrip::eventFilter( TQObject *o, TQEvent *e )
     return FALSE;
 }
 
-#endif //QT_NO_SIZEGRIP
+#endif //TQT_NO_SIZEGRIP
diff --git a/src/kernel/qsound.cpp b/src/kernel/qsound.cpp
index dd46cc742..98d210427 100644
--- a/src/kernel/qsound.cpp
+++ b/src/kernel/qsound.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsound.h"
 
-#ifndef QT_NO_SOUND
+#ifndef TQT_NO_SOUND
 
 #include "ntqptrlist.h"
 
@@ -313,4 +313,4 @@ TQAuBucket::~TQAuBucket()
 {
 }
 
-#endif // QT_NO_SOUND
+#endif // TQT_NO_SOUND
diff --git a/src/kernel/qsound_x11.cpp b/src/kernel/qsound_x11.cpp
index 01a2b86b0..e3a727f8b 100644
--- a/src/kernel/qsound_x11.cpp
+++ b/src/kernel/qsound_x11.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsound.h"
 
-#ifndef QT_NO_SOUND
+#ifndef TQT_NO_SOUND
 
 #include "ntqptrdict.h"
 #include "ntqsocketnotifier.h"
@@ -278,4 +278,4 @@ TQAuServer* qt_new_audio_server()
     return new TQAuServerNull(tqApp);
 }
 
-#endif // QT_NO_SOUND
+#endif // TQT_NO_SOUND
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index 7a90fec1d..7d143270b 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqstyle.h"
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 #include "ntqapplication.h"
 #include "ntqpainter.h"
 #include "ntqbitmap.h"
@@ -912,7 +912,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 		}
 	    } else if ( pm.depth() == 1 ) {	// monochrome pixmap, no mask
 		pm.setMask( *((TQBitmap *)&pm) );
-#ifndef QT_NO_IMAGE_HEURISTIC_MASK
+#ifndef TQT_NO_IMAGE_HEURISTIC_MASK
 	    } else {				// color pixmap, no mask
 		TQString k;
 		k.sprintf( "$qt-drawitem-%x", pm.serialNumber() );
@@ -2908,4 +2908,4 @@ TQStyleControlElementData::TQStyleControlElementData(const TQStyleControlElement
 	paletteBgPixmap = orig.paletteBgPixmap;
 }
 
-#endif // QT_NO_STYLE
+#endif // TQT_NO_STYLE
diff --git a/src/kernel/qstylesheet.cpp b/src/kernel/qstylesheet.cpp
index dcddbb9e8..b1e9ac795 100644
--- a/src/kernel/qstylesheet.cpp
+++ b/src/kernel/qstylesheet.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqstylesheet.h"
 
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 
 #include "private/qrichtext_p.h"
 #include "ntqlayout.h"
@@ -1380,7 +1380,7 @@ const TQStyleSheetItem* TQStyleSheet::item( const TQString& name) const
 
     This function should not be used in application code.
 */
-#ifndef QT_NO_TEXTCUSTOMITEM
+#ifndef TQT_NO_TEXTCUSTOMITEM
 TQTextCustomItem* TQStyleSheet::tag(  const TQString& name,
 				   const TQMap &attr,
 				   const TQString& context,
@@ -1620,4 +1620,4 @@ void TQStyleSheet::scaleFont( TQFont& font, int logicalSize ) const
 	font.setPointSize( s );
 }
 
-#endif // QT_NO_RICHTEXT
+#endif // TQT_NO_RICHTEXT
diff --git a/src/kernel/qt_gfx.pri b/src/kernel/qt_gfx.pri
index 12c1497ab..f0124824e 100644
--- a/src/kernel/qt_gfx.pri
+++ b/src/kernel/qt_gfx.pri
@@ -36,7 +36,7 @@ mng {
 		CONFIG += jpeg
 	}
 }
-else:DEFINES += QT_NO_IMAGEIO_MNG
+else:DEFINES += TQT_NO_IMAGEIO_MNG
 
 #jpeg support..
 HEADERS += $$KERNEL_H/ntqjpegio.h 
@@ -95,7 +95,7 @@ jpeg {
 		  3rdparty/libjpeg/jmemnobs.c
         }
 }
-else:DEFINES += QT_NO_IMAGEIO_JPEG
+else:DEFINES += TQT_NO_IMAGEIO_JPEG
 
 #png support
 HEADERS+=$$KERNEL_H/ntqpngio.h
@@ -123,7 +123,7 @@ png {
 		  3rdparty/libpng/pngwutil.c 
         }
 }
-else:DEFINES += QT_NO_IMAGEIO_PNG
+else:DEFINES += TQT_NO_IMAGEIO_PNG
 
 #zlib support
 zlib {
diff --git a/src/kernel/qt_x11.pri b/src/kernel/qt_x11.pri
index b20081f04..20d65b104 100644
--- a/src/kernel/qt_x11.pri
+++ b/src/kernel/qt_x11.pri
@@ -1,11 +1,11 @@
 unix {
-	!xinerama:DEFINES += QT_NO_XINERAMA
-	!xshape:DEFINES += QT_NO_SHAPE
-	!xcursor:DEFINES += QT_NO_XCURSOR
-	!xrandr:DEFINES += QT_NO_XRANDR
-	!xrender:DEFINES += QT_NO_XRENDER
-	!xftfreetype:DEFINES += QT_NO_XFTFREETYPE
-	!xkb:DEFINES += QT_NO_XKB
+	!xinerama:DEFINES += TQT_NO_XINERAMA
+	!xshape:DEFINES += TQT_NO_SHAPE
+	!xcursor:DEFINES += TQT_NO_XCURSOR
+	!xrandr:DEFINES += TQT_NO_XRANDR
+	!xrender:DEFINES += TQT_NO_XRENDER
+	!xftfreetype:DEFINES += TQT_NO_XFTFREETYPE
+	!xkb:DEFINES += TQT_NO_XKB
 	xft2header:DEFINES+=QT_USE_XFT2_HEADER
 
 	SOURCES += $$KERNEL_CPP/qtaddons_x11.cpp
@@ -20,4 +20,4 @@ nas {
 	LIBS	+= -laudio -lXt
 }
 
-!x11sm:DEFINES += QT_NO_SM_SUPPORT
+!x11sm:DEFINES += TQT_NO_SM_SUPPORT
diff --git a/src/kernel/qt_x11_p.h b/src/kernel/qt_x11_p.h
index af13262f2..df8a65754 100644
--- a/src/kernel/qt_x11_p.h
+++ b/src/kernel/qt_x11_p.h
@@ -76,13 +76,13 @@
 #include 
 
 
-//#define QT_NO_SHAPE
-#ifdef QT_NO_SHAPE
+//#define TQT_NO_SHAPE
+#ifdef TQT_NO_SHAPE
 #define XShapeCombineRegion(a,b,c,d,e,f,g)
 #define XShapeCombineMask(a,b,c,d,e,f,g)
 #else
 #include 
-#endif // QT_NO_SHAPE
+#endif // TQT_NO_SHAPE
 
 
 // the wacom tablet (currently just the IRIX version)
@@ -94,8 +94,8 @@
 #endif // QT_TABLET_SUPPORT
 
 
-// #define QT_NO_XINERAMA
-#ifndef QT_NO_XINERAMA
+// #define TQT_NO_XINERAMA
+#ifndef TQT_NO_XINERAMA
 #  if 0 // ### Xsun, but how to detect it?
 // Xinerama is only supported in Solaris 7 with patches 107648/108376 and
 // Solaris 8 or above which introduce the X11R6.4 Xserver.
@@ -137,18 +137,18 @@ extern "C" {
 #    include 
 }
 #  endif
-#endif // QT_NO_XINERAMA
+#endif // TQT_NO_XINERAMA
 
-// #define QT_NO_XRANDR
-#ifndef QT_NO_XRANDR
+// #define TQT_NO_XRANDR
+#ifndef TQT_NO_XRANDR
 #  include 
-#endif // QT_NO_XRANDR
+#endif // TQT_NO_XRANDR
 
-// #define QT_NO_XRENDER
-#ifndef QT_NO_XRENDER
+// #define TQT_NO_XRENDER
+#ifndef TQT_NO_XRENDER
 #  include 
-// #define QT_NO_XFTFREETYPE
-#  ifndef QT_NO_XFTFREETYPE
+// #define TQT_NO_XFTFREETYPE
+#  ifndef TQT_NO_XFTFREETYPE
 //   This hacks around the freetype poeple putting an #error into freetype.h in 2.1.7, making
 //   it impossible to use an updated freetype with older Xft header files.
 #    include 
@@ -168,23 +168,23 @@ extern "C" {
     void XftDrawSetSubwindowMode(XftDraw *, int);
 }
 #    endif // XFT_VERSION
-#  endif // QT_NO_XFTFREETYPE
+#  endif // TQT_NO_XFTFREETYPE
 #else
-// make sure QT_NO_XFTFREETYPE is defined if QT_NO_XRENDER is defined
-#  ifndef QT_NO_XFTFREETYPE
-#    define QT_NO_XFTFREETYPE
+// make sure TQT_NO_XFTFREETYPE is defined if TQT_NO_XRENDER is defined
+#  ifndef TQT_NO_XFTFREETYPE
+#    define TQT_NO_XFTFREETYPE
 #  endif
-#endif // QT_NO_XRENDER
+#endif // TQT_NO_XRENDER
 
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 #  include 
-#endif // QT_NO_XSYNC
+#endif // TQT_NO_XSYNC
 
 
-#ifndef QT_NO_XKB
+#ifndef TQT_NO_XKB
 #  include 
-#endif // QT_NO_XKB
+#endif // TQT_NO_XKB
 
 
 #if !defined(XlibSpecificationRelease)
@@ -194,27 +194,27 @@ typedef char *XPointer;
 #  undef X11R4
 #endif
 
-// #define QT_NO_XIM
+// #define TQT_NO_XIM
 #if defined(X11R4)
 // X11R4 does not have XIM
-#define QT_NO_XIM
+#define TQT_NO_XIM
 #elif defined(Q_OS_OSF) && (XlibSpecificationRelease < 6)
 // broken in Xlib up to OSF/1 3.2
-#define QT_NO_XIM
+#define TQT_NO_XIM
 #elif defined(Q_OS_AIX)
 // broken in Xlib up to what version of AIX?
-#define QT_NO_XIM
-#elif defined(QT_NO_DEBUG) && defined(Q_OS_IRIX)
+#define TQT_NO_XIM
+#elif defined(TQT_NO_DEBUG) && defined(Q_OS_IRIX)
 // XmbLookupString broken on IRIX
 // XCreateIC broken when compiling -64 on IRIX 6.5.2
-#define QT_NO_XIM
+#define TQT_NO_XIM
 #elif defined(Q_OS_HPUX) && defined(__LP64__)
 // XCreateIC broken when compiling 64-bit ELF on HP-UX 11.0
-#define QT_NO_XIM
+#define TQT_NO_XIM
 #elif defined(Q_OS_SCO)
 // ### suggested by user...
-// ### #define QT_NO_XIM
-#endif // QT_NO_XIM
+// ### #define TQT_NO_XIM
+#endif // TQT_NO_XIM
 
 
 /*
@@ -225,7 +225,7 @@ typedef char *XPointer;
  * Instead, we disabled R6 input, and open the input method
  * immediately at application start.
  */
-#if !defined(QT_NO_XIM) && (XlibSpecificationRelease >= 6) && \
+#if !defined(TQT_NO_XIM) && (XlibSpecificationRelease >= 6) && \
     !defined(Q_OS_SOLARIS)
 #define USE_X11R6_XIM
 
@@ -256,7 +256,7 @@ extern "C" char *XSetIMValues( XIM /* im */, ... );
 
 #endif
 
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
 // some platforms (eg. Solaris 2.51) don't have these defines in Xlib.h
 #ifndef XNResetState
 #define XNResetState "resetState"
diff --git a/src/kernel/qtaddons_x11.cpp b/src/kernel/qtaddons_x11.cpp
index dbed45c37..ad1ea7e00 100644
--- a/src/kernel/qtaddons_x11.cpp
+++ b/src/kernel/qtaddons_x11.cpp
@@ -24,7 +24,7 @@
 
 #include "qt_x11_p.h"
 
-#if !defined(QT_NO_XFTFREETYPE) && !defined(QT_XFT2)
+#if !defined(TQT_NO_XFTFREETYPE) && !defined(QT_XFT2)
 
 #include 
 
@@ -141,4 +141,4 @@ void XftDrawSetSubwindowMode(XftDraw *draw, int mode)
 
 } // extern "C"
 
-#endif // !QT_NO_XFTFREETYPE && !QT_XFT2
+#endif // !TQT_NO_XFTFREETYPE && !QT_XFT2
diff --git a/src/kernel/qucomextra.cpp b/src/kernel/qucomextra.cpp
index a705784ba..1bb064ca8 100644
--- a/src/kernel/qucomextra.cpp
+++ b/src/kernel/qucomextra.cpp
@@ -42,7 +42,7 @@
 #include 
 
 
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
 // 6dc75d58-a1d9-4417-b591-d45c63a3a4ea
 const TQUuid TID_QUType_TQVariant( 0x6dc75d58, 0xa1d9, 0x4417, 0xb5, 0x91, 0xd4, 0x5c, 0x63, 0xa3, 0xa4, 0xea );
 TQUType_TQVariant static_QUType_TQVariant;
diff --git a/src/kernel/qucomextra_p.h b/src/kernel/qucomextra_p.h
index 734da8f6a..f183fd622 100644
--- a/src/kernel/qucomextra_p.h
+++ b/src/kernel/qucomextra_p.h
@@ -63,7 +63,7 @@
 
 class TQVariant;
 
-#ifndef  QT_NO_VARIANT
+#ifndef  TQT_NO_VARIANT
 // 6dc75d58-a1d9-4417-b591-d45c63a3a4ea
 extern const TQUuid TID_QUType_TQVariant;
 
@@ -84,7 +84,7 @@ struct Q_EXPORT TQUType_TQVariant : public TQUType
     int serializeFrom( TQUObject *, TQUBuffer * );
 };
 extern Q_EXPORT TQUType_TQVariant static_QUType_TQVariant;
-#endif //QT_NO_VARIANT
+#endif //TQT_NO_VARIANT
 
 
 // {0x8d48b3a8, 0xbd7f, 0x11d5, 0x8d, 0x74, 0x00, 0xc0, 0xf0, 0x3b, 0xc0, 0xf3 }
diff --git a/src/kernel/qurl.cpp b/src/kernel/qurl.cpp
index bf960f336..f097eac2e 100644
--- a/src/kernel/qurl.cpp
+++ b/src/kernel/qurl.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqurl.h"
 
-#ifndef QT_NO_URL
+#ifndef TQT_NO_URL
 
 #include "ntqdir.h"
 
@@ -1342,4 +1342,4 @@ bool TQUrl::cdUp()
     return TRUE;
 }
 
-#endif // QT_NO_URL
+#endif // TQT_NO_URL
diff --git a/src/kernel/qurlinfo.cpp b/src/kernel/qurlinfo.cpp
index aafea2a3e..67c0f52a7 100644
--- a/src/kernel/qurlinfo.cpp
+++ b/src/kernel/qurlinfo.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqurlinfo.h"
 
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
 
 #include "ntqurloperator.h"
 #include "ntqdir.h"
@@ -758,4 +758,4 @@ bool TQUrlInfo::isValid() const
     return d != 0;
 }
 
-#endif // QT_NO_NETWORKPROTOCOL
+#endif // TQT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/qurloperator.cpp b/src/kernel/qurloperator.cpp
index 93235a84c..1defadc97 100644
--- a/src/kernel/qurloperator.cpp
+++ b/src/kernel/qurloperator.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqurloperator.h"
 
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
 
 #include "ntqurlinfo.h"
 #include "ntqnetworkprotocol.h"
@@ -1223,4 +1223,4 @@ void TQUrlOperator::slotItemChanged( TQNetworkOperation *op )
 }
 
 
-#endif // QT_NO_NETWORKPROTOCOL
+#endif // TQT_NO_NETWORKPROTOCOL
diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp
index 6c7372b09..6d734d6b6 100644
--- a/src/kernel/qvariant.cpp
+++ b/src/kernel/qvariant.cpp
@@ -41,7 +41,7 @@
 #include 
 
 #include "ntqvariant.h"
-#ifndef QT_NO_VARIANT
+#ifndef TQT_NO_VARIANT
 #include "ntqstring.h"
 #include "ntqcstring.h"
 #include "ntqfont.h"
@@ -125,11 +125,11 @@ TQVariant::Private::Private( Private* d )
 	    // TQCString is explicit shared
 	    value.ptr = new TQCString( *((TQCString*)d->value.ptr) );
 	    break;
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 	case TQVariant::StringList:
 	    value.ptr = new TQStringList( *((TQStringList*)d->value.ptr) );
 	    break;
-#endif //QT_NO_STRINGLIST
+#endif //TQT_NO_STRINGLIST
 	case TQVariant::Font:
 	    value.ptr = new TQFont( *((TQFont*)d->value.ptr) );
 	    break;
@@ -157,7 +157,7 @@ TQVariant::Private::Private( Private* d )
 	case TQVariant::Color:
 	    value.ptr = new TQColor( *((TQColor*)d->value.ptr) );
 	    break;
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 	case TQVariant::Palette:
 	    value.ptr = new TQPalette( *((TQPalette*)d->value.ptr) );
 	    break;
@@ -165,12 +165,12 @@ TQVariant::Private::Private( Private* d )
 	    value.ptr = new TQColorGroup( *((TQColorGroup*)d->value.ptr) );
 	    break;
 #endif
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 	case TQVariant::IconSet:
 	    value.ptr = new TQIconSet( *((TQIconSet*)d->value.ptr) );
 	    break;
 #endif
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 	case TQVariant::Map:
 	    value.ptr = new TQMap( *((TQMap*)d->value.ptr) );
 	    break;
@@ -193,7 +193,7 @@ TQVariant::Private::Private( Private* d )
 	case TQVariant::BitArray:
 	    value.ptr = new TQBitArray( *((TQBitArray*)d->value.ptr) );
 	    break;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	case TQVariant::KeySequence:
 	    value.ptr = new TQKeySequence( *((TQKeySequence*)d->value.ptr) );
 	    break;
@@ -263,11 +263,11 @@ void TQVariant::Private::clear()
 	case TQVariant::CString:
 	    delete (TQCString*)value.ptr;
 	    break;
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 	case TQVariant::StringList:
 	    delete (TQStringList*)value.ptr;
 	    break;
-#endif //QT_NO_STRINGLIST
+#endif //TQT_NO_STRINGLIST
 	case TQVariant::Font:
 	    delete (TQFont*)value.ptr;
 	    break;
@@ -292,7 +292,7 @@ void TQVariant::Private::clear()
 	case TQVariant::Color:
 	    delete (TQColor*)value.ptr;
 	    break;
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 	case TQVariant::Palette:
 	    delete (TQPalette*)value.ptr;
 	    break;
@@ -300,12 +300,12 @@ void TQVariant::Private::clear()
 	    delete (TQColorGroup*)value.ptr;
 	    break;
 #endif
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 	case TQVariant::IconSet:
 	    delete (TQIconSet*)value.ptr;
 	    break;
 #endif
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 	case TQVariant::Map:
 	    delete (TQMap*)value.ptr;
 	    break;
@@ -331,7 +331,7 @@ void TQVariant::Private::clear()
 	case TQVariant::BitArray:
 	    delete (TQBitArray*)value.ptr;
 	    break;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	case TQVariant::KeySequence:
 	    delete (TQKeySequence*)value.ptr;
 	    break;
@@ -512,7 +512,7 @@ TQVariant::TQVariant( const TQVariant& p )
     d = p.d;
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     Reads the variant from the data stream, \a s.
 */
@@ -521,7 +521,7 @@ TQVariant::TQVariant( TQDataStream& s )
     d = new Private;
     s >> *this;
 }
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 /*!
     Constructs a new variant with a string value, \a val.
@@ -562,7 +562,7 @@ TQVariant::TQVariant( const char* val )
     d->value.ptr = new TQCString( val );
 }
 
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 /*!
     Constructs a new variant with a string list value, \a val.
 */
@@ -573,9 +573,9 @@ TQVariant::TQVariant( const TQStringList& val )
     d->value.ptr = new TQStringList( val );
     d->is_null = FALSE;
 }
-#endif // QT_NO_STRINGLIST
+#endif // TQT_NO_STRINGLIST
 
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 /*!
     Constructs a new variant with a map of TQVariants, \a val.
 */
@@ -675,7 +675,7 @@ TQVariant::TQVariant( const TQColor& val )
     d->is_null = FALSE;
 }
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 /*!
     Constructs a new variant with a color palette value, \a val.
 */
@@ -697,8 +697,8 @@ TQVariant::TQVariant( const TQColorGroup& val )
     d->value.ptr = new TQColorGroup( val );
     d->is_null = FALSE;
 }
-#endif //QT_NO_PALETTE
-#ifndef QT_NO_ICONSET
+#endif //TQT_NO_PALETTE
+#ifndef TQT_NO_ICONSET
 /*!
     Constructs a new variant with an icon set value, \a val.
 */
@@ -708,7 +708,7 @@ TQVariant::TQVariant( const TQIconSet& val )
     d->typ = IconSet;
     d->value.ptr = new TQIconSet( val );
 }
-#endif //QT_NO_ICONSET
+#endif //TQT_NO_ICONSET
 /*!
     Constructs a new variant with a region value, \a val.
 */
@@ -806,7 +806,7 @@ TQVariant::TQVariant( const TQBitArray& val )
     d->value.ptr = new TQBitArray( val );
 }
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 /*!
     Constructs a new variant with a key sequence value, \a val.
@@ -901,7 +901,7 @@ TQVariant::TQVariant( double val )
     d->is_null = FALSE;
 }
 
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 /*!
     Constructs a new variant with a list value, \a val.
 */
@@ -1060,7 +1060,7 @@ TQVariant::Type TQVariant::nameToType( const char* name )
     return Invalid;
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     Internal function for loading a variant from stream \a s. Use the
     stream operators instead.
@@ -1084,7 +1084,7 @@ void TQVariant::load( TQDataStream& s )
 	    d->is_null = TRUE;
 	}
 	break;
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     case Map:
 	{
 	    TQMap* x = new TQMap;
@@ -1104,7 +1104,7 @@ void TQVariant::load( TQDataStream& s )
 #endif
     case Cursor:
 	{
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    TQCursor* x = new TQCursor;
 	    s >> *x;
 	    d->value.ptr = x;
@@ -1115,7 +1115,7 @@ void TQVariant::load( TQDataStream& s )
     case Bitmap:
 	{
 	    TQBitmap* x = new TQBitmap;
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 	    s >> *x;
 #endif
 	    d->value.ptr = x;
@@ -1149,7 +1149,7 @@ void TQVariant::load( TQDataStream& s )
 	    d->value.ptr = x;
 	}
 	break;
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     case StringList:
 	{
 	    TQStringList* x = new TQStringList;
@@ -1158,7 +1158,7 @@ void TQVariant::load( TQDataStream& s )
 	    d->is_null = FALSE;
 	}
 	break;
-#endif // QT_NO_STRINGLIST
+#endif // TQT_NO_STRINGLIST
     case Font:
 	{
 	    TQFont* x = new TQFont;
@@ -1170,7 +1170,7 @@ void TQVariant::load( TQDataStream& s )
     case Pixmap:
 	{
 	    TQPixmap* x = new TQPixmap;
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 	    s >> *x;
 #endif
 	    d->value.ptr = x;
@@ -1179,7 +1179,7 @@ void TQVariant::load( TQDataStream& s )
     case Image:
 	{
 	    TQImage* x = new TQImage;
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 	    s >> *x;
 #endif
 	    d->value.ptr = x;
@@ -1222,7 +1222,7 @@ void TQVariant::load( TQDataStream& s )
 	    d->is_null = FALSE;
 	}
 	break;
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     case Palette:
 	{
 	    TQPalette* x = new TQPalette;
@@ -1240,7 +1240,7 @@ void TQVariant::load( TQDataStream& s )
 	}
 	break;
 #endif
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
     case IconSet:
 	{
 	    TQPixmap x;
@@ -1341,7 +1341,7 @@ void TQVariant::load( TQDataStream& s )
 	    d->value.ptr = x;
 	}
 	break;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     case KeySequence:
 	{
 	    TQKeySequence* x = new TQKeySequence;
@@ -1350,7 +1350,7 @@ void TQVariant::load( TQDataStream& s )
 	    d->is_null = FALSE;
 	}
 	break;
-#endif // QT_NO_ACCEL
+#endif // TQT_NO_ACCEL
     case Pen:
 	{
 	    TQPen* x = new TQPen;
@@ -1378,7 +1378,7 @@ void TQVariant::save( TQDataStream& s ) const
 	s << *((TQCursor*)d->value.ptr);
 	break;
     case Bitmap:
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 	s << *((TQBitmap*)d->value.ptr);
 #endif
 	break;
@@ -1388,7 +1388,7 @@ void TQVariant::save( TQDataStream& s ) const
     case Region:
 	s << *((TQRegion*)d->value.ptr);
 	break;
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     case List:
 	s << *((TQValueList*)d->value.ptr);
 	break;
@@ -1402,7 +1402,7 @@ void TQVariant::save( TQDataStream& s ) const
     case CString:
 	s << *((TQCString*)d->value.ptr);
 	break;
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     case StringList:
 	s << *((TQStringList*)d->value.ptr);
 	break;
@@ -1411,12 +1411,12 @@ void TQVariant::save( TQDataStream& s ) const
 	s << *((TQFont*)d->value.ptr);
 	break;
     case Pixmap:
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 	s << *((TQPixmap*)d->value.ptr);
 #endif
 	break;
     case Image:
-#ifndef QT_NO_IMAGEIO
+#ifndef TQT_NO_IMAGEIO
 	s << *((TQImage*)d->value.ptr);
 #endif
 	break;
@@ -1435,7 +1435,7 @@ void TQVariant::save( TQDataStream& s ) const
     case Color:
 	s << *((TQColor*)d->value.ptr);
 	break;
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     case Palette:
 	s << *((TQPalette*)d->value.ptr);
 	break;
@@ -1443,7 +1443,7 @@ void TQVariant::save( TQDataStream& s ) const
 	s << *((TQColorGroup*)d->value.ptr);
 	break;
 #endif
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
     case IconSet:
 	//### add stream operator to iconset
 	s << ((TQIconSet*)d->value.ptr)->pixmap();
@@ -1489,7 +1489,7 @@ void TQVariant::save( TQDataStream& s ) const
     case BitArray:
 	s << *((TQBitArray*)d->value.ptr);
 	break;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     case KeySequence:
 	s << *((TQKeySequence*)d->value.ptr);
 	break;
@@ -1549,7 +1549,7 @@ TQDataStream& operator<< ( TQDataStream& s, const TQVariant::Type p )
     return s;
 }
 
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 /*!
     \fn Type TQVariant::type() const
@@ -1644,7 +1644,7 @@ const TQString TQVariant::toString() const
 	return TQString::number( toULongLong() );
     case Double:
 	return TQString::number( toDouble(), 'g', DBL_DIG );
-#if !defined(QT_NO_SPRINTF) && !defined(QT_NO_DATESTRING)
+#if !defined(TQT_NO_SPRINTF) && !defined(TQT_NO_DATESTRING)
     case Date:
 	return toDate().toString( TQt::ISODate );
     case Time:
@@ -1654,7 +1654,7 @@ const TQString TQVariant::toString() const
 #endif
     case Bool:
 	return toInt() ? "true" : "false";
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     case KeySequence:
 	return (TQString) *( (TQKeySequence*)d->value.ptr );
 #endif
@@ -1691,7 +1691,7 @@ const TQCString TQVariant::toCString() const
 }
 
 
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 /*!
     Returns the variant as a TQStringList if the variant has type()
     StringList or List of a type that can be converted to TQString;
@@ -1715,7 +1715,7 @@ const TQStringList TQVariant::toStringList() const
     switch ( d->typ ) {
     case StringList:
 	return *((TQStringList*)d->value.ptr);
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     case List:
 	{
 	    TQStringList lst;
@@ -1733,9 +1733,9 @@ const TQStringList TQVariant::toStringList() const
 	return TQStringList();
     }
 }
-#endif //QT_NO_STRINGLIST
+#endif //TQT_NO_STRINGLIST
 
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 /*!
     Returns the variant as a TQMap if the variant has
     type() Map; otherwise returns an empty map.
@@ -1892,7 +1892,7 @@ const TQColor TQVariant::toColor() const
 	return TQColor();
     }
 }
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 /*!
     Returns the variant as a TQPalette if the variant has type()
     Palette; otherwise returns a completely black palette.
@@ -1920,8 +1920,8 @@ const TQColorGroup TQVariant::toColorGroup() const
 
     return *((TQColorGroup*)d->value.ptr);
 }
-#endif //QT_NO_PALETTE
-#ifndef QT_NO_ICONSET
+#endif //TQT_NO_PALETTE
+#ifndef TQT_NO_ICONSET
 /*!
     Returns the variant as a TQIconSet if the variant has type()
     IconSet; otherwise returns an icon set of null pixmaps.
@@ -1935,7 +1935,7 @@ const TQIconSet TQVariant::toIconSet() const
 
     return *((TQIconSet*)d->value.ptr);
 }
-#endif //QT_NO_ICONSET
+#endif //TQT_NO_ICONSET
 /*!
     Returns the variant as a TQPointArray if the variant has type()
     PointArray; otherwise returns an empty TQPointArray.
@@ -1986,7 +1986,7 @@ const TQRegion TQVariant::toRegion() const
 */
 const TQCursor TQVariant::toCursor() const
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( d->typ != Cursor )
 	return TQCursor();
 #endif
@@ -2011,7 +2011,7 @@ const TQDate TQVariant::toDate() const
 	return *((TQDate*)d->value.ptr);
     case DateTime:
 	return ((TQDateTime*)d->value.ptr)->date();
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
     case String:
 	return TQDate::fromString( *((TQString*)d->value.ptr), TQt::ISODate );
     case CString:
@@ -2040,7 +2040,7 @@ const TQTime TQVariant::toTime() const
 	return *((TQTime*)d->value.ptr);
     case DateTime:
 	return ((TQDateTime*)d->value.ptr)->time();
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
     case String:
 	return TQTime::fromString( *((TQString*)d->value.ptr), TQt::ISODate );
     case CString:
@@ -2067,7 +2067,7 @@ const TQDateTime TQVariant::toDateTime() const
     switch ( d->typ ) {
     case DateTime:
 	return *((TQDateTime*)d->value.ptr);
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
     case String:
 	return TQDateTime::fromString( *((TQString*)d->value.ptr), TQt::ISODate );
     case CString:
@@ -2116,7 +2116,7 @@ const TQBitArray TQVariant::toBitArray() const
     return TQBitArray();
 }
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 /*!
     Returns the variant as a TQKeySequence if the variant can be cast
@@ -2144,7 +2144,7 @@ const TQKeySequence TQVariant::toKeySequence() const
     }
 }
 
-#endif // QT_NO_ACCEL
+#endif // TQT_NO_ACCEL
 
 /*!
     Returns the variant as a TQPen if the variant has type()
@@ -2192,7 +2192,7 @@ int TQVariant::toInt( bool * ok ) const
 	return (int)d->value.d;
     case Bool:
 	return (int)d->value.b;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     case KeySequence:
 	return (int) *( (TQKeySequence*)d->value.ptr );
 #endif
@@ -2391,7 +2391,7 @@ double TQVariant::toDouble( bool * ok ) const
     }
 }
 
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 /*!
     Returns the variant as a TQValueList if the variant has
     type() List or StringList; otherwise returns an empty list.
@@ -2413,7 +2413,7 @@ const TQValueList TQVariant::toList() const
 {
     if ( d->typ == List )
 	return *((TQValueList*)d->value.ptr);
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     if ( d->typ == StringList ) {
 	TQValueList lst;
 	TQStringList::ConstIterator it = stringListBegin();
@@ -2422,7 +2422,7 @@ const TQValueList TQVariant::toList() const
 	    lst.append( TQVariant( *it ) );
 	return lst;
     }
-#endif //QT_NO_STRINGLIST
+#endif //TQT_NO_STRINGLIST
     return TQValueList();
 }
 #endif
@@ -2455,7 +2455,7 @@ TQSizePolicy TQVariant::toSizePolicy() const
 
 Q_VARIANT_AS(String)
 Q_VARIANT_AS(CString)
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 Q_VARIANT_AS(StringList)
 #endif
 Q_VARIANT_AS(Font)
@@ -2466,11 +2466,11 @@ Q_VARIANT_AS(Point)
 Q_VARIANT_AS(Rect)
 Q_VARIANT_AS(Size)
 Q_VARIANT_AS(Color)
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 Q_VARIANT_AS(Palette)
 Q_VARIANT_AS(ColorGroup)
 #endif
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 Q_VARIANT_AS(IconSet)
 #endif
 Q_VARIANT_AS(PointArray)
@@ -2483,7 +2483,7 @@ Q_VARIANT_AS(Time)
 Q_VARIANT_AS(DateTime)
 Q_VARIANT_AS(ByteArray)
 Q_VARIANT_AS(BitArray)
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 Q_VARIANT_AS(KeySequence)
 #endif
 Q_VARIANT_AS(Pen)
@@ -2884,7 +2884,7 @@ double& TQVariant::asDouble()
     return d->value.d;
 }
 
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 /*!
     Returns the variant's value as variant list reference.
 
@@ -3061,11 +3061,11 @@ bool TQVariant::canCast( Type t ) const
 	}
 	break;
 
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     case List:
 	return d->typ == StringList;
 #endif
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     case StringList:
 	if ( d->typ == List ) {
 	    TQValueList::ConstIterator it = listBegin();
@@ -3114,7 +3114,7 @@ bool TQVariant::canCast( Type t ) const
 bool TQVariant::cast( Type t )
 {
     switch ( t ) {
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     case TQVariant::Map:
 	asMap();
 	break;
@@ -3125,7 +3125,7 @@ bool TQVariant::cast( Type t )
     case TQVariant::String:
 	asString();
 	break;
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     case TQVariant::StringList:
 	asStringList();
 	break;
@@ -3148,7 +3148,7 @@ bool TQVariant::cast( Type t )
     case TQVariant::Color:
 	asColor();
 	break;
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     case TQVariant::Palette:
 	asPalette();
 	break;
@@ -3156,7 +3156,7 @@ bool TQVariant::cast( Type t )
 	asColorGroup();
 	break;
 #endif
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
     case TQVariant::IconSet:
 	asIconSet();
 	break;
@@ -3212,7 +3212,7 @@ bool TQVariant::cast( Type t )
     case TQVariant::BitArray:
 	asBitArray();
 	break;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     case TQVariant::KeySequence:
 	asKeySequence();
 	break;
@@ -3285,7 +3285,7 @@ bool TQVariant::operator==( const TQVariant &v ) const
 
     switch( d->typ ) {
     case Cursor:
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	return v.toCursor().shape() == toCursor().shape();
 #endif
     case Bitmap:
@@ -3294,7 +3294,7 @@ bool TQVariant::operator==( const TQVariant &v ) const
 	return v.toPointArray() == toPointArray();
     case Region:
 	return v.toRegion() == toRegion();
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
     case List:
 	return v.toList() == toList();
     case Map: {
@@ -3315,7 +3315,7 @@ bool TQVariant::operator==( const TQVariant &v ) const
 	return v.toString() == toString();
     case CString:
 	return v.toCString() == toCString();
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     case StringList:
 	return v.toStringList() == toStringList();
 #endif
@@ -3335,13 +3335,13 @@ bool TQVariant::operator==( const TQVariant &v ) const
 	return v.toSize() == toSize();
     case Color:
 	return v.toColor() == toColor();
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     case Palette:
 	return v.toPalette() == toPalette();
     case ColorGroup:
 	return v.toColorGroup() == toColorGroup();
 #endif
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
     case IconSet:
 	return v.toIconSet().pixmap().serialNumber()
 	    == toIconSet().pixmap().serialNumber();
@@ -3370,7 +3370,7 @@ bool TQVariant::operator==( const TQVariant &v ) const
 	return v.toByteArray() == toByteArray();
     case BitArray:
 	return v.toBitArray() == toBitArray();
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     case KeySequence:
 	return v.toKeySequence() == toKeySequence();
 #endif
@@ -3448,7 +3448,7 @@ bool TQVariant::isNull() const
 	    return ((TQRect*) d->value.ptr)->isNull();
 	case TQVariant::Size:
 	    return ((TQSize*) d->value.ptr)->isNull();
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 	case TQVariant::IconSet:
 	    return ((TQIconSet*) d->value.ptr)->isNull();
 #endif
@@ -3463,22 +3463,22 @@ bool TQVariant::isNull() const
 	case TQVariant::BitArray:
 	    return ((TQBitArray*) d->value.ptr)->isNull();
 	case TQVariant::Cursor:
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 	case TQVariant::StringList:
-#endif //QT_NO_STRINGLIST
+#endif //TQT_NO_STRINGLIST
 	case TQVariant::Font:
 	case TQVariant::Brush:
 	case TQVariant::Color:
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 	case TQVariant::Palette:
 	case TQVariant::ColorGroup:
 #endif
-#ifndef QT_NO_TEMPLATE_VARIANT
+#ifndef TQT_NO_TEMPLATE_VARIANT
 	case TQVariant::Map:
 	case TQVariant::List:
 #endif
 	case TQVariant::SizePolicy:
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	case TQVariant::KeySequence:
 #endif
 	case TQVariant::Pen:
@@ -3493,4 +3493,4 @@ bool TQVariant::isNull() const
 	}
     return d->is_null;
 }
-#endif //QT_NO_VARIANT
+#endif //TQT_NO_VARIANT
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index b3a630bcf..091958520 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -530,7 +530,7 @@ static TQFont qt_naturalWidgetFont( TQWidget* w ) {
     return naturalfont;
 }
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 static TQPalette qt_naturalWidgetPalette( TQWidget* w ) {
     TQPalette naturalpalette = TQApplication::palette( w );
     if ( !w->isTopLevel() && naturalpalette.isCopyOf( TQApplication::palette() ) )
@@ -542,7 +542,7 @@ static TQPalette qt_naturalWidgetPalette( TQWidget* w ) {
 TQSize qt_naturalWidgetSize( TQWidget *w ) {
     TQSize s = w->sizeHint();
     TQSizePolicy::ExpandData exp;
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
     if ( w->layout() ) {
 	if ( w->layout()->hasHeightForWidth() )
 	    s.setHeight( w->layout()->totalHeightForWidth( s.width() ) );
@@ -911,15 +911,15 @@ TQWidget::TQWidget( TQWidget *parent, const char *name, WFlags f, NFlags n )
     in_show = 0;
     in_show_maximized = 0;
     im_enabled = FALSE;
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
     lay_out = 0;
 #endif
     extra = 0;					// no extra widget info
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     bg_col = pal.active().background();		// default background color
 #endif
     create();					// platform-dependent init
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     pal = isTopLevel() ? TQApplication::palette() : parentWidget()->palette();
 #endif
     if ( ! isTopLevel() )
@@ -1142,7 +1142,7 @@ void TQWidget::createTLExtra()
 #if defined( Q_WS_WIN ) || defined( Q_WS_MAC )
 	x->opacity = 255;
 #endif
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	x->icon = 0;
 #endif
 	x->focusData = 0;
@@ -1159,7 +1159,7 @@ void TQWidget::createTLExtra()
 	x->ussize = 0;
 #endif
 	x->savedFlags = 0;
-#if defined(Q_WS_QWS) && !defined(QT_NO_QWS_MANAGER)
+#if defined(Q_WS_QWS) && !defined(TQT_NO_QWS_MANAGER)
 	x->decor_allocated_region = TQRegion();
 	x->qwsManager = 0;
 #endif
@@ -1181,14 +1181,14 @@ void TQWidget::createExtra()
 	extra->maxw = extra->maxh = TQWIDGETSIZE_MAX;
 	extra->bg_pix = 0;
 	extra->focus_proxy = 0;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	extra->curs = 0;
 #endif
 	extra->topextra = 0;
 	extra->bg_mode = PaletteBackground;
 	extra->bg_mode_visual = PaletteBackground;
 	extra->bg_origin = WidgetOrigin;
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 	extra->style = 0;
 #endif
 	extra->size_policy = TQSizePolicy( TQSizePolicy::Preferred,
@@ -1211,17 +1211,17 @@ void TQWidget::deleteExtra()
     if ( extra ) {				// if exists
 	delete extra->m_ceData;
 	delete extra->bg_pix;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	delete extra->curs;
 #endif
 	deleteSysExtra();
 	if ( extra->topextra ) {
 	    deleteTLSysExtra();
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	    delete extra->topextra->icon;
 #endif
 	    delete extra->topextra->focusData;
-#if defined(Q_WS_QWS) && !defined(QT_NO_QWS_MANAGER)
+#if defined(Q_WS_QWS) && !defined(TQT_NO_QWS_MANAGER)
 	    delete extra->topextra->qwsManager;
 #endif
 	    delete extra->topextra;
@@ -1323,7 +1323,7 @@ TQWidget *TQWidget::find( WId id )
     \sa find()
 */
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 /*!
     Returns the GUI style for this widget
 
@@ -1839,7 +1839,7 @@ void TQWidget::enabledChange( bool )
 
 void TQWidget::windowActivationChange( bool )
 {
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     if ( !isVisible() )
 	return;
 
@@ -2415,7 +2415,7 @@ TQWidget *TQWidget::topLevelWidget() const
 */
 const TQColor &TQWidget::paletteForegroundColor() const
 {
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground;
     return colorGroup().color( TQPalette::foregroundRoleFromMode(mode) );
 #else
@@ -2425,7 +2425,7 @@ const TQColor &TQWidget::paletteForegroundColor() const
 
 void TQWidget::setPaletteForegroundColor( const TQColor & color )
 {
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground;
     TQPalette pal = palette();
     TQColorGroup::ColorRole role = TQPalette::foregroundRoleFromMode( mode );
@@ -2496,7 +2496,7 @@ void TQWidget::setErasePixmap( const TQPixmap &pixmap )
 
 void TQWidget::setBackgroundFromMode()
 {
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     TQColorGroup::ColorRole r = TQColorGroup::Background;
     if ( extra ) {
 	int i = (BackgroundMode)extra->bg_mode;
@@ -2734,7 +2734,7 @@ void TQWidget::setBackgroundModeDirect( BackgroundMode m )
 */
 const TQColor & TQWidget::paletteBackgroundColor() const
 {
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground;
     switch( mode ) {
     case FixedColor:
@@ -2753,7 +2753,7 @@ const TQColor & TQWidget::paletteBackgroundColor() const
 
 void TQWidget::setPaletteBackgroundColor( const TQColor &color )
 {
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground;
     switch( mode ) {
     case FixedColor:
@@ -2797,7 +2797,7 @@ void TQWidget::setPaletteBackgroundColor( const TQColor &color )
 */
 const TQPixmap *TQWidget::paletteBackgroundPixmap() const
 {
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground;
     switch( mode ) {
     case FixedColor:
@@ -2816,7 +2816,7 @@ const TQPixmap *TQWidget::paletteBackgroundPixmap() const
 
 void TQWidget::setPaletteBackgroundPixmap( const TQPixmap &pixmap )
 {
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground;
     switch( mode ) {
     case FixedColor:
@@ -2853,7 +2853,7 @@ void TQWidget::setPaletteBackgroundPixmap( const TQPixmap &pixmap )
 const TQBrush& TQWidget::backgroundBrush() const
 {
     static TQBrush noBrush;
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     BackgroundMode mode = extra ? (BackgroundMode) extra->bg_mode_visual : PaletteBackground;
     switch( mode ) {
     case FixedColor:
@@ -2882,7 +2882,7 @@ const TQBrush& TQWidget::backgroundBrush() const
 
     \sa palette
 */
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 const TQColorGroup &TQWidget::colorGroup() const
 {
     if ( !isEnabled() )
@@ -2913,7 +2913,7 @@ const TQColorGroup &TQWidget::colorGroup() const
     \sa ownPalette, colorGroup(), TQApplication::palette()
 */
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 void TQWidget::setPalette( const TQPalette &palette )
 {
     own_palette = TRUE;
@@ -2968,7 +2968,7 @@ void TQWidget::unsetPalette()
 void TQWidget::paletteChange( const TQPalette & )
 {
 }
-#endif // QT_NO_PALETTE
+#endif // TQT_NO_PALETTE
 
 /*!
     \property TQWidget::font
@@ -3095,7 +3095,7 @@ void TQWidget::fontChange( const TQFont & )
     \sa TQApplication::setOverrideCursor()
 */
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 const TQCursor &TQWidget::cursor() const
 {
     if ( testWState(WState_OwnCursor) )
@@ -3106,7 +3106,7 @@ const TQCursor &TQWidget::cursor() const
 	return (isTopLevel() || !parentWidget()) ? arrowCursor : parentWidget()->cursor();
 }
 #endif
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 /*!
     \property TQWidget::caption
     \brief the window caption (title)
@@ -3153,7 +3153,7 @@ TQString TQWidget::iconText() const
     return ( extra && extra->topextra ) ? extra->topextra->iconText
 	: TQString::null;
 }
-#endif //QT_NO_WIDGET_TOPEXTRA
+#endif //TQT_NO_WIDGET_TOPEXTRA
 
 /*!
     \property TQWidget::mouseTracking
@@ -3603,7 +3603,7 @@ bool TQWidget::isActiveWindow() const
 	tlw = parentWidget()->topLevelWidget();
     if(tlw == tqApp->activeWindow() || ( isVisible() && tlw->isPopup() ))
 	return TRUE;
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     const_cast(this)->createExtra();
     if (!extra->m_ceData) {
         const_cast(this)->extra->m_ceData = new TQStyleControlElementData();
@@ -4242,7 +4242,7 @@ void TQWidget::hideChildren( bool spontaneous )
 
 void TQWidget::polish()
 {
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     if ( isTopLevel() ) {
 	const TQPixmap *pm = icon();
 	if ( !pm || pm->isNull() ) {
@@ -4269,7 +4269,7 @@ void TQWidget::polish()
 	if ( ! own_font &&
 	     ! TQApplication::font( this ).isCopyOf( TQApplication::font() ) )
 	    unsetFont();
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 	if ( ! own_palette &&
 	     ! TQApplication::palette( this ).isCopyOf( TQApplication::palette() ) )
 	    unsetPalette();
@@ -4549,7 +4549,7 @@ void TQWidget::adjustSize()
 	TQRect screen = TQApplication::desktop()->screenGeometry( pos() );
 #endif
 
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 	if ( layout() ) {
 	    if ( layout()->hasHeightForWidth() ) {
 		s = s.boundedTo( screen.size() );
@@ -4592,7 +4592,7 @@ void TQWidget::adjustSize()
 
 TQSize TQWidget::sizeHint() const
 {
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
     if ( layout() )
 	return layout()->totalSizeHint();
 #endif
@@ -4618,7 +4618,7 @@ TQSize TQWidget::sizeHint() const
 */
 TQSize TQWidget::minimumSizeHint() const
 {
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
     if ( layout() )
 	return layout()->totalMinimumSize();
 #endif
@@ -4753,7 +4753,7 @@ bool TQWidget::event( TQEvent *e )
 	    if ( ! ((TQMouseEvent*)e)->isAccepted() )
 		return FALSE;
 	    break;
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 	case TQEvent::Wheel:
 	    wheelEvent( (TQWheelEvent*)e );
 	    if ( ! ((TQWheelEvent*)e)->isAccepted() )
@@ -4873,7 +4873,7 @@ bool TQWidget::event( TQEvent *e )
 	    }
 	    break;
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 	case TQEvent::Drop:
 	    dropEvent( (TQDropEvent*) e);
 	    break;
@@ -4915,7 +4915,7 @@ bool TQWidget::event( TQEvent *e )
 		unsetFont();
 	    break;
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 	case TQEvent::ParentPaletteChange:
 	    if ( isTopLevel() )
 		break;
@@ -4923,7 +4923,7 @@ bool TQWidget::event( TQEvent *e )
 	case TQEvent::ApplicationPaletteChange:
 	    if ( !own_palette && !isDesktop() )
 		unsetPalette();
-# if defined(Q_WS_QWS) && !defined (QT_NO_QWS_MANAGER)
+# if defined(Q_WS_QWS) && !defined (TQT_NO_QWS_MANAGER)
 	    if ( isTopLevel() && topData()->qwsManager ) {
 		TQRegion r( topData()->qwsManager->region() );
 		TQApplication::postEvent(topData()->qwsManager, new TQPaintEvent(r, FALSE) );
@@ -4965,7 +4965,7 @@ bool TQWidget::event( TQEvent *e )
 	    }
 	    update();
 	    break;
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 	case TQEvent::LayoutDirectionChange:
 	    if ( layout() ) {
 		layout()->activate();
@@ -5108,7 +5108,7 @@ void TQWidget::mouseDoubleClickEvent( TQMouseEvent *e )
     mousePressEvent( e );			// try mouse press event
 }
 
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 /*!
     This event handler, for event \a e, can be reimplemented in a
     subclass to receive wheel events for the widget.
@@ -5468,7 +5468,7 @@ void TQWidget::imEndEvent( TQIMEvent *e )
 }
 
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 /*!
     This event handler is called when a drag is in progress and the
@@ -5522,7 +5522,7 @@ void TQWidget::dropEvent( TQDropEvent * )
 {
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 /*!
     This event handler can be reimplemented in a subclass to receive
@@ -5834,7 +5834,7 @@ TQPoint TQWidget::backgroundOffset() const
 
   \sa layout() TQLayout sizePolicy()
 */
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 void TQWidget::setLayout( TQLayout *l )
 {
     lay_out = l;
@@ -6027,7 +6027,7 @@ void TQWidget::reparent( TQWidget *parent, WFlags f, const TQPoint &p,
 	unsetFont();
     else
 	setFont( fnt.resolve( qt_naturalWidgetFont( this ) ) );
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     if (!own_palette)
 	unsetPalette();
 #endif
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 8e0fee271..71268a6ab 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -65,7 +65,7 @@ int  qt_sip_count( TQWidget* );
 bool qt_wstate_iconified( WId );
 void qt_updated_rootinfo();
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 #include "ntqinputcontext.h"
 #include "ntqinputcontextfactory.h"
 #endif
@@ -89,7 +89,7 @@ static TQWidget *keyboardGrb = 0;
 extern Time tqt_x_time;
 extern Time tqt_x_user_time;
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 extern Atom qt_net_wm_sync_request_counter;
 extern Atom qt_net_wm_sync_request;
 extern bool qt_use_xsync;
@@ -463,7 +463,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	setWinId( id );				// set widget id/handle + hd
     }
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if (rendhd) {
 	XftDrawDestroy( (XftDraw *) rendhd );
 	rendhd = 0;
@@ -472,7 +472,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
     if ( tqt_has_xft )
 	rendhd = (HANDLE) XftDrawCreate( dpy, id, (Visual *) x11Visual(),
 					 x11Colormap() );
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
     // NET window states
     long net_winstates[6] = { 0, 0, 0, 0, 0, 0 };
@@ -683,7 +683,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
 	protocols[n++] = tqt_wm_delete_window;	// support del window protocol
 	protocols[n++] = tqt_wm_take_focus;	// support take focus window protocol
 	protocols[n++] = qt_net_wm_ping;	// support _NET_WM_PING protocol
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 	protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_REQUEST protocol
 #endif
 	if ( testWFlags( WStyle_ContextHelp ) )
@@ -711,7 +711,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
         else
             XDeleteProperty(dpy, id, qt_net_wm_action);
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
         // set _NET_WM_SYNC_COUNTER
         createSyncCounter();
         long counterVal = topData()->syncCounter;
@@ -769,7 +769,7 @@ void TQWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
     if ( destroyw )
 	qt_XDestroyWindow( this, dpy, destroyw );
 
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM_EXTENSIONS)
     ic = 0;
 #endif
 }
@@ -813,7 +813,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows )
 	else if ( testWFlags(WType_Popup) )
 	    tqApp->closePopup( this );
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 	if ( rendhd) {
 	    if ( destroyWindow )
 		XftDrawDestroy( (XftDraw *) rendhd );
@@ -821,7 +821,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows )
 		free( (void*) rendhd );
 	    rendhd = 0;
 	}
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 	if ( testWFlags(WType_Desktop) ) {
 	    if ( acceptDrops() )
@@ -830,7 +830,7 @@ void TQWidget::destroy( bool destroyWindow, bool destroySubWindows )
 	    if ( destroyWindow )
 		qt_XDestroyWindow( this, x11Display(), winid );
 	}
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
         destroySyncCounter();
 #endif
 	setWinId( 0 );
@@ -892,7 +892,7 @@ void TQWidget::reparentSys( TQWidget *parent, WFlags f, const TQPoint &p, bool s
         destroyInputContext();
     }
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
     destroySyncCounter();
 #endif
 
@@ -1117,7 +1117,7 @@ TQPoint TQWidget::mapFromGlobal( const TQPoint &pos ) const
 void TQWidget::setMicroFocusHint(int x, int y, int width, int height,
 				bool text, TQFont *f )
 {
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     if ( text ) {
 	// trigger input context creation if it hasn't happened already
 	createInputContext();
@@ -2607,11 +2607,11 @@ void TQWidget::deleteSysExtra()
 
 void TQWidget::createTLSysExtra()
 {
-#if defined(QT_NO_IM_EXTENSIONS)
+#if defined(TQT_NO_IM_EXTENSIONS)
     // created lazily
     extra->topextra->xic = 0;
 #endif
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
     extra->topextra->syncCounter = 0;
     extra->topextra->syncRequestValue[0] = 0;
     extra->topextra->syncRequestValue[1] = 0;
@@ -2663,7 +2663,7 @@ void TQWidget::checkChildrenDnd()
 }
 
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 // create a window's XSyncCounter
 void TQWidget::createSyncCounter()
 {
@@ -2704,7 +2704,7 @@ void TQWidget::handleSyncRequest( void* ev )
     topData()->syncRequestValue[ 0 ] = xev->xclient.data.l[ 2 ];
     topData()->syncRequestValue[ 1 ] = xev->xclient.data.l[ 3 ];
 }
-#endif  // QT_NO_XSYNC
+#endif  // TQT_NO_XSYNC
 
 
 /*!
@@ -2927,9 +2927,9 @@ TQInputContext *TQWidget::getInputContext()
 {
     TQInputContext *qic = 0;
 
-// #if !defined(QT_NO_IM_EXTENSIONS)
+// #if !defined(TQT_NO_IM_EXTENSIONS)
     if ( isInputMethodEnabled() ) {
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM_EXTENSIONS)
 	qic = icHolderWidget()->ic;
 #else
 //    {
@@ -2951,7 +2951,7 @@ TQInputContext *TQWidget::getInputContext()
 void TQWidget::changeInputContext( const TQString& identifierName )
 {
     TQWidget *icWidget = icHolderWidget();
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM_EXTENSIONS)
     TQInputContext **qicp = &icWidget->ic;
 #else
     TQInputContext **qicp = (TQInputContext **)&icWidget->topData()->xic;
@@ -2978,19 +2978,19 @@ void TQWidget::changeInputContext( const TQString& identifierName )
     This function is called to generate an input context
     according to a configuration for default input method
 
-    When QT_NO_IM_EXTENSIONS is not set, input context is 
+    When TQT_NO_IM_EXTENSIONS is not set, input context is 
     generated only when isInputMethodEnabled() returns TRUE.
 */
 void TQWidget::createInputContext()
 {
-// #if !defined(QT_NO_IM_EXTENSIONS)
+// #if !defined(TQT_NO_IM_EXTENSIONS)
     if( !isInputMethodEnabled() || TQApplication::closingDown() )
 	return;
 // #endif
 
     TQWidget *icWidget = icHolderWidget();
-#ifndef QT_NO_IM
-#if !defined(QT_NO_IM_EXTENSIONS)
+#ifndef TQT_NO_IM
+#if !defined(TQT_NO_IM_EXTENSIONS)
     TQInputContext **qicp = &icWidget->ic;
 #else
     TQInputContext **qicp = (TQInputContext **)&icWidget->topData()->xic;
@@ -3008,7 +3008,7 @@ void TQWidget::createInputContext()
 			      icWidget, SLOT(destroyInputContext()) );
   	}
     }
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 }
 
 
@@ -3022,8 +3022,8 @@ void TQWidget::createInputContext()
 */
 void TQWidget::destroyInputContext()
 {
-#ifndef QT_NO_IM
-#if !defined(QT_NO_IM_EXTENSIONS)
+#ifndef TQT_NO_IM
+#if !defined(TQT_NO_IM_EXTENSIONS)
     TQInputContext **qicp = ⁣
 #else
     if ( ! extra || ! extra->topextra )
@@ -3036,7 +3036,7 @@ void TQWidget::destroyInputContext()
 	delete *qicp;
 
     *qicp = 0;
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 }
 
 
@@ -3057,14 +3057,14 @@ void TQWidget::destroyInputContext()
 */
 void TQWidget::resetInputContext()
 {
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     // trigger input context creation if it hasn't happened already
     createInputContext();
 
     TQInputContext *qic = getInputContext();
     if( qic )
 	qic->reset();
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 }
 
 
@@ -3080,7 +3080,7 @@ void TQWidget::resetInputContext()
  */
 void TQWidget::focusInputContext()
 {
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     TQWidget* tlw = topLevelWidget();
 
     if (!tlw->isPopup() || isInputMethodEnabled()) {
@@ -3095,7 +3095,7 @@ void TQWidget::focusInputContext()
 	    }
 	}
     }
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 }
 
 
@@ -3110,7 +3110,7 @@ void TQWidget::focusInputContext()
  */
 void TQWidget::unfocusInputContext()
 {
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     // trigger input context creation if it hasn't happened already
     createInputContext();
 
@@ -3120,7 +3120,7 @@ void TQWidget::unfocusInputContext()
 	qic->unsetFocus();
 	qic->setFocusWidget( 0 );
     }
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 }
   
 
@@ -3136,7 +3136,7 @@ void TQWidget::sendMouseEventToInputContext( int x, TQEvent::Type type,
 					    TQt::ButtonState button,
 					    TQt::ButtonState state )
 {
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     // trigger input context creation if it hasn't happened already
     createInputContext();
   
@@ -3145,7 +3145,7 @@ void TQWidget::sendMouseEventToInputContext( int x, TQEvent::Type type,
 	// may be causing reset() in some input methods
 	qic->mouseHandler( x, type, button, state );
     }
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 }
   
 
diff --git a/src/kernel/qwmatrix.cpp b/src/kernel/qwmatrix.cpp
index 06a1068f2..06104b0b0 100644
--- a/src/kernel/qwmatrix.cpp
+++ b/src/kernel/qwmatrix.cpp
@@ -49,7 +49,7 @@ double qsincos( double, bool calcCos );		// defined in qpainter_x11.cpp
 
 #include 
 
-#ifndef QT_NO_WMATRIX
+#ifndef TQT_NO_WMATRIX
 
 /*!
     \class TQWMatrix ntqwmatrix.h
@@ -984,7 +984,7 @@ TQWMatrix operator*( const TQWMatrix &m1, const TQWMatrix &m2 )
 /*****************************************************************************
   TQWMatrix stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQWMatrix
 
@@ -1030,7 +1030,7 @@ TQDataStream &operator>>( TQDataStream &s, TQWMatrix &m )
     }
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
-#endif // QT_NO_WMATRIX
+#endif // TQT_NO_WMATRIX
 
diff --git a/src/kernel/tqtkdeintegration_x11.cpp b/src/kernel/tqtkdeintegration_x11.cpp
index 0dae849c1..5bb37d09a 100644
--- a/src/kernel/tqtkdeintegration_x11.cpp
+++ b/src/kernel/tqtkdeintegration_x11.cpp
@@ -23,8 +23,8 @@ bool TQKDEIntegration::enabled()
 
 static TQCString findLibrary()
     {
-    if( getenv( "QT_NO_KDE_INTEGRATION" ) == NULL
-        || getenv( "QT_NO_KDE_INTEGRATION" )[ 0 ] == '0' )
+    if( getenv( "TQT_NO_KDE_INTEGRATION" ) == NULL
+        || getenv( "TQT_NO_KDE_INTEGRATION" )[ 0 ] == '0' )
         {
 #ifdef USE_LIB64_PATHES
         return "/opt/kde3/lib64/kde3/plugins/integration/libtqtkde";
diff --git a/src/moc/moc.pro b/src/moc/moc.pro
index d94d596ec..c8abcf0d7 100644
--- a/src/moc/moc.pro
+++ b/src/moc/moc.pro
@@ -2,8 +2,8 @@ TEMPLATE	= app
 TARGET		= tqmoc
 
 CONFIG 		= console release qtinc yacc lex_included yacc_no_name_mangle
-DEFINES	       += QT_MOC QT_NO_CODECS QT_LITE_UNICODE QT_NO_COMPONENT \
-		  TQT_NO_STL QT_NO_COMPRESS
+DEFINES	       += QT_MOC TQT_NO_CODECS QT_LITE_UNICODE TQT_NO_COMPONENT \
+		  TQT_NO_STL TQT_NO_COMPRESS
 win32:DEFINES  += QT_NODLL
 DESTDIR         = ../../bin
 
diff --git a/src/moc/moc.y b/src/moc/moc.y
index 780669e9e..49fcc61f7 100644
--- a/src/moc/moc.y
+++ b/src/moc/moc.y
@@ -239,10 +239,10 @@ TQCString uTypeExtra( TQCString ctype )
 	    typeExtra.sprintf( "parentObject->enumerator(\"%s\", TRUE )", ctype.data() );
 	}
 	typeExtra =
-	    "\n#ifndef QT_NO_PROPERTIES\n\t  " + typeExtra +
+	    "\n#ifndef TQT_NO_PROPERTIES\n\t  " + typeExtra +
 	    "\n#else"
 	    "\n\t  0"
-	    "\n#endif // QT_NO_PROPERTIES\n\t  ";
+	    "\n#endif // TQT_NO_PROPERTIES\n\t  ";
     }
     return typeExtra;
 }
@@ -2462,7 +2462,7 @@ int generateEnums()
     if ( g->enums.count() == 0 )
 	return 0;
 
-    fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
+    fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" );
     int i = 0;
     for ( TQPtrListIterator it( g->enums ); it.current(); ++it, ++i ) {
 	fprintf( out, "    static const TQMetaEnum::Item enum_%i[] = {\n", i );
@@ -2486,7 +2486,7 @@ int generateEnums()
 		 it2.current()->set ? "TRUE" : "FALSE" );
     }
     fprintf( out, "\n    };\n" );
-    fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
+    fprintf( out, "#endif // TQT_NO_PROPERTIES\n" );
 
     return g->enums.count();
 }
@@ -2735,7 +2735,7 @@ int generateProps()
 		moc_err("The declaration of the class \"%s\" contains properties"
 		" but no TQ_OBJECT macro.", g->className.data());
 
-	fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
+	fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" );
 
 	fprintf( out, "    static const TQMetaProperty props_tbl[%d] = {\n ", g->props.count() );
 	for( TQPtrListIterator it( g->props ); it.current(); ++it ) {
@@ -2800,7 +2800,7 @@ int generateProps()
 		fprintf( out, "\n" );
 	}
 	fprintf( out, "    };\n" );
-	fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
+	fprintf( out, "#endif // TQT_NO_PROPERTIES\n" );
     }
 
     return g->props.count();
@@ -3037,7 +3037,7 @@ void generateClass()		      // generate C++ source code for a class
     else
 	fprintf( out, "\t0, 0,\n" );
 
-    fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
+    fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" );
     if ( n_props )
 	fprintf( out, "\tprops_tbl, %d,\n", n_props );
     else
@@ -3046,7 +3046,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "\tenum_tbl, %d,\n", n_enums );
     else
 	fprintf( out, "\t0, 0,\n" );
-    fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
+    fprintf( out, "#endif // TQT_NO_PROPERTIES\n" );
 
     if ( n_infos )
 	fprintf( out, "\tclassinfo_tbl, %d );\n", n_infos );
@@ -3388,7 +3388,7 @@ void generateClass()		      // generate C++ source code for a class
     }
 
 
-    fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
+    fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" );
 //
 // Generate internal tqt_property()  functions
 //
@@ -3526,7 +3526,7 @@ void generateClass()		      // generate C++ source code for a class
     }
 
     fprintf( out, "\nbool %s::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }\n", qualifiedClassName().data() );
-    fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
+    fprintf( out, "#endif // TQT_NO_PROPERTIES\n" );
 }
 
 
diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp
index d384e0baa..f2a5c53b1 100644
--- a/src/moc/moc_yacc.cpp
+++ b/src/moc/moc_yacc.cpp
@@ -252,10 +252,10 @@ TQCString uTypeExtra( TQCString ctype )
 	    typeExtra.sprintf( "parentObject->enumerator(\"%s\", TRUE )", ctype.data() );
 	}
 	typeExtra =
-	    "\n#ifndef QT_NO_PROPERTIES\n\t  " + typeExtra +
+	    "\n#ifndef TQT_NO_PROPERTIES\n\t  " + typeExtra +
 	    "\n#else"
 	    "\n\t  0"
-	    "\n#endif // QT_NO_PROPERTIES\n\t  ";
+	    "\n#endif // TQT_NO_PROPERTIES\n\t  ";
     }
     return typeExtra;
 }
@@ -5337,7 +5337,7 @@ int generateEnums()
     if ( g->enums.count() == 0 )
 	return 0;
 
-    fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
+    fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" );
     int i = 0;
     for ( TQPtrListIterator it( g->enums ); it.current(); ++it, ++i ) {
 	fprintf( out, "    static const TQMetaEnum::Item enum_%i[] = {\n", i );
@@ -5361,7 +5361,7 @@ int generateEnums()
 		 it2.current()->set ? "TRUE" : "FALSE" );
     }
     fprintf( out, "\n    };\n" );
-    fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
+    fprintf( out, "#endif // TQT_NO_PROPERTIES\n" );
 
     return g->enums.count();
 }
@@ -5610,7 +5610,7 @@ int generateProps()
 		moc_err("The declaration of the class \"%s\" contains properties"
 		" but no TQ_OBJECT macro.", g->className.data());
 
-	fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
+	fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" );
 
 	fprintf( out, "    static const TQMetaProperty props_tbl[%d] = {\n ", g->props.count() );
 	for( TQPtrListIterator it( g->props ); it.current(); ++it ) {
@@ -5675,7 +5675,7 @@ int generateProps()
 		fprintf( out, "\n" );
 	}
 	fprintf( out, "    };\n" );
-	fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
+	fprintf( out, "#endif // TQT_NO_PROPERTIES\n" );
     }
 
     return g->props.count();
@@ -5912,7 +5912,7 @@ void generateClass()		      // generate C++ source code for a class
     else
 	fprintf( out, "\t0, 0,\n" );
 
-    fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
+    fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" );
     if ( n_props )
 	fprintf( out, "\tprops_tbl, %d,\n", n_props );
     else
@@ -5921,7 +5921,7 @@ void generateClass()		      // generate C++ source code for a class
 	fprintf( out, "\tenum_tbl, %d,\n", n_enums );
     else
 	fprintf( out, "\t0, 0,\n" );
-    fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
+    fprintf( out, "#endif // TQT_NO_PROPERTIES\n" );
 
     if ( n_infos )
 	fprintf( out, "\tclassinfo_tbl, %d );\n", n_infos );
@@ -6263,7 +6263,7 @@ void generateClass()		      // generate C++ source code for a class
     }
 
 
-    fprintf( out, "#ifndef QT_NO_PROPERTIES\n" );
+    fprintf( out, "#ifndef TQT_NO_PROPERTIES\n" );
 //
 // Generate internal tqt_property()  functions
 //
@@ -6401,7 +6401,7 @@ void generateClass()		      // generate C++ source code for a class
     }
 
     fprintf( out, "\nbool %s::tqt_static_property( TQObject* , int , int , TQVariant* ){ return FALSE; }\n", qualifiedClassName().data() );
-    fprintf( out, "#endif // QT_NO_PROPERTIES\n" );
+    fprintf( out, "#endif // TQT_NO_PROPERTIES\n" );
 }
 
 
diff --git a/src/network/ntqdns.h b/src/network/ntqdns.h
index c594e3941..76b2d9590 100644
--- a/src/network/ntqdns.h
+++ b/src/network/ntqdns.h
@@ -54,7 +54,7 @@
 #define TQM_EXPORT_DNS Q_EXPORT
 #endif
 
-#ifndef QT_NO_DNS
+#ifndef TQT_NO_DNS
 
 //#define Q_DNS_SYNCHRONOUS
 
@@ -165,6 +165,6 @@ private slots:
     virtual void answer();
 };
 
-#endif // QT_NO_DNS
+#endif // TQT_NO_DNS
 
 #endif // TQDNS_H
diff --git a/src/network/ntqftp.h b/src/network/ntqftp.h
index e68867ad0..da4a23e88 100644
--- a/src/network/ntqftp.h
+++ b/src/network/ntqftp.h
@@ -53,7 +53,7 @@
 #define TQM_EXPORT_FTP Q_EXPORT
 #endif
 
-#ifndef QT_NO_NETWORKPROTOCOL_FTP
+#ifndef TQT_NO_NETWORKPROTOCOL_FTP
 
 
 class TQSocket;
@@ -197,6 +197,6 @@ protected slots:
     void error( int );
 };
 
-#endif // QT_NO_NETWORKPROTOCOL_FTP
+#endif // TQT_NO_NETWORKPROTOCOL_FTP
 
 #endif // TQFTP_H
diff --git a/src/network/ntqhostaddress.h b/src/network/ntqhostaddress.h
index e28e3c206..d8a30af42 100644
--- a/src/network/ntqhostaddress.h
+++ b/src/network/ntqhostaddress.h
@@ -51,7 +51,7 @@
 #define TQM_EXPORT_NETWORK Q_EXPORT
 #endif
 
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 class TQHostAddressPrivate;
 
 typedef struct {
@@ -65,7 +65,7 @@ public:
     TQHostAddress( TQ_UINT32 ip4Addr );
     TQHostAddress( TQ_UINT8 *ip6Addr );
     TQHostAddress(const Q_IPV6ADDR &ip6Addr);
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     TQHostAddress(const TQString &address);
 #endif
     TQHostAddress( const TQHostAddress & );
@@ -75,7 +75,7 @@ public:
 
     void setAddress( TQ_UINT32 ip4Addr );
     void setAddress( TQ_UINT8 *ip6Addr );
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     bool setAddress( const TQString& address );
 #endif
     bool	 isIp4Addr()	 const; // obsolete
@@ -86,7 +86,7 @@ public:
     bool	 isIPv6Address() const;
     Q_IPV6ADDR	 toIPv6Address() const;
 
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_SPRINTF
     TQString	 toString() const;
 #endif
 
@@ -97,5 +97,5 @@ private:
     TQHostAddressPrivate* d;
 };
 
-#endif //QT_NO_NETWORK
+#endif //TQT_NO_NETWORK
 #endif
diff --git a/src/network/ntqhttp.h b/src/network/ntqhttp.h
index 98d77bc85..c4c2714a5 100644
--- a/src/network/ntqhttp.h
+++ b/src/network/ntqhttp.h
@@ -55,7 +55,7 @@
 #define TQM_TEMPLATE_EXTERN_HTTP Q_TEMPLATE_EXTERN
 #endif
 
-#ifndef QT_NO_NETWORKPROTOCOL_HTTP
+#ifndef TQT_NO_NETWORKPROTOCOL_HTTP
 
 class TQSocket;
 class TQTimerEvent;
diff --git a/src/network/ntqnetwork.h b/src/network/ntqnetwork.h
index 800414bf0..b8dabc086 100644
--- a/src/network/ntqnetwork.h
+++ b/src/network/ntqnetwork.h
@@ -51,7 +51,7 @@
 #define TQM_EXPORT_NETWORK Q_EXPORT
 #endif
 
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 
 TQM_EXPORT_NETWORK void tqInitNetworkProtocols();
 
diff --git a/src/network/ntqserversocket.h b/src/network/ntqserversocket.h
index 4da629e67..57ebf341d 100644
--- a/src/network/ntqserversocket.h
+++ b/src/network/ntqserversocket.h
@@ -46,7 +46,7 @@
 #include "ntqhostaddress.h"
 #include "ntqsocketdevice.h" // ### remove or keep for users' convenience?
 #endif // QT_H
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 
 #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK )
 #define TQM_EXPORT_NETWORK
@@ -90,5 +90,5 @@ private:
     void init( const TQHostAddress & address, TQ_UINT16 port, int backlog );
 };
 
-#endif // QT_NO_NETWORK
+#endif // TQT_NO_NETWORK
 #endif // TQSERVERSOCKET_H
diff --git a/src/network/ntqsocket.h b/src/network/ntqsocket.h
index e5131926b..3324699fd 100644
--- a/src/network/ntqsocket.h
+++ b/src/network/ntqsocket.h
@@ -53,7 +53,7 @@
 #define TQM_EXPORT_NETWORK Q_EXPORT
 #endif
 
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 class TQSocketPrivate;
 class TQSocketDevice;
 
@@ -82,7 +82,7 @@ public:
     TQSocketDevice *socketDevice();
     virtual void setSocketDevice( TQSocketDevice * );
 
-#ifndef QT_NO_DNS
+#ifndef TQT_NO_DNS
     virtual void connectToHost( const TQString &host, TQ_UINT16 port );
 #endif
     TQString	 peerName() const;
@@ -152,5 +152,5 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif //QT_NO_NETWORK
+#endif //TQT_NO_NETWORK
 #endif // TQSOCKET_H
diff --git a/src/network/ntqsocketdevice.h b/src/network/ntqsocketdevice.h
index bff859343..420cd29ad 100644
--- a/src/network/ntqsocketdevice.h
+++ b/src/network/ntqsocketdevice.h
@@ -52,7 +52,7 @@
 #define TQM_EXPORT_NETWORK Q_EXPORT
 #endif
 
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 class TQSocketDevicePrivate;
 
 
@@ -166,5 +166,5 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_NETWORK
+#endif // TQT_NO_NETWORK
 #endif // TQSOCKETDEVICE_H
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index 9f370a8ee..780d119ab 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -62,7 +62,7 @@
 
 #include "ntqdns.h"
 
-#ifndef QT_NO_DNS
+#ifndef TQT_NO_DNS
 
 #include "ntqdatetime.h"
 #include "ntqdict.h"
@@ -891,7 +891,7 @@ public:
     TQPtrVector queries;
     TQDict cache;
     TQSocketDevice * ipv4Socket;
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
     TQSocketDevice * ipv6Socket;
 #endif
 };
@@ -933,7 +933,7 @@ TQDnsManager::TQDnsManager()
       queries( TQPtrVector( 0 ) ),
       cache( TQDict( 83, FALSE ) ),
       ipv4Socket( new TQSocketDevice( TQSocketDevice::Datagram, TQSocketDevice::IPv4, 0 ) )
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
       , ipv6Socket( new TQSocketDevice( TQSocketDevice::Datagram, TQSocketDevice::IPv6, 0 ) )
 #endif
 {
@@ -952,7 +952,7 @@ TQDnsManager::TQDnsManager()
     ipv4Socket->setBlocking( FALSE );
     connect( rn4, SIGNAL(activated(int)), SLOT(answer()) );
 
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
     // Don't connect the IPv6 socket notifier if the host does not
     // support IPv6.
     if ( ipv6Socket->socket() != -1 ) {
@@ -1028,7 +1028,7 @@ TQDnsManager::~TQDnsManager()
     queries.setAutoDelete( TRUE );
     cache.setAutoDelete( TRUE );
     delete ipv4Socket;
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
     delete ipv6Socket;
 #endif
 }
@@ -1076,7 +1076,7 @@ void TQDnsManager::answer()
     TQByteArray a( 16383 ); // large enough for anything, one suspects
 
     int r;
-#if defined (QT_NO_IPV6)
+#if defined (TQT_NO_IPV6)
     r = ipv4Socket->readBlock(a.data(), a.size());
 #else
     if (((TQSocketNotifier *)sender())->socket() == ipv4Socket->socket())
@@ -1085,7 +1085,7 @@ void TQDnsManager::answer()
         r = ipv6Socket->readBlock(a.data(), a.size());
 #endif
 #if defined(TQDNS_DEBUG)
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
     tqDebug("DNS Manager: answer arrived: %d bytes from %s:%d", r,
 	   useIpv4Socket ? ipv4Socket->peerAddress().toString().ascii()
 	   : ipv6Socket->peerAddress().toString().ascii(),
@@ -1273,7 +1273,7 @@ void TQDnsManager::transmitQuery( int i )
     TQHostAddress receiver = *ns->at( q->step % ns->count() );
     if (receiver.isIPv4Address())
 	ipv4Socket->writeBlock( p.data(), pp, receiver, 53 );
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
     else
 	ipv6Socket->writeBlock( p.data(), pp, receiver, 53 );
 #endif
@@ -1291,7 +1291,7 @@ void TQDnsManager::transmitQuery( int i )
 	while( (server=ns->next()) != 0 ) {
 	    if (server->isIPv4Address())
 		ipv4Socket->writeBlock( p.data(), pp, *server, 53 );
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
 	    else
 		ipv6Socket->writeBlock( p.data(), pp, *server, 53 );
 #endif
@@ -2691,4 +2691,4 @@ void TQDns::doResInit()
 
 #endif
 
-#endif // QT_NO_DNS
+#endif // TQT_NO_DNS
diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp
index 31f07de30..f31029321 100644
--- a/src/network/qftp.cpp
+++ b/src/network/qftp.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqftp.h"
 
-#ifndef QT_NO_NETWORKPROTOCOL_FTP
+#ifndef TQT_NO_NETWORKPROTOCOL_FTP
 
 #include "ntqsocket.h"
 #include "ntqsocketdevice.h"
@@ -52,7 +52,7 @@
 #include "ntqfileinfo.h"
 #include "ntqptrdict.h" // binary compatibility
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 #include "ntqtextcodec.h"
 #endif
 
@@ -935,7 +935,7 @@ bool TQFtpPI::processReply()
     return TRUE;
 }
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 TQM_EXPORT_FTP TQTextCodec *tqt_ftp_filename_codec = 0;
 #endif
 
@@ -964,7 +964,7 @@ bool TQFtpPI::startNextCmd()
     tqDebug( "TQFtpPI send: %s", currentCmd.left( currentCmd.length()-2 ).latin1() );
 #endif
     state = Waiting;
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( tqt_ftp_filename_codec ) {
 	int len = 0;
 	TQCString enc = tqt_ftp_filename_codec->fromUnicode(currentCmd,len);
@@ -2416,4 +2416,4 @@ void TQFtp::error( int )
 
 #include "qftp.moc"
 
-#endif // QT_NO_NETWORKPROTOCOL_FTP
+#endif // TQT_NO_NETWORKPROTOCOL_FTP
diff --git a/src/network/qhostaddress.cpp b/src/network/qhostaddress.cpp
index fdbc0e395..be6cb3ba6 100644
--- a/src/network/qhostaddress.cpp
+++ b/src/network/qhostaddress.cpp
@@ -41,7 +41,7 @@
 #include "ntqhostaddress.h"
 #include "ntqstringlist.h"
 
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 class TQHostAddressPrivate
 {
 public:
@@ -209,7 +209,7 @@ void TQHostAddress::setAddress( TQ_UINT8 *ip6Addr )
     d = new TQHostAddressPrivate( ip6Addr );
 }
 
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 static bool parseIp4(const TQString& address, TQ_UINT32 *addr)
 {
     TQStringList ipv4 = TQStringList::split(".", address, FALSE);
@@ -390,7 +390,7 @@ Q_IPV6ADDR TQHostAddress::toIPv6Address() const
     return d->a6;
 }
 
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_SPRINTF
 /*!
     Returns the address as a string.
 
@@ -450,4 +450,4 @@ bool TQHostAddress::isNull() const
     return TRUE;
 }
 
-#endif //QT_NO_NETWORK
+#endif //TQT_NO_NETWORK
diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp
index af50e8cef..393cc18c0 100644
--- a/src/network/qhttp.cpp
+++ b/src/network/qhttp.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqhttp.h"
 
-#ifndef QT_NO_NETWORKPROTOCOL_HTTP
+#ifndef TQT_NO_NETWORKPROTOCOL_HTTP
 
 #include "ntqsocket.h"
 #include "ntqtextstream.h"
diff --git a/src/network/qnetwork.cpp b/src/network/qnetwork.cpp
index 47c1c7ad5..f0af49fef 100644
--- a/src/network/qnetwork.cpp
+++ b/src/network/qnetwork.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqnetwork.h"
 
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 
 #include "ntqnetworkprotocol.h"
 
@@ -60,12 +60,12 @@
 */
 void tqInitNetworkProtocols()
 {
-#ifndef QT_NO_NETWORKPROTOCOL_FTP
+#ifndef TQT_NO_NETWORKPROTOCOL_FTP
     TQNetworkProtocol::registerNetworkProtocol( "ftp", new TQNetworkProtocolFactory< TQFtp > );
 #endif
-#ifndef QT_NO_NETWORKPROTOCOL_HTTP
+#ifndef TQT_NO_NETWORKPROTOCOL_HTTP
     TQNetworkProtocol::registerNetworkProtocol( "http", new TQNetworkProtocolFactory< TQHttp > );
 #endif
 }
 
-#endif // QT_NO_NETWORK
+#endif // TQT_NO_NETWORK
diff --git a/src/network/qserversocket.cpp b/src/network/qserversocket.cpp
index 97dd95594..8fd1b7bfb 100644
--- a/src/network/qserversocket.cpp
+++ b/src/network/qserversocket.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqserversocket.h"
 
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 
 #include "ntqsocketnotifier.h"
 
@@ -294,4 +294,4 @@ void TQServerSocket::setSocket( int socket )
 	     this, SLOT(incomingConnection(int)) );
 }
 
-#endif //QT_NO_NETWORK
+#endif //TQT_NO_NETWORK
diff --git a/src/network/qsocket.cpp b/src/network/qsocket.cpp
index fe6e0b6c0..a612867be 100644
--- a/src/network/qsocket.cpp
+++ b/src/network/qsocket.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqsocket.h"
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 #include "ntqptrlist.h"
 #include "ntqtimer.h"
 #include "ntqsocketdevice.h"
@@ -133,7 +133,7 @@ public:
     TQValueList addresses;		// alternatives looked up
     TQIODevice::Offset	wsize;			// write total buf size
     TQIODevice::Offset	windex;			// write index
-#ifndef QT_NO_DNS
+#ifndef TQT_NO_DNS
     TQDns	       *dns4;
     TQDns	       *dns6;
 #endif
@@ -148,7 +148,7 @@ TQSocketPrivate::TQSocketPrivate()
     : state(TQSocket::Idle), host(TQString::fromLatin1("")), port(0),
       socket(0), rsn(0), wsn(0), readBufferSize(0), wsize(0), windex(0)
 {
-#ifndef QT_NO_DNS
+#ifndef TQT_NO_DNS
     dns4 = 0;
     dns6 = 0;
 #endif
@@ -159,7 +159,7 @@ TQSocketPrivate::~TQSocketPrivate()
 {
     close();
     delete socket;
-#ifndef QT_NO_DNS
+#ifndef TQT_NO_DNS
     delete dns4;
     delete dns6;
 #endif
@@ -388,7 +388,7 @@ TQSocket::State TQSocket::state() const
 }
 
 
-#ifndef QT_NO_DNS
+#ifndef TQT_NO_DNS
 
 /*!
     Attempts to make a connection to \a host on the specified \a port
@@ -446,7 +446,7 @@ void TQSocket::tryConnecting()
 #endif
     // ### this ifdef isn't correct - addresses() also does /etc/hosts and
     // numeric-address-as-string handling.
-#ifndef QT_NO_DNS
+#ifndef TQT_NO_DNS
 
     if ( d->dns4 ) {
 	d->l4 = d->dns4->addresses();
@@ -1430,7 +1430,7 @@ void TQSocket::setSocketIntern( int socket )
     // hm... this is not very nice.
     d->host = TQString::null;
     d->port = 0;
-#ifndef QT_NO_DNS
+#ifndef TQT_NO_DNS
     delete d->dns4;
     d->dns4 = 0;
     delete d->dns6;
@@ -1543,4 +1543,4 @@ TQ_ULONG TQSocket::readBufferSize() const
     return d->readBufferSize;
 }
 
-#endif //QT_NO_NETWORK
+#endif //TQT_NO_NETWORK
diff --git a/src/network/qsocketdevice.cpp b/src/network/qsocketdevice.cpp
index a2055899d..803cca84b 100644
--- a/src/network/qsocketdevice.cpp
+++ b/src/network/qsocketdevice.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqsocketdevice.h"
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 
 #include "ntqwindowdefs.h"
 #include 
@@ -572,5 +572,5 @@ void TQSocketDevice::setError( Error err )
 {
     e = err;
 }
-#endif //QT_NO_NETWORK
+#endif //TQT_NO_NETWORK
 
diff --git a/src/network/qsocketdevice_unix.cpp b/src/network/qsocketdevice_unix.cpp
index 565ab7d3b..9ac0b605e 100644
--- a/src/network/qsocketdevice_unix.cpp
+++ b/src/network/qsocketdevice_unix.cpp
@@ -82,7 +82,7 @@ static inline int qt_socket_socket(int domain, int type, int protocol)
 
 #include "ntqsocketdevice.h"
 
-#ifndef QT_NO_NETWORK
+#ifndef TQT_NO_NETWORK
 
 #include "ntqwindowdefs.h"
 
@@ -93,7 +93,7 @@ static inline int qt_socket_socket(int domain, int type, int protocol)
 static inline void qt_socket_getportaddr( struct sockaddr *sa,
 					  TQ_UINT16 *port, TQHostAddress *addr )
 {
-#if !defined(QT_NO_IPV6)
+#if !defined(TQT_NO_IPV6)
     if ( sa->sa_family == AF_INET6 ) {
 	struct sockaddr_in6 *sa6 = ( struct sockaddr_in6 * )sa;
 	Q_IPV6ADDR tmp;
@@ -123,14 +123,14 @@ void TQSocketDevice::init()
 TQSocketDevice::Protocol TQSocketDevice::getProtocol() const
 {
     if ( isValid() ) {
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
 	struct sockaddr_storage sa;
 #else
 	struct sockaddr sa;
 #endif
 	memset( &sa, 0, sizeof(sa) );
 	QT_SOCKLEN_T sz = sizeof( sa );
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
 	struct sockaddr *sap = reinterpret_cast(&sa);
 	if ( !::getsockname(fd, sap, &sz) ) {
 	    switch ( sap->sa_family ) {
@@ -165,7 +165,7 @@ TQSocketDevice::Protocol TQSocketDevice::getProtocol() const
 
 int TQSocketDevice::createNewSocket()
 {
-#if !defined(QT_NO_IPV6)
+#if !defined(TQT_NO_IPV6)
     int s = qt_socket_socket( protocol() == IPv6 ? AF_INET6 : AF_INET,
 			      t == Datagram ? SOCK_DGRAM : SOCK_STREAM, 0 );
 #else
@@ -414,7 +414,7 @@ bool TQSocketDevice::connect( const TQHostAddress &addr, TQ_UINT16 port )
     struct sockaddr *aa;
     QT_SOCKLEN_T aalen;
 
-#if !defined(QT_NO_IPV6)
+#if !defined(TQT_NO_IPV6)
     struct sockaddr_in6 a6;
 
     if ( addr.isIPv6Address() ) {
@@ -499,7 +499,7 @@ bool TQSocketDevice::bind( const TQHostAddress &address, TQ_UINT16 port )
 	return FALSE;
     int r;
     struct sockaddr_in a4;
-#if !defined(QT_NO_IPV6)
+#if !defined(TQT_NO_IPV6)
     struct sockaddr_in6 a6;
 
     if ( address.isIPv6Address() ) {
@@ -593,7 +593,7 @@ int TQSocketDevice::accept()
     if ( !isValid() )
 	return -1;
 
-#if !defined (QT_NO_IPV6)
+#if !defined (TQT_NO_IPV6)
     struct sockaddr_storage aa;
 #else
     struct sockaddr aa;
@@ -781,7 +781,7 @@ TQ_LONG TQSocketDevice::readBlock( char *data, TQ_ULONG maxlen )
     int r = 0;
     while ( done == FALSE ) {
 	if ( t == Datagram ) {
-#if !defined(QT_NO_IPV6)
+#if !defined(TQT_NO_IPV6)
             struct sockaddr_storage aa;
 #else
             struct sockaddr_in aa;
@@ -971,7 +971,7 @@ TQ_LONG TQSocketDevice::writeBlock( const char * data, TQ_ULONG len,
     struct sockaddr_in a4;
     struct sockaddr *aa;
     QT_SOCKLEN_T slen;
-#if !defined(QT_NO_IPV6)
+#if !defined(TQT_NO_IPV6)
     struct sockaddr_in6 a6;
     if ( host.isIPv6Address() ) {
 	memset( &a6, 0, sizeof(a6) );
@@ -1052,7 +1052,7 @@ void TQSocketDevice::fetchConnectionParameters()
 	pa = TQHostAddress();
 	return;
     }
-#if !defined(QT_NO_IPV6)
+#if !defined(TQT_NO_IPV6)
     struct sockaddr_storage sa;
 #else
     struct sockaddr_in sa;
@@ -1096,4 +1096,4 @@ TQHostAddress TQSocketDevice::peerAddress() const
     return pa;
 }
 
-#endif //QT_NO_NETWORK
+#endif //TQT_NO_NETWORK
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index d8f8914c4..0732bca0a 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2144,7 +2144,7 @@ int TQGLWidget::displayListBase( const TQFont & fnt, int listBase )
     // contexts can't handle this otherwise
     bool regenerate = glcx->deviceIsPixmap();
 
-#if 0 // QT_NO_XFTFREETYPE
+#if 0 // TQT_NO_XFTFREETYPE
     // font color needs to be part of the font cache key when using
     // antialiased fonts since one set of glyphs needs to be generated
     // for each font color
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index a0e07187f..6a74127d9 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -835,7 +835,7 @@ uint TQGLContext::colorIndex( const TQColor& c ) const
     return 0;
 }
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
 /*! \internal
     This is basically a substitute for glxUseXFont() which can only
     handle XLFD fonts. This version relies on XFT v2 to render the
@@ -953,7 +953,7 @@ void TQGLContext::generateFontDisplayLists( const TQFont & fnt, int listBase )
     TQFont f(fnt);
     TQFontEngine *engine = f.d->engineForScript(TQFont::Latin);
 
-#ifndef QT_NO_XFTFREETYPE
+#ifndef TQT_NO_XFTFREETYPE
     if(engine->type() == TQFontEngine::Xft) {
 	qgl_use_font((TQFontEngineXft *) engine, 0, 256, listBase);
 	return;
diff --git a/src/qt.pro b/src/qt.pro
index 406441b11..84482686b 100644
--- a/src/qt.pro
+++ b/src/qt.pro
@@ -124,9 +124,9 @@ thread {
 	DEFINES += TQT_THREAD_SUPPORT
 }
 
-!cups:DEFINES += QT_NO_CUPS
+!cups:DEFINES += TQT_NO_CUPS
 
-!nis:DEFINES += QT_NO_NIS
+!nis:DEFINES += TQT_NO_NIS
 
 largefile {
 	unix:!darwin:DEFINES += _LARGEFILE_SOURCE _LARGE_FILES _FILE_OFFSET_BITS=64
diff --git a/src/sql/drivers/cache/qsqlcachedresult.cpp b/src/sql/drivers/cache/qsqlcachedresult.cpp
index 4f60fa252..aa3a0ac14 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.cpp
+++ b/src/sql/drivers/cache/qsqlcachedresult.cpp
@@ -40,7 +40,7 @@
 #include "qsqlcachedresult.h"
 #include 
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static const uint initial_cache_size = 128;
 
 class TQtSqlCachedResultPrivate
@@ -256,4 +256,4 @@ int TQtSqlCachedResult::colCount() const
 {
     return d->colCount;
 }
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/sql/drivers/cache/qsqlcachedresult.h b/src/sql/drivers/cache/qsqlcachedresult.h
index b00779dc0..46f8afae4 100644
--- a/src/sql/drivers/cache/qsqlcachedresult.h
+++ b/src/sql/drivers/cache/qsqlcachedresult.h
@@ -63,7 +63,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQtSqlCachedResultPrivate;
 
diff --git a/src/sql/ntqdatabrowser.h b/src/sql/ntqdatabrowser.h
index 54a1d9e8d..8c5cc7016 100644
--- a/src/sql/ntqdatabrowser.h
+++ b/src/sql/ntqdatabrowser.h
@@ -51,7 +51,7 @@
 #include "ntqsqlerror.h"
 #endif // QT_H
 
-#ifndef QT_NO_SQL_VIEW_WIDGETS
+#ifndef TQT_NO_SQL_VIEW_WIDGETS
 
 class TQSqlForm;
 class TQDataBrowserPrivate;
diff --git a/src/sql/ntqdatatable.h b/src/sql/ntqdatatable.h
index 489661c87..d03f9f7b7 100644
--- a/src/sql/ntqdatatable.h
+++ b/src/sql/ntqdatatable.h
@@ -58,7 +58,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL_VIEW_WIDGETS
+#ifndef TQT_NO_SQL_VIEW_WIDGETS
 
 class TQPainter;
 class TQSqlField;
diff --git a/src/sql/ntqdataview.h b/src/sql/ntqdataview.h
index ca1fed1b4..9d982e1e8 100644
--- a/src/sql/ntqdataview.h
+++ b/src/sql/ntqdataview.h
@@ -51,7 +51,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL_VIEW_WIDGETS
+#ifndef TQT_NO_SQL_VIEW_WIDGETS
 
 class TQSqlForm;
 class TQSqlRecord;
diff --git a/src/sql/ntqeditorfactory.h b/src/sql/ntqeditorfactory.h
index 8818770c9..2a18b4b47 100644
--- a/src/sql/ntqeditorfactory.h
+++ b/src/sql/ntqeditorfactory.h
@@ -52,7 +52,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL_EDIT_WIDGETS
+#ifndef TQT_NO_SQL_EDIT_WIDGETS
 
 class TQM_EXPORT_SQL TQEditorFactory : public TQObject
 {
@@ -72,5 +72,5 @@ private:
 #endif
 }; 
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
 #endif // TQEDITORFACTORY_H
diff --git a/src/sql/ntqsql.h b/src/sql/ntqsql.h
index 78030f790..f1c8b0883 100644
--- a/src/sql/ntqsql.h
+++ b/src/sql/ntqsql.h
@@ -51,7 +51,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQM_EXPORT_SQL TQSql
 {
diff --git a/src/sql/ntqsqlcursor.h b/src/sql/ntqsqlcursor.h
index f04f53d08..9541fe7b1 100644
--- a/src/sql/ntqsqlcursor.h
+++ b/src/sql/ntqsqlcursor.h
@@ -54,7 +54,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlDatabase;
 class TQSqlCursorPrivate;
@@ -156,5 +156,5 @@ private:
 
 
 
-#endif	// QT_NO_SQL
+#endif	// TQT_NO_SQL
 #endif
diff --git a/src/sql/ntqsqldatabase.h b/src/sql/ntqsqldatabase.h
index b44735e61..6017bfcfe 100644
--- a/src/sql/ntqsqldatabase.h
+++ b/src/sql/ntqsqldatabase.h
@@ -54,7 +54,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlError;
 class TQSqlDriver;
@@ -155,5 +155,5 @@ private:
 
 };
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
 #endif
diff --git a/src/sql/ntqsqldriver.h b/src/sql/ntqsqldriver.h
index 09c74b249..5e5c625ed 100644
--- a/src/sql/ntqsqldriver.h
+++ b/src/sql/ntqsqldriver.h
@@ -59,7 +59,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlDriverExtension;
 
@@ -122,5 +122,5 @@ private:
 #endif
 };
 
-#endif	// QT_NO_SQL
+#endif	// TQT_NO_SQL
 #endif
diff --git a/src/sql/ntqsqldriverplugin.h b/src/sql/ntqsqldriverplugin.h
index 1b4514772..8a6d3944a 100644
--- a/src/sql/ntqsqldriverplugin.h
+++ b/src/sql/ntqsqldriverplugin.h
@@ -46,8 +46,8 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_SQL
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_SQL
+#ifndef TQT_NO_COMPONENT
 
 class TQSqlDriver;
 class TQSqlDriverPluginPrivate;
@@ -66,7 +66,7 @@ private:
     TQSqlDriverPluginPrivate *d;
 };
 
-#endif // QT_NO_COMPONENT
-#endif // QT_NO_SQL
+#endif // TQT_NO_COMPONENT
+#endif // TQT_NO_SQL
 
 #endif // TQSQLDRIVERPLUGIN_H
diff --git a/src/sql/ntqsqleditorfactory.h b/src/sql/ntqsqleditorfactory.h
index 0fb30ff2d..eb100952c 100644
--- a/src/sql/ntqsqleditorfactory.h
+++ b/src/sql/ntqsqleditorfactory.h
@@ -51,7 +51,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL_EDIT_WIDGETS
+#ifndef TQT_NO_SQL_EDIT_WIDGETS
 
 class TQSqlField;
 
@@ -73,5 +73,5 @@ private:
 #endif
 };
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
 #endif // TQSQLEDITORFACTORY_H
diff --git a/src/sql/ntqsqlerror.h b/src/sql/ntqsqlerror.h
index ca4c6cae6..7fb816614 100644
--- a/src/sql/ntqsqlerror.h
+++ b/src/sql/ntqsqlerror.h
@@ -51,7 +51,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQM_EXPORT_SQL TQSqlError
 {
@@ -89,5 +89,5 @@ private:
     int	errorNumber;
 };
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
 #endif
diff --git a/src/sql/ntqsqlfield.h b/src/sql/ntqsqlfield.h
index bec5edd27..f917b6e92 100644
--- a/src/sql/ntqsqlfield.h
+++ b/src/sql/ntqsqlfield.h
@@ -52,7 +52,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlFieldPrivate
 {
@@ -150,5 +150,5 @@ private:
 };
 
 
-#endif	// QT_NO_SQL
+#endif	// TQT_NO_SQL
 #endif
diff --git a/src/sql/ntqsqlform.h b/src/sql/ntqsqlform.h
index 2c050c96c..c39382449 100644
--- a/src/sql/ntqsqlform.h
+++ b/src/sql/ntqsqlform.h
@@ -52,7 +52,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL_FORM
+#ifndef TQT_NO_SQL_FORM
 
 class TQSqlField;
 class TQSqlRecord;
@@ -104,5 +104,5 @@ private:
 #endif
 };
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
 #endif // TQSQLFORM_H
diff --git a/src/sql/ntqsqlindex.h b/src/sql/ntqsqlindex.h
index 1b88cb9d2..b387ea7da 100644
--- a/src/sql/ntqsqlindex.h
+++ b/src/sql/ntqsqlindex.h
@@ -56,7 +56,7 @@
 #define TQM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlCursor;
 
@@ -95,5 +95,5 @@ private:
 
 #define Q_DEFINED_QSQLINDEX
 #include "ntqwinexport.h"
-#endif	// QT_NO_SQL
+#endif	// TQT_NO_SQL
 #endif
diff --git a/src/sql/ntqsqlpropertymap.h b/src/sql/ntqsqlpropertymap.h
index 93c30cb5c..893e8b6ab 100644
--- a/src/sql/ntqsqlpropertymap.h
+++ b/src/sql/ntqsqlpropertymap.h
@@ -46,7 +46,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#ifndef QT_NO_SQL_FORM
+#ifndef TQT_NO_SQL_FORM
 
 class TQWidget;
 class TQSqlPropertyMapPrivate;
@@ -74,5 +74,5 @@ private:	// Disabled copy constructor and operator=
 
 };
 
-#endif // QT_NO_SQL_FORM
+#endif // TQT_NO_SQL_FORM
 #endif // TQSQLPROPERTYMAP_H
diff --git a/src/sql/ntqsqlquery.h b/src/sql/ntqsqlquery.h
index 718886c26..80776251b 100644
--- a/src/sql/ntqsqlquery.h
+++ b/src/sql/ntqsqlquery.h
@@ -51,7 +51,7 @@
 #include "ntqsql.h"
 #endif // QT_H
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlDriver;
 class TQSqlResult;
@@ -129,5 +129,5 @@ private:
 };
 
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
 #endif
diff --git a/src/sql/ntqsqlrecord.h b/src/sql/ntqsqlrecord.h
index 1dcd888eb..bf3ebfc4f 100644
--- a/src/sql/ntqsqlrecord.h
+++ b/src/sql/ntqsqlrecord.h
@@ -48,7 +48,7 @@
 #include "ntqsqlfield.h"
 #endif // QT_H
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlRecordPrivate;
 
@@ -137,5 +137,5 @@ public:
 };
 
 
-#endif	// QT_NO_SQL
+#endif	// TQT_NO_SQL
 #endif
diff --git a/src/sql/ntqsqlresult.h b/src/sql/ntqsqlresult.h
index 410d6f0d6..4e0255a8f 100644
--- a/src/sql/ntqsqlresult.h
+++ b/src/sql/ntqsqlresult.h
@@ -55,7 +55,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlDriver;
 class TQSql;
@@ -111,5 +111,5 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif	// QT_NO_SQL
+#endif	// TQT_NO_SQL
 #endif
diff --git a/src/sql/ntqsqlselectcursor.h b/src/sql/ntqsqlselectcursor.h
index f3065634b..7168dbefd 100644
--- a/src/sql/ntqsqlselectcursor.h
+++ b/src/sql/ntqsqlselectcursor.h
@@ -51,7 +51,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlSelectCursorPrivate;
 
@@ -100,5 +100,5 @@ private:
     TQSqlSelectCursorPrivate * d;
 };
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
 #endif // TQSQLSELECTCURSOR_H
diff --git a/src/sql/qdatabrowser.cpp b/src/sql/qdatabrowser.cpp
index 79ac4ab0b..1b722822c 100644
--- a/src/sql/qdatabrowser.cpp
+++ b/src/sql/qdatabrowser.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdatabrowser.h"
 
-#ifndef QT_NO_SQL_VIEW_WIDGETS
+#ifndef TQT_NO_SQL_VIEW_WIDGETS
 
 #include "ntqsqlform.h"
 #include "qsqlmanager_p.h"
diff --git a/src/sql/qdatatable.cpp b/src/sql/qdatatable.cpp
index 3a901a86e..6df0cce08 100644
--- a/src/sql/qdatatable.cpp
+++ b/src/sql/qdatatable.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdatatable.h"
 
-#ifndef QT_NO_SQL_VIEW_WIDGETS
+#ifndef TQT_NO_SQL_VIEW_WIDGETS
 
 #include "ntqsqldriver.h"
 #include "ntqsqleditorfactory.h"
@@ -722,7 +722,7 @@ bool TQDataTable::eventFilter( TQObject *o, TQEvent *e )
 	if ( sql && sql->driver() &&
 	     !sql->driver()->hasFeature( TQSqlDriver::QuerySize ) &&
 	     ke->key() == Key_End && d->dat.mode() == TQSql::None ) {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    TQApplication::setOverrideCursor( TQt::WaitCursor );
 #endif
 	    int i = sql->at();
@@ -734,7 +734,7 @@ bool TQDataTable::eventFilter( TQObject *o, TQEvent *e )
 		i++;
 	    setNumRows( i+1 );
 	    setCurrentCell( i+1, currentColumn() );
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    TQApplication::restoreOverrideCursor();
 #endif
 	    return TRUE;
@@ -1059,12 +1059,12 @@ bool TQDataTable::insertCurrent()
 	conf = confirmEdit( TQSql::Insert );
     switch ( conf ) {
     case TQSql::Yes: {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	TQApplication::setOverrideCursor( TQt::waitCursor );
 #endif
 	emit beforeInsert( d->editBuffer );
 	b = sqlCursor()->insert();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	TQApplication::restoreOverrideCursor();
 #endif
 	if ( ( !b && !sqlCursor()->isActive() ) || !sqlCursor()->isActive() ) {
@@ -1141,12 +1141,12 @@ bool TQDataTable::updateCurrent()
 	conf = confirmEdit( TQSql::Update );
     switch ( conf ) {
     case TQSql::Yes: {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	TQApplication::setOverrideCursor( TQt::waitCursor );
 #endif
 	emit beforeUpdate( d->editBuffer );
 	b = sqlCursor()->update();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	TQApplication::restoreOverrideCursor();
 #endif
 	if ( ( !b && !sqlCursor()->isActive() ) || !sqlCursor()->isActive() ) {
@@ -1215,14 +1215,14 @@ bool TQDataTable::deleteCurrent()
 	return FALSE;
     switch ( conf ) {
 	case TQSql::Yes:{
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    TQApplication::setOverrideCursor( TQt::waitCursor );
 #endif
 	    sqlCursor()->primeDelete();
 	    emit primeDelete( sqlCursor()->editBuffer() );
 	    emit beforeDelete( sqlCursor()->editBuffer() );
 	    b = sqlCursor()->del();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    TQApplication::restoreOverrideCursor();
 #endif
 	    if ( !b )
@@ -1300,7 +1300,7 @@ void TQDataTable::find( const TQString & str, bool caseSensitive, bool backwards
     else
 	tmp = str;
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     TQApplication::setOverrideCursor( TQt::waitCursor );
 #endif
     while( wrap ){
@@ -1344,7 +1344,7 @@ void TQDataTable::find( const TQString & str, bool caseSensitive, bool backwards
 	    row = numRows() - 1;
 	}
     }
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     TQApplication::restoreOverrideCursor();
 #endif
 }
diff --git a/src/sql/qdataview.cpp b/src/sql/qdataview.cpp
index 32d437ba2..177aa6419 100644
--- a/src/sql/qdataview.cpp
+++ b/src/sql/qdataview.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdataview.h"
 
-#ifndef QT_NO_SQL_VIEW_WIDGETS
+#ifndef TQT_NO_SQL_VIEW_WIDGETS
 
 #include "qsqlmanager_p.h"
 
diff --git a/src/sql/qeditorfactory.cpp b/src/sql/qeditorfactory.cpp
index 660434cf8..bc9d2605a 100644
--- a/src/sql/qeditorfactory.cpp
+++ b/src/sql/qeditorfactory.cpp
@@ -47,7 +47,7 @@
 #include "ntqeditorfactory.h"
 #include "ntqdatetimeedit.h"
 
-#ifndef QT_NO_SQL_EDIT_WIDGETS
+#ifndef TQT_NO_SQL_EDIT_WIDGETS
 
 /*!
     \class TQEditorFactory ntqeditorfactory.h
@@ -161,7 +161,7 @@ TQWidget * TQEditorFactory::createEditor( TQWidget * parent, const TQVariant & v
 	case TQVariant::DateTime:
 	    w = new TQDateTimeEdit( parent, "qt_editor_datetime" );
 	    break;
-#ifndef QT_NO_LABEL
+#ifndef TQT_NO_LABEL
 	case TQVariant::Pixmap:
 	    w = new TQLabel( parent, "qt_editor_pixmap" );
 	    break;
@@ -189,4 +189,4 @@ TQWidget * TQEditorFactory::createEditor( TQWidget * parent, const TQVariant & v
     }
     return w;
 }
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/sql/qsqlcursor.cpp b/src/sql/qsqlcursor.cpp
index 3e4624803..ed1613d57 100644
--- a/src/sql/qsqlcursor.cpp
+++ b/src/sql/qsqlcursor.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqlcursor.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #include "ntqsqldriver.h"
 #include "ntqsqlresult.h"
diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp
index cc38f86fc..0dddb3b17 100644
--- a/src/sql/qsqldatabase.cpp
+++ b/src/sql/qsqldatabase.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqldatabase.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #ifdef Q_OS_WIN32
 // Conflicting declarations of LPCBYTE in sqlfront.h and winscard.h
@@ -345,7 +345,7 @@ class TQSqlDatabasePrivate
 public:
     TQSqlDatabasePrivate():
 	driver(0),
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 	plugIns(0),
 #endif
 	port(-1) {}
@@ -353,7 +353,7 @@ public:
     {
     }
     TQSqlDriver* driver;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     TQPluginManager *plugIns;
 #endif
     TQString dbname;
@@ -486,7 +486,7 @@ TQStringList TQSqlDatabase::drivers()
 {
     TQStringList l;
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     TQPluginManager *plugIns;
     plugIns = new TQPluginManager( IID_QSqlDriverFactory, TQApplication::libraryPaths(), "/sqldrivers" );
 
@@ -695,7 +695,7 @@ void TQSqlDatabase::init( const TQString& type, const TQString& )
 	}
     }
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     if ( !d->driver ) {
 	d->plugIns =
 	    new TQPluginManager( IID_QSqlDriverFactory, TQApplication::libraryPaths(), "/sqldrivers" );
@@ -724,7 +724,7 @@ void TQSqlDatabase::init( const TQString& type, const TQString& )
 TQSqlDatabase::~TQSqlDatabase()
 {
     delete d->driver;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     delete d->plugIns;
 #endif
     delete d;
@@ -1357,4 +1357,4 @@ TQSqlDatabase* TQSqlDatabase::addDatabase( TQSqlDriver* driver, const TQString&
 {
     return TQSqlDatabaseManager::addDatabase( new TQSqlDatabase( driver ), connectionName );
 }
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/sql/qsqldriver.cpp b/src/sql/qsqldriver.cpp
index f4798c9af..b00f76c7b 100644
--- a/src/sql/qsqldriver.cpp
+++ b/src/sql/qsqldriver.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqldriver.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #include "ntqdatetime.h"
 #include "qsqlextension_p.h"
@@ -506,4 +506,4 @@ bool TQSqlDriver::open( const TQString& db,
     return open( db, user, password, host, port );
 }
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/sql/qsqldriverinterface_p.h b/src/sql/qsqldriverinterface_p.h
index 0944153b2..7f0678288 100644
--- a/src/sql/qsqldriverinterface_p.h
+++ b/src/sql/qsqldriverinterface_p.h
@@ -63,9 +63,9 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 // {EDDD5AD5-DF3C-400c-A711-163B72FE5F61}
 #ifndef IID_QSqlDriverFactory
@@ -79,7 +79,7 @@ struct TQM_EXPORT_SQL TQSqlDriverFactoryInterface : public TQFeatureListInterfac
     virtual TQSqlDriver* create( const TQString& name ) = 0;
 };
 
-#endif //QT_NO_COMPONENT
-#endif // QT_NO_SQL
+#endif //TQT_NO_COMPONENT
+#endif // TQT_NO_SQL
 
 #endif // TQSQLDRIVERINTERFACE_P_H
diff --git a/src/sql/qsqldriverplugin.cpp b/src/sql/qsqldriverplugin.cpp
index 74487f5be..54a48af14 100644
--- a/src/sql/qsqldriverplugin.cpp
+++ b/src/sql/qsqldriverplugin.cpp
@@ -40,8 +40,8 @@
 
 #include "ntqsqldriverplugin.h"
 
-#ifndef QT_NO_SQL
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_SQL
+#ifndef TQT_NO_COMPONENT
 
 #include "qsqldriverinterface_p.h"
 
@@ -157,5 +157,5 @@ TQSqlDriverPlugin::~TQSqlDriverPlugin()
     // don't delete d, as this is deleted by d
 }
 
-#endif // QT_NO_COMPONENT
-#endif // QT_NO_SQL
+#endif // TQT_NO_COMPONENT
+#endif // TQT_NO_SQL
diff --git a/src/sql/qsqleditorfactory.cpp b/src/sql/qsqleditorfactory.cpp
index c962e4ce8..b831cae50 100644
--- a/src/sql/qsqleditorfactory.cpp
+++ b/src/sql/qsqleditorfactory.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqleditorfactory.h"
 
-#ifndef QT_NO_SQL_EDIT_WIDGETS
+#ifndef TQT_NO_SQL_EDIT_WIDGETS
 
 #include "ntqsqlfield.h"
 #include "ntqcleanuphandler.h"
@@ -189,7 +189,7 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * parent,
 	case TQVariant::DateTime:
 	    w = new TQDateTimeEdit( parent, "qt_editor_datetime" );
 	    break;
-#ifndef QT_NO_LABEL
+#ifndef TQT_NO_LABEL
 	case TQVariant::Pixmap:
 	    w = new TQLabel( parent, "qt_editor_pixmap" );
 	    break;
@@ -218,4 +218,4 @@ TQWidget * TQSqlEditorFactory::createEditor( TQWidget * parent,
     return w;
 }
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/sql/qsqlerror.cpp b/src/sql/qsqlerror.cpp
index c837aecfc..5ae1be7bc 100644
--- a/src/sql/qsqlerror.cpp
+++ b/src/sql/qsqlerror.cpp
@@ -41,7 +41,7 @@
 #include "ntqsqlerror.h"
 #include 
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 /*!
     \class TQSqlError ntqsqlerror.h
@@ -220,9 +220,9 @@ TQString TQSqlError::text() const
 */
 void TQSqlError::showMessage( const TQString& msg ) const
 {
-#ifndef QT_NO_MESSAGEBOX
+#ifndef TQT_NO_MESSAGEBOX
     TQMessageBox::warning( NULL, "SQL Error", msg + text(), 
 			  TQMessageBox::Ok, TQMessageBox::NoButton ); 
-#endif // QT_NO_MESSAGEBOX
+#endif // TQT_NO_MESSAGEBOX
 }
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/sql/qsqlextension_p.cpp b/src/sql/qsqlextension_p.cpp
index 71508753f..0a032055c 100644
--- a/src/sql/qsqlextension_p.cpp
+++ b/src/sql/qsqlextension_p.cpp
@@ -40,7 +40,7 @@
 
 #include "qsqlextension_p.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQSqlExtension::TQSqlExtension()
     : bindm( BindByPosition ), bindCount( 0 )
 {
diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h
index e87d5e547..5ca2232d5 100644
--- a/src/sql/qsqlextension_p.h
+++ b/src/sql/qsqlextension_p.h
@@ -61,7 +61,7 @@
 #include "ntqsql.h"
 #endif // QT_H
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define TQM_EXPORT_SQL
diff --git a/src/sql/qsqlfield.cpp b/src/sql/qsqlfield.cpp
index 0dec46790..17d2f7608 100644
--- a/src/sql/qsqlfield.cpp
+++ b/src/sql/qsqlfield.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqlfield.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 
 /*!
diff --git a/src/sql/qsqlform.cpp b/src/sql/qsqlform.cpp
index a03a53d63..7ebb79f28 100644
--- a/src/sql/qsqlform.cpp
+++ b/src/sql/qsqlform.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqlform.h"
 
-#ifndef QT_NO_SQL_FORM
+#ifndef TQT_NO_SQL_FORM
 
 #include "ntqsqlfield.h"
 #include "ntqsqlpropertymap.h"
@@ -400,4 +400,4 @@ void TQSqlForm::clearMap()
     d->map.clear();
 }
 
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/sql/qsqlindex.cpp b/src/sql/qsqlindex.cpp
index 6f69ae27d..c916f82f6 100644
--- a/src/sql/qsqlindex.cpp
+++ b/src/sql/qsqlindex.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqlindex.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #include "ntqsqlcursor.h"
 
diff --git a/src/sql/qsqlmanager_p.cpp b/src/sql/qsqlmanager_p.cpp
index 563406772..3cf91b802 100644
--- a/src/sql/qsqlmanager_p.cpp
+++ b/src/sql/qsqlmanager_p.cpp
@@ -40,7 +40,7 @@
 
 #include "qsqlmanager_p.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #include "ntqapplication.h"
 #include "ntqwidget.h"
@@ -444,7 +444,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint )
 #ifdef QT_DEBUG_DATAMANAGER
 	tqDebug(" Using brute search...");
 #endif
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	TQApplication::setOverrideCursor( TQt::waitCursor );
 #endif
 	/* give up, use brute force */
@@ -460,7 +460,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint )
 	    if ( !cur->next() )
 		break;
 	}
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	TQApplication::restoreOverrideCursor();
 #endif
     }
@@ -470,7 +470,7 @@ bool TQSqlCursorManager::findBuffer( const TQSqlIndex& idx, int atHint )
     return indexEquals;
 }
 
-#ifndef QT_NO_SQL_FORM
+#ifndef TQT_NO_SQL_FORM
 
 class TQSqlFormManagerPrivate
 {
@@ -614,7 +614,7 @@ void TQSqlFormManager::writeFields()
     }
 }
 
-#endif // QT_NO_SQL_FORM
+#endif // TQT_NO_SQL_FORM
 
 class TQDataManagerPrivate
 {
@@ -677,14 +677,14 @@ TQDataManager::~TQDataManager()
 */
 void TQDataManager::handleError( TQWidget* parent, const TQSqlError& e )
 {
-#ifndef QT_NO_MESSAGEBOX
+#ifndef TQT_NO_MESSAGEBOX
     if (e.driverText().isEmpty() && e.databaseText().isEmpty()) {
 	TQMessageBox::warning ( parent, "Warning", "An error occurred while accessing the database");
     } else {
 	TQMessageBox::warning ( parent, "Warning", e.driverText() + "\n" + e.databaseText(),
 			   0, 0 );
     }
-#endif // QT_NO_MESSAGEBOX
+#endif // TQT_NO_MESSAGEBOX
 }
 
 
@@ -867,7 +867,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m )
 {
     int ans = 2;
     if ( m == TQSql::Delete ) {
-#ifndef QT_NO_MESSAGEBOX
+#ifndef TQT_NO_MESSAGEBOX
 	ans = TQMessageBox::information( parent,
 					tqApp->translate( "TQSql", "Delete" ),
 					tqApp->translate( "TQSql", "Delete this record?" ),
@@ -876,7 +876,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m )
 					TQString::null, 0, 1 );
 #else
 	ans = TQSql::No;
-#endif // QT_NO_MESSAGEBOX
+#endif // TQT_NO_MESSAGEBOX
     } else if ( m != TQSql::None ) {
 	TQString caption;
 	if ( m == TQSql::Insert ) {
@@ -884,7 +884,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m )
 	} else { // TQSql::Update
 	    caption = tqApp->translate( "TQSql", "Update" );
 	}
-#ifndef QT_NO_MESSAGEBOX
+#ifndef TQT_NO_MESSAGEBOX
 	ans = TQMessageBox::information( parent, caption,
 					tqApp->translate( "TQSql", "Save edits?" ),
 					tqApp->translate( "TQSql", "Yes" ),
@@ -893,7 +893,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m )
 					0, 2 );
 #else
 	ans = TQSql::No;
-#endif // QT_NO_MESSAGEBOX
+#endif // TQT_NO_MESSAGEBOX
     }
 
     switch ( ans ) {
@@ -919,7 +919,7 @@ TQSql::Confirm TQDataManager::confirmEdit( TQWidget* parent, TQSql::Op m )
 
 TQSql::Confirm TQDataManager::confirmCancel( TQWidget* parent, TQSql::Op )
 {
-#ifndef QT_NO_MESSAGEBOX
+#ifndef TQT_NO_MESSAGEBOX
     switch ( TQMessageBox::information( parent,
 				       tqApp->translate( "TQSql", "Confirm" ),
 				       tqApp->translate( "TQSql", "Cancel your edits?" ),
@@ -935,7 +935,7 @@ TQSql::Confirm TQDataManager::confirmCancel( TQWidget* parent, TQSql::Op )
     }
 #else
     return TQSql::Yes;
-#endif // QT_NO_MESSAGEBOX
+#endif // TQT_NO_MESSAGEBOX
 }
 
 #endif
diff --git a/src/sql/qsqlmanager_p.h b/src/sql/qsqlmanager_p.h
index 0fb203320..d9ef527e5 100644
--- a/src/sql/qsqlmanager_p.h
+++ b/src/sql/qsqlmanager_p.h
@@ -69,7 +69,7 @@
 #define TQM_EXPORT_SQL Q_EXPORT
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlCursor;
 class TQSqlForm;
@@ -99,7 +99,7 @@ private:
     TQSqlCursorManagerPrivate* d;
 };
 
-#ifndef QT_NO_SQL_FORM
+#ifndef TQT_NO_SQL_FORM
 
 class TQSqlFormManagerPrivate;
 
diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp
index a83f01862..c50368190 100644
--- a/src/sql/qsqlpropertymap.cpp
+++ b/src/sql/qsqlpropertymap.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqlpropertymap.h"
 
-#ifndef QT_NO_SQL_FORM
+#ifndef TQT_NO_SQL_FORM
 
 #include "ntqwidget.h"
 #include "ntqcleanuphandler.h"
@@ -301,4 +301,4 @@ void TQSqlPropertyMap::installDefaultMap( TQSqlPropertyMap * map )
     qsql_cleanup_property_map.add( &defaultmap );
 }
 
-#endif // QT_NO_SQL_FORM
+#endif // TQT_NO_SQL_FORM
diff --git a/src/sql/qsqlquery.cpp b/src/sql/qsqlquery.cpp
index ac4631b1a..829e46947 100644
--- a/src/sql/qsqlquery.cpp
+++ b/src/sql/qsqlquery.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqlquery.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 //#define QT_DEBUG_SQL
 
@@ -1212,4 +1212,4 @@ TQString TQSqlQuery::executedQuery() const
 {
     return d->executedQuery;
 }
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/sql/qsqlrecord.cpp b/src/sql/qsqlrecord.cpp
index b1e0aa8e3..d106f98c8 100644
--- a/src/sql/qsqlrecord.cpp
+++ b/src/sql/qsqlrecord.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsqlrecord.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #include "ntqregexp.h"
 #include "ntqvaluevector.h"
diff --git a/src/sql/qsqlresult.cpp b/src/sql/qsqlresult.cpp
index 5afd6a08d..d005803cf 100644
--- a/src/sql/qsqlresult.cpp
+++ b/src/sql/qsqlresult.cpp
@@ -41,7 +41,7 @@
 #include "ntqsqlresult.h"
 #include "private/qsqlextension_p.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlResultPrivate
 {
@@ -365,4 +365,4 @@ TQSqlExtension * TQSqlResult::extension()
 {
     return d->ext;
 }
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/sql/qsqlselectcursor.cpp b/src/sql/qsqlselectcursor.cpp
index 6919ae994..23f65c91d 100644
--- a/src/sql/qsqlselectcursor.cpp
+++ b/src/sql/qsqlselectcursor.cpp
@@ -41,7 +41,7 @@
 #include "ntqsqlselectcursor.h"
 #include "ntqsqldriver.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 class TQSqlSelectCursorPrivate
 {
@@ -246,4 +246,4 @@ void TQSqlSelectCursor::populateCursor()
 /*! \fn TQString TQSqlSelectCursor::toString( const TQString&, const TQString& ) const
     \reimp
 */
-#endif // QT_NO_SQL
+#endif // TQT_NO_SQL
diff --git a/src/styles/ntqcdestyle.h b/src/styles/ntqcdestyle.h
index 5f169118c..90857223d 100644
--- a/src/styles/ntqcdestyle.h
+++ b/src/styles/ntqcdestyle.h
@@ -46,7 +46,7 @@
 #include "ntqmotifstyle.h"
 #endif // QT_H
 
-#if !defined(QT_NO_STYLE_CDE) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN)
 
 #if defined(QT_PLUGIN)
 #define Q_EXPORT_STYLE_CDE
@@ -85,6 +85,6 @@ public:
 
 };
 
-#endif // QT_NO_STYLE_CDE
+#endif // TQT_NO_STYLE_CDE
 
 #endif // TQCDESTYLE_H
diff --git a/src/styles/ntqcommonstyle.h b/src/styles/ntqcommonstyle.h
index cb04fa717..d77f72801 100644
--- a/src/styles/ntqcommonstyle.h
+++ b/src/styles/ntqcommonstyle.h
@@ -45,7 +45,7 @@
 #include "ntqstyle.h"
 #endif // QT_H
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 
 class Q_EXPORT TQCommonStyle: public TQStyle
 {
@@ -159,6 +159,6 @@ private:
 #endif
 };
 
-#endif // QT_NO_STYLE
+#endif // TQT_NO_STYLE
 
 #endif // TQCOMMONSTYLE_H
diff --git a/src/styles/ntqcompactstyle.h b/src/styles/ntqcompactstyle.h
index 13a442021..a7d28c84e 100644
--- a/src/styles/ntqcompactstyle.h
+++ b/src/styles/ntqcompactstyle.h
@@ -45,7 +45,7 @@
 #include "ntqwindowsstyle.h"
 #endif // QT_H
 
-#if !defined(QT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
 
 #if defined(QT_PLUGIN)
 #define Q_EXPORT_STYLE_COMPACT
@@ -81,6 +81,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_STYLE_WINDOWS
+#endif // TQT_NO_STYLE_WINDOWS
 
 #endif // TQCOMPACTSTYLE_H
diff --git a/src/styles/ntqinterlacestyle.h b/src/styles/ntqinterlacestyle.h
index 7c00675d9..a3487b651 100644
--- a/src/styles/ntqinterlacestyle.h
+++ b/src/styles/ntqinterlacestyle.h
@@ -46,7 +46,7 @@
 #include "ntqmotifstyle.h"
 #endif // QT_H
 
-#if !defined(QT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
 
 #include "ntqpalette.h"
 
@@ -101,7 +101,7 @@ private:
     TQPalette oldPalette;
 };
 
-#endif // QT_NO_STYLE_INTERLACE
+#endif // TQT_NO_STYLE_INTERLACE
 
 #endif
 #endif
diff --git a/src/styles/ntqmotifplusstyle.h b/src/styles/ntqmotifplusstyle.h
index 16dbf1762..e7c546192 100644
--- a/src/styles/ntqmotifplusstyle.h
+++ b/src/styles/ntqmotifplusstyle.h
@@ -46,7 +46,7 @@
 #include "ntqmotifstyle.h"
 #endif // QT_H
 
-#if !defined(QT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
 
 #if defined(QT_PLUGIN)
 #define Q_EXPORT_STYLE_MOTIFPLUS
@@ -126,6 +126,6 @@ private:
 };
 
 
-#endif // QT_NO_STYLE_MOTIFPLUS
+#endif // TQT_NO_STYLE_MOTIFPLUS
 
 #endif // TQMOTIFPLUSSTYLE_H
diff --git a/src/styles/ntqmotifstyle.h b/src/styles/ntqmotifstyle.h
index 664208de6..75abd98fc 100644
--- a/src/styles/ntqmotifstyle.h
+++ b/src/styles/ntqmotifstyle.h
@@ -45,7 +45,7 @@
 #include "ntqcommonstyle.h"
 #endif // QT_H
 
-#if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
 
 class TQPalette;
 
@@ -141,6 +141,6 @@ private:
 #endif
 };
 
-#endif // QT_NO_STYLE_MOTIF
+#endif // TQT_NO_STYLE_MOTIF
 
 #endif // TQMOTIFSTYLE_H
diff --git a/src/styles/ntqplatinumstyle.h b/src/styles/ntqplatinumstyle.h
index 968fbb1d4..69b119bd9 100644
--- a/src/styles/ntqplatinumstyle.h
+++ b/src/styles/ntqplatinumstyle.h
@@ -45,7 +45,7 @@
 #include "ntqwindowsstyle.h"
 #endif // QT_H
 
-#if !defined(QT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
 
 class TQPalette;
 
@@ -120,6 +120,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_STYLE_PLATINUM
+#endif // TQT_NO_STYLE_PLATINUM
 
 #endif // TQPLATINUMSTYLE_H
diff --git a/src/styles/ntqsgistyle.h b/src/styles/ntqsgistyle.h
index dfeda72a7..a7cbe2f4e 100644
--- a/src/styles/ntqsgistyle.h
+++ b/src/styles/ntqsgistyle.h
@@ -47,7 +47,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#if !defined(QT_NO_STYLE_SGI) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN)
 
 #if defined(QT_PLUGIN)
 #define Q_EXPORT_STYLE_SGI
@@ -139,6 +139,6 @@ private:
 
 };
 
-#endif // QT_NO_STYLE_SGI
+#endif // TQT_NO_STYLE_SGI
 
 #endif // TQSGISTYLE_H
diff --git a/src/styles/ntqstylefactory.h b/src/styles/ntqstylefactory.h
index d011fe999..b2c1ba9d8 100644
--- a/src/styles/ntqstylefactory.h
+++ b/src/styles/ntqstylefactory.h
@@ -43,7 +43,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 
 class TQString;
 class TQStyle;
@@ -51,12 +51,12 @@ class TQStyle;
 class Q_EXPORT TQStyleFactory
 {
 public:
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
     static TQStringList keys();
 #endif
     static TQStyle *create( const TQString& );
 };
 
-#endif //QT_NO_STYLE
+#endif //TQT_NO_STYLE
 
 #endif //TQSTYLEFACTORY_H
diff --git a/src/styles/ntqstyleplugin.h b/src/styles/ntqstyleplugin.h
index bf48d080b..0142d36fe 100644
--- a/src/styles/ntqstyleplugin.h
+++ b/src/styles/ntqstyleplugin.h
@@ -46,8 +46,8 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_STYLE
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_STYLE
+#ifndef TQT_NO_COMPONENT
 
 class TQStyle;
 class TQStylePluginPrivate;
@@ -66,7 +66,7 @@ private:
     TQStylePluginPrivate *d;
 };
 
-#endif // QT_NO_COMPONENT
-#endif // QT_NO_STYLE
+#endif // TQT_NO_COMPONENT
+#endif // TQT_NO_STYLE
 
 #endif // TQSTYLEPLUGIN_H
diff --git a/src/styles/ntqwindowsstyle.h b/src/styles/ntqwindowsstyle.h
index eaee7ca98..c10afef85 100644
--- a/src/styles/ntqwindowsstyle.h
+++ b/src/styles/ntqwindowsstyle.h
@@ -45,7 +45,7 @@
 #include "ntqcommonstyle.h"
 #endif // QT_H
 
-#if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
 
 #if defined(QT_PLUGIN)
 #define Q_EXPORT_STYLE_WINDOWS
@@ -143,6 +143,6 @@ private:
 #endif
 };
 
-#endif // QT_NO_STYLE_WINDOWS
+#endif // TQT_NO_STYLE_WINDOWS
 
 #endif // TQWINDOWSSTYLE_H
diff --git a/src/styles/qcdestyle.cpp b/src/styles/qcdestyle.cpp
index 931aa2d47..2f49aa752 100644
--- a/src/styles/qcdestyle.cpp
+++ b/src/styles/qcdestyle.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqcdestyle.h"
 
-#if !defined(QT_NO_STYLE_CDE) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_CDE) || defined(QT_PLUGIN)
 
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
@@ -153,7 +153,7 @@ void TQCDEStyle::drawPrimitive( PrimitiveElement pe,
 {
     switch( pe ) {
     case PE_Indicator: {
-#ifndef QT_NO_BUTTON
+#ifndef TQT_NO_BUTTON
 	bool down = flags & Style_Down;
 	bool on = flags & Style_On;
 	bool showUp = !( down ^ on );
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 43e659b39..a9bfbcf28 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqcommonstyle.h"
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 
 #include "ntqmutex.h"
 #include "ntqmenubar.h"
@@ -837,7 +837,7 @@ void TQCommonStyle::drawPrimitive( PrimitiveElement pe,
     activePainter = p;
 
     switch (pe) {
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
     case PE_CheckListController: {
 	p->drawPixmap(r, TQPixmap((const char **)check_list_controller_xpm));
 	break; }
@@ -1251,7 +1251,7 @@ void TQCommonStyle::drawPrimitive( PrimitiveElement pe,
 	drawPrimitive( PE_GroupBoxFrame, p, ceData, elementFlags, r, cg, flags, opt );
 	break;
     case PE_GroupBoxFrame: {
-#ifndef QT_NO_FRAME
+#ifndef TQT_NO_FRAME
 	if ( opt.isDefault() )
 	    break;
 	int lwidth = opt.lineWidth(), mlwidth = opt.midLineWidth();
@@ -1326,7 +1326,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 	break; }
     case CE_PushButton:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    TQRect br = r;
 	    int dbi = pixelMetric(PM_ButtonDefaultIndicator, ceData, elementFlags, widget);
 
@@ -1352,7 +1352,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 
     case CE_PushButtonLabel:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    TQRect ir = r;
 
 	    if ((elementFlags & CEF_IsDown) || (elementFlags & CEF_IsOn)) {
@@ -1372,7 +1372,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 	    if ((!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget)) || ((styleHint(SH_HideUnderlineAcceleratorWhenAltUp, ceData, elementFlags, TQStyleOption::Default, 0, widget)) && (!acceleratorsShown())))
 		tf |= NoAccel;
 
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 	    if ( !ceData.iconSet.isNull() ) {
 		TQIconSet::Mode mode =
 		    (elementFlags & CEF_IsEnabled) ? TQIconSet::Normal : TQIconSet::Disabled;
@@ -1401,7 +1401,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 		else if (!ceData.fgPixmap.isNull())
 		    tf |= AlignHCenter;
 	    } else
-#endif //QT_NO_ICONSET
+#endif //TQT_NO_ICONSET
 		tf |= AlignHCenter;
 	    drawItem(p, ir, tf, cg,
 		     flags & Style_Enabled, (ceData.fgPixmap.isNull())?NULL:&ceData.fgPixmap, ceData.text,
@@ -1420,7 +1420,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 
     case CE_CheckBoxLabel:
 	{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	    int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 	    if ((!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget)) || ((styleHint(SH_HideUnderlineAcceleratorWhenAltUp, ceData, elementFlags, TQStyleOption::Default, 0, widget)) && (!acceleratorsShown())))
 		alignment |= NoAccel;
@@ -1442,7 +1442,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 
     case CE_RadioButtonLabel:
 	{
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
 	    int alignment = TQApplication::reverseLayout() ? AlignRight : AlignLeft;
 	    if ((!styleHint(SH_UnderlineAccelerator, ceData, elementFlags, TQStyleOption::Default, 0, widget)) || ((styleHint(SH_HideUnderlineAcceleratorWhenAltUp, ceData, elementFlags, TQStyleOption::Default, 0, widget)) && (!acceleratorsShown())))
 		alignment |= NoAccel;
@@ -1457,7 +1457,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 	    break;
 	}
 
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
     case CE_TabBarTab:
 	{
 	    if ( ceData.tabBarData.shape == TQTabBar::TriangularAbove ||
@@ -1520,8 +1520,8 @@ void TQCommonStyle::drawControl( ControlElement element,
 		drawPrimitive( PE_FocusRect, p, ceData, elementFlags, r, cg );
 	    break;
 	}
-#endif // QT_NO_TABBAR
-#ifndef QT_NO_TOOLBOX
+#endif // TQT_NO_TABBAR
+#ifndef TQT_NO_TOOLBOX
     case CE_ToolBoxTab:
 	{
 	    int d = 20 + r.height() - 3;
@@ -1548,12 +1548,12 @@ void TQCommonStyle::drawControl( ControlElement element,
 	    p->setBrush( NoBrush );
 	    break;
 	}
-#endif // QT_NO_TOOLBOX
+#endif // TQT_NO_TOOLBOX
     case CE_ProgressBarGroove:
 	qDrawShadePanel(p, r, cg, TRUE, 1, &cg.brush(TQColorGroup::Background));
 	break;
 
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
     case CE_ProgressBarContents:
 	{
 	    // Correct the highlight color if same as background,
@@ -1634,11 +1634,11 @@ void TQCommonStyle::drawControl( ControlElement element,
 		     ceData.progressText, -1, pcolor );
 	}
 	break;
-#endif // QT_NO_PROGRESSBAR
+#endif // TQT_NO_PROGRESSBAR
 
     case CE_MenuBarItem:
 	{
-#ifndef QT_NO_MENUDATA
+#ifndef TQT_NO_MENUDATA
 	    if (opt.isDefault())
 		break;
 
@@ -1653,7 +1653,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 	    break;
 	}
 
-#ifndef QT_NO_TOOLBUTTON
+#ifndef TQT_NO_TOOLBUTTON
     case CE_ToolButtonLabel:
 	{
 	    TQRect rect = r;
@@ -1745,8 +1745,8 @@ void TQCommonStyle::drawControl( ControlElement element,
 
 	    break;
 	}
-#endif // QT_NO_TOOLBUTTON
-#ifndef QT_NO_HEADER
+#endif // TQT_NO_TOOLBUTTON
+#ifndef TQT_NO_HEADER
         case CE_HeaderLabel:
 	{
 	    TQRect rect = r;
@@ -1774,7 +1774,7 @@ void TQCommonStyle::drawControl( ControlElement element,
                 drawItem ( p, rect, AlignVCenter, cg, flags & Style_Enabled,
                            0, ceData.textLabel, -1, &(cg.buttonText()) );
 	}
-#endif // QT_NO_HEADER
+#endif // TQT_NO_HEADER
     default:
 	break;
     }
@@ -1826,7 +1826,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
     TQRect rect, wrect(ceData.rect);
 
     switch (r) {
-#ifndef QT_NO_DIALOGBUTTONS
+#ifndef TQT_NO_DIALOGBUTTONS
     case SR_DialogButtonAbort:
     case SR_DialogButtonRetry:
     case SR_DialogButtonIgnore:
@@ -1892,10 +1892,10 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
 		return TQRect(fw, start, wrect.width() - (fw*2), wrect.height() - start - (fw*2));
 	}
 	return TQRect(); }
-#endif //QT_NO_DIALOGBUTTONS
+#endif //TQT_NO_DIALOGBUTTONS
     case SR_PushButtonContents:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    int dx1, dx2;
 
 	    dx1 = pixelMetric(PM_DefaultFrameWidth, ceData, elementFlags, widget);
@@ -1913,7 +1913,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
 
     case SR_PushButtonFocusRect:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    int dbw1 = 0, dbw2 = 0;
 	    if ((elementFlags & CEF_IsDefault) || (elementFlags & CEF_AutoDefault)) {
 		dbw1 = pixelMetric(PM_ButtonDefaultIndicator, ceData, elementFlags, widget);
@@ -1941,7 +1941,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
 
     case SR_CheckBoxContents:
 	{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	    TQRect ir = subRect(SR_CheckBoxIndicator, ceData, elementFlags, widget);
 	    rect.setRect(ir.right() + 6, wrect.y(),
 			 wrect.width() - ir.width() - 6, wrect.height());
@@ -1951,7 +1951,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
 
     case SR_CheckBoxFocusRect:
 	{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	    if ( ceData.fgPixmap.isNull() && ceData.text.isEmpty() ) {
 		rect = subRect( SR_CheckBoxIndicator, ceData, elementFlags, widget );
 		rect.addCoords( 1, 1, -1, -1 );
@@ -1995,7 +1995,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
 
     case SR_RadioButtonFocusRect:
 	{
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
 	    if ( ceData.fgPixmap.isNull() && ceData.text.isEmpty() ) {
 		rect = subRect( SR_RadioButtonIndicator, ceData, elementFlags, widget );
 		rect.addCoords( 1, 1, -1, -1 );
@@ -2024,7 +2024,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
 	rect.setRect(3, 3, ceData.rect.width()-6-16, ceData.rect.height()-6);
 	break;
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case SR_SliderFocusRect:
 	{
 	    int tickOffset = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget );
@@ -2037,9 +2037,9 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
 	    rect = rect.intersect( ceData.rect ); // ## is this really necessary?
 	    break;
 	}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
 
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
     case SR_DockWindowHandleRect:
 	{
 	    if (!(elementFlags & CEF_HasParentWidget))
@@ -2055,12 +2055,12 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
 	    }
 	    break;
 	}
-#endif // QT_NO_MAINWINDOW
+#endif // TQT_NO_MAINWINDOW
 
     case SR_ProgressBarGroove:
     case SR_ProgressBarContents:
 	{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
 	    TQFontMetrics fm( ( (!(elementFlags & CEF_UseGenericParameters)) ? TQFontMetrics(ceData.font) :
 			       TQApplication::fontMetrics() ) );
 	    int textw = 0;
@@ -2079,7 +2079,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
 
     case SR_ProgressBarLabel:
 	{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
 	    TQFontMetrics fm( ( (!(elementFlags & CEF_UseGenericParameters)) ? TQFontMetrics(ceData.font) :
 			       TQApplication::fontMetrics() ) );
 	    int textw = 0;
@@ -2113,7 +2113,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData
     return rect;
 }
 
-#ifndef QT_NO_RANGECONTROL
+#ifndef TQT_NO_RANGECONTROL
 /*
   I really need this and I don't want to expose it in TQRangeControl..
 */
@@ -2145,7 +2145,7 @@ static int qPositionFromValue( const TQStyleControlElementData &ceData, int logi
     // no overflow because of this implicit assumption:
     // span <= 4096
 }
-#endif // QT_NO_RANGECONTROL
+#endif // TQT_NO_RANGECONTROL
 
 /*! \reimp */
 void TQCommonStyle::drawComplexControl( ComplexControl control,
@@ -2163,7 +2163,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
     activePainter = p;
 
     switch (control) {
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
     case CC_ScrollBar:
 	{
 	    TQRect addline, subline, addpage, subpage, slider, first, last;
@@ -2237,9 +2237,9 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
 
 	    break;
 	}
-#endif // QT_NO_SCROLLBAR
+#endif // TQT_NO_SCROLLBAR
 
-#ifndef QT_NO_TOOLBUTTON
+#ifndef TQT_NO_TOOLBUTTON
     case CC_ToolButton:
 	{
 	    TQColorGroup c = cg;
@@ -2284,9 +2284,9 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
 
 	    break;
 	}
-#endif // QT_NO_TOOLBUTTON
+#endif // TQT_NO_TOOLBUTTON
 
-#ifndef QT_NO_TITLEBAR
+#ifndef TQT_NO_TITLEBAR
     case CC_TitleBar:
 	{
 	    if ( controls & SC_TitleBarLabel ) {
@@ -2332,7 +2332,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
 		ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarCloseButton, TQStyleOption::Default, widget ), ceData, elementFlags );
 		down = active & SC_TitleBarCloseButton;
 		if ( widget->testWFlags( WStyle_Tool )
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 		     || ::tqt_cast(widget)
 #endif
 		    )
@@ -2418,7 +2418,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
 		    p->restore();
 		}
 	    }
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	    if ( controls & SC_TitleBarSysMenu ) {
 		if ( !ceData.icon.isNull() ) {
 		    ir = visualRect( querySubControlMetrics( CC_TitleBar, ceData, elementFlags, SC_TitleBarSysMenu, TQStyleOption::Default, widget ), ceData, elementFlags );
@@ -2428,10 +2428,10 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
 #endif
 	    break;
 	}
-#endif //QT_NO_TITLEBAR
+#endif //TQT_NO_TITLEBAR
 
     case CC_SpinWidget: {
-#ifndef QT_NO_SPINWIDGET
+#ifndef TQT_NO_SPINWIDGET
 	SFlags flags;
 	PrimitiveElement pe;
 
@@ -2476,7 +2476,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
 #endif
 	break; }
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case CC_Slider:
 	switch ( controls ) {
 	case SC_SliderTickmarks: {
@@ -2534,14 +2534,14 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
 	    break; }
 	}
 	break;
-#endif // QT_NO_SLIDER
-#ifndef QT_NO_LISTVIEW
+#endif // TQT_NO_SLIDER
+#ifndef TQT_NO_LISTVIEW
     case CC_ListView:
 	if ( controls & SC_ListView ) {
 	    p->fillRect( r, ceData.viewportData.bgBrush );
 	}
 	break;
-#endif //QT_NO_LISTVIEW
+#endif //TQT_NO_LISTVIEW
     default:
 	break;
     }
@@ -2624,7 +2624,7 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
 	}
 	break; }
 
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
     case CC_ScrollBar: {
 	int sliderstart = 0;
 	int sbextent = pixelMetric(PM_ScrollBarExtent, ceData, elementFlags, widget);
@@ -2694,9 +2694,9 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
 	}
 
 	break; }
-#endif // QT_NO_SCROLLBAR
+#endif // TQT_NO_SCROLLBAR
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case CC_Slider: {
 	    int tickOffset = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget );
 	    int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
@@ -2720,9 +2720,9 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
 		break;
 	    }
 	    break; }
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
 
-#if !defined(QT_NO_TOOLBUTTON) && !defined(QT_NO_POPUPMENU)
+#if !defined(TQT_NO_TOOLBUTTON) && !defined(TQT_NO_POPUPMENU)
     case CC_ToolButton: {
 	    int mbi = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags, widget);
 
@@ -2742,9 +2742,9 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
 	    }
 	    break;
 	}
-#endif // QT_NO_TOOLBUTTON && QT_NO_POPUPMENU
+#endif // TQT_NO_TOOLBUTTON && TQT_NO_POPUPMENU
 
-#ifndef QT_NO_TITLEBAR
+#ifndef TQT_NO_TITLEBAR
     case CC_TitleBar: {
 	    const int controlTop = 2;
 	    const int controlHeight = ceData.rect.height() - controlTop * 2;
@@ -2793,7 +2793,7 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
 	    default: break;
 	    }
 	    break; }
-#endif //QT_NO_TITLEBAR
+#endif //TQT_NO_TITLEBAR
 
     default:
 	break;
@@ -2812,7 +2812,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
     SubControl ret = SC_None;
 
     switch (control) {
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
     case CC_ListView:
 	{
 	    if(pos.x() >= 0 && pos.x() <
@@ -2821,7 +2821,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
 	    break;
 	}
 #endif
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
     case CC_ScrollBar:
 	{
 	    TQRect r;
@@ -2842,7 +2842,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
 #endif
     case CC_TitleBar:
 	{
-#ifndef QT_NO_TITLEBAR
+#ifndef TQT_NO_TITLEBAR
 	    TQRect r;
 	    uint ctrl = SC_TitleBarLabel;
 
@@ -2900,7 +2900,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
         if ( !(elementFlags & CEF_UseGenericParameters) ) {
 	    if ( ceData.wflags & WStyle_Tool ) {
 		ret = TQMAX( TQFontMetrics(ceData.font).lineSpacing(), 16 );
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 	    } else if ( ceData.widgetObjectTypes.containsYesNo(TQDockWindow_static_string) ) {
 		ret = TQMAX( TQFontMetrics(ceData.font).lineSpacing(), 13 );
 #endif
@@ -2949,7 +2949,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
 	ret = 196;
 	break;
 
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
     case PM_ScrollBarExtent:
 	if ( elementFlags & CEF_UseGenericParameters ) {
 	    ret = 16;
@@ -2965,7 +2965,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
 	ret = -1;
 	break;
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case PM_SliderThickness:
 	ret = 16;
 	break;
@@ -3002,7 +3002,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
 		ret = ceData.rect.height() - pixelMetric( PM_SliderLength, ceData, elementFlags, widget );
 	    break;
 	}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
 
     case PM_DockWindowSeparatorExtent:
 	ret = 6;
@@ -3046,7 +3046,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &c
 	ret = 2;
 	break;
 
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
     case PM_TabBarTabVSpace:
 	{
 	    if ( ceData.widgetObjectTypes.containsYesNo(TQTabBar_static_string) && ( ceData.tabBarData.shape == TQTabBar::RoundedAbove ||
@@ -3117,7 +3117,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
     TQSize sz(contentsSize);
 
     switch (contents) {
-#ifndef QT_NO_DIALOGBUTTONS
+#ifndef TQT_NO_DIALOGBUTTONS
     case CT_DialogButtons: {
 	int w = contentsSize.width(), h = contentsSize.height();
 	const int bwidth = pixelMetric(PM_DialogButtonsButtonWidth, ceData, elementFlags, widget),
@@ -3154,10 +3154,10 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
 	const int fw = pixelMetric(PM_DefaultFrameWidth, ceData, elementFlags, widget) * 2;
 	sz = TQSize(w + fw, h + fw);
 	break; }
-#endif //QT_NO_DIALOGBUTTONS
+#endif //TQT_NO_DIALOGBUTTONS
     case CT_PushButton:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    int w = contentsSize.width(),
 		h = contentsSize.height(),
 	       bm = pixelMetric(PM_ButtonMargin, ceData, elementFlags, widget),
@@ -3179,7 +3179,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
 
     case CT_CheckBox:
 	{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	    TQRect irect = subRect(SR_CheckBoxIndicator, ceData, elementFlags, widget);
 	    int h = pixelMetric( PM_IndicatorHeight, ceData, elementFlags, widget );
 	    int margins = (ceData.fgPixmap.isNull() && ceData.text.isEmpty()) ? 0 : 10;
@@ -3191,7 +3191,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
 
     case CT_RadioButton:
 	{
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
 	    TQRect irect = subRect(SR_RadioButtonIndicator, ceData, elementFlags, widget);
 	    int h = pixelMetric( PM_ExclusiveIndicatorHeight, ceData, elementFlags, widget );
 	    int margins = (ceData.fgPixmap.isNull() && ceData.text.isEmpty()) ? 0 : 10;
@@ -3216,7 +3216,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
 
     case CT_PopupMenuItem:
 	{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 	    if (opt.isDefault())
 		break;
 
@@ -3285,7 +3285,7 @@ int TQCommonStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDa
     int ret;
 
     switch (sh) {
-#ifndef QT_NO_DIALOGBUTTONS
+#ifndef TQT_NO_DIALOGBUTTONS
     case SH_DialogButtons_DefaultButton:
 	ret = TQDialogButtons::Accept;
 	break;
@@ -3373,4 +3373,4 @@ TQPixmap TQCommonStyle::stylePixmap(StylePixmap, const TQStyleControlElementData
     return TQPixmap();
 }
 
-#endif // QT_NO_STYLE
+#endif // TQT_NO_STYLE
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/qcompactstyle.cpp
index 8ec016e9e..e6fd64e14 100644
--- a/src/styles/qcompactstyle.cpp
+++ b/src/styles/qcompactstyle.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqcompactstyle.h"
 
-#if !defined(QT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_COMPACT) || defined(QT_PLUGIN)
 
 #include "ntqfontmetrics.h"
 #include "ntqpalette.h"
diff --git a/src/styles/qinterlacestyle.cpp b/src/styles/qinterlacestyle.cpp
index cf1efe43c..8a2134544 100644
--- a/src/styles/qinterlacestyle.cpp
+++ b/src/styles/qinterlacestyle.cpp
@@ -42,7 +42,7 @@
 
 #include "ntqinterlacestyle.h"
 
-#if !defined(QT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_INTERLACE) || defined(QT_PLUGIN)
 
 #include "ntqapplication.h"
 #include "ntqpainter.h"
@@ -800,6 +800,6 @@ void TQInterlaceStyle::drawPanel( TQPainter *p, int x, int y, int w, int h,
     }
 }
 
-#endif // QT_NO_STYLE_INTERLACE
+#endif // TQT_NO_STYLE_INTERLACE
 
 #endif
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index 90a8f6339..84352808b 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqmotifplusstyle.h"
 
-#if !defined(QT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_MOTIFPLUS) || defined(QT_PLUGIN)
 
 #include "ntqmenubar.h"
 #include "ntqapplication.h"
@@ -178,19 +178,19 @@ void TQMotifPlusStyle::polish(TQPalette &)
 void TQMotifPlusStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
     if (ceData.widgetObjectTypes.contains("TQWidget")) {
-#ifndef QT_NO_FRAME
+#ifndef TQT_NO_FRAME
         if ((ceData.widgetObjectTypes.contains("TQFrame")) && (ceData.frameStyle == TQFrame::Panel)) {
             widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetStyle, TQStyleWidgetActionRequestData(TQFrame::WinPanel));
         }
 #endif
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
         if ((ceData.widgetObjectTypes.contains("TQMenuBar")) && (ceData.frameStyle != TQFrame::NoFrame)) {
             widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetStyle, TQStyleWidgetActionRequestData(TQFrame::StyledPanel | TQFrame::Raised));
         }
 #endif
 
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
         if (ceData.widgetObjectTypes.contains("TQToolBar")) {
             widgetActionRequest(ceData, elementFlags, ptr, WAR_SetLayoutMargin, TQStyleWidgetActionRequestData(2));
         }
@@ -711,7 +711,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
     switch (element) {
     case CE_PushButton:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    TQRect br = r;
 	    int dbi = pixelMetric(PM_ButtonDefaultIndicator, ceData, elementFlags, widget);
 
@@ -739,7 +739,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
 
     case CE_CheckBoxLabel:
 	{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	    if (flags & Style_MouseOver) {
 		TQRegion r(ceData.rect);
 		r -= visualRect(subRect(SR_CheckBoxIndicator, ceData, elementFlags, widget), ceData, elementFlags);
@@ -762,7 +762,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
 
     case CE_RadioButtonLabel:
 	{
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
 	    if (flags & Style_MouseOver) {
 		TQRegion r(ceData.rect);
 		r -= visualRect(subRect(SR_RadioButtonIndicator, ceData, elementFlags, widget), ceData, elementFlags);
@@ -785,7 +785,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
 
     case CE_MenuBarItem:
 	{
-#ifndef QT_NO_MENUDATA
+#ifndef TQT_NO_MENUDATA
 	    if (opt.isDefault())
 		break;
 
@@ -803,7 +803,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
 	}
 
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     case CE_PopupMenuItem:
 	{
 	    if (! widget || opt.isDefault())
@@ -935,11 +935,11 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
 	    }
 	    break;
 	}
-#endif // QT_NO_POPUPMENU
+#endif // TQT_NO_POPUPMENU
 
     case CE_TabBarTab:
 	{
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
 	    bool selected = flags & Style_Selected;
 
 	    TQColorGroup g = ceData.colorGroup;
@@ -1054,7 +1054,7 @@ TQRect TQMotifPlusStyle::subRect(SubRect r, const TQStyleControlElementData &ceD
     switch (r) {
     case SR_PushButtonFocusRect:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    int dfi = pixelMetric(PM_ButtonDefaultIndicator, ceData, elementFlags, widget);
 
 	    rect = ceData.rect;
@@ -1089,7 +1089,7 @@ TQRect TQMotifPlusStyle::subRect(SubRect r, const TQStyleControlElementData &ceD
 
     case SR_ComboBoxFocusRect:
 	{
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 	    if (elementFlags & CEF_IsEditable) {
 		rect = querySubControlMetrics(CC_ComboBox, ceData, elementFlags,
 					      SC_ComboBoxEditField, TQStyleOption::Default, widget);
@@ -1102,7 +1102,7 @@ TQRect TQMotifPlusStyle::subRect(SubRect r, const TQStyleControlElementData &ceD
 
     case SR_SliderFocusRect:
 	{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 	    int tickOffset = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget );
 	    int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
 	    int x, y, wi, he;
@@ -1149,7 +1149,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
     switch (control) {
     case CC_ScrollBar:
 	{
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
 	    TQRect addline, subline, addpage, subpage, slider, first, last;
 	    bool maxedOut = (ceData.minSteps == ceData.maxSteps);
 
@@ -1268,7 +1268,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
 
     case CC_ComboBox:
 	{
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 	    TQRect editfield, arrow;
 	    editfield =
 		visualRect(querySubControlMetrics(CC_ComboBox,
@@ -1327,7 +1327,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
 
     case CC_SpinWidget:
 	{
-#ifndef QT_NO_SPINWIDGET
+#ifndef TQT_NO_SPINWIDGET
 	    SFlags flags = Style_Default;
 
 	    if (controls & SC_SpinWidgetFrame)
@@ -1370,7 +1370,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
 
     case CC_Slider:
 	{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 	    bool mouseover = (flags & Style_MouseOver);
 
 	    TQRect groove = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderGroove,
@@ -1464,7 +1464,7 @@ TQRect TQMotifPlusStyle::querySubControlMetrics(ComplexControl control,
 	    }
 	    break; }
 
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
     case CC_ComboBox: {
 	if (elementFlags & CEF_IsEditable) {
 	    int space = (ceData.rect.height() - 13) / 2;
@@ -1499,7 +1499,7 @@ TQRect TQMotifPlusStyle::querySubControlMetrics(ComplexControl control,
 	break; }
 #endif
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case CC_Slider: {
 
 	if (subcontrol == SC_SliderHandle) {
@@ -1626,4 +1626,4 @@ int TQMotifPlusStyle::styleHint(StyleHint hint,
 }
 
 
-#endif // QT_NO_STYLE_MOTIFPLUS
+#endif // TQT_NO_STYLE_MOTIFPLUS
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index 2902faa4b..a95018f59 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqmotifstyle.h"
 
-#if !defined(QT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_MOTIF) || defined(QT_PLUGIN)
 
 #include "ntqpopupmenu.h"
 #include "ntqapplication.h"
@@ -215,7 +215,7 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
     bool act = flags & Style_Active;
 
     switch( pe ) {
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
     case PE_CheckListExclusiveIndicator: {
 	TQCheckListItem *item = opt.checkListItem();
 	TQListView *lv = item->listView();
@@ -261,7 +261,7 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
 	break;
 
     case PE_Indicator: {
-#ifndef QT_NO_BUTTON
+#ifndef TQT_NO_BUTTON
 	bool on = flags & Style_On;
 	bool down = flags & Style_Down;
 	bool showUp = !( down ^ on );
@@ -417,7 +417,7 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
 
 	    // We use rot() and translate() as it is more efficient that
 	    // matrix transformations on the painter, and because it still
-	    // works with QT_NO_TRANSFORMATIONS defined.
+	    // works with TQT_NO_TRANSFORMATIONS defined.
 
 	    if ( pe == PE_ArrowUp || pe == PE_ArrowLeft ) {
 		if ( vertical ) {
@@ -832,7 +832,7 @@ void TQMotifStyle::drawControl( ControlElement element,
     switch( element ) {
     case CE_PushButton:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
  	    int diw, x1, y1, x2, y2;
 	    TQColorGroup newCg = cg;
  	    p->setPen( cg.foreground() );
@@ -893,7 +893,7 @@ void TQMotifStyle::drawControl( ControlElement element,
 
     case CE_TabBarTab:
 	{
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
 	    if ( (elementFlags & CEF_UseGenericParameters) || !(elementFlags & CEF_HasParentWidget) || !opt.tab() )
 		break;
 
@@ -1015,7 +1015,7 @@ void TQMotifStyle::drawControl( ControlElement element,
 
     case CE_ProgressBarLabel:
 	{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
 	    const int unit_width = pixelMetric( PM_ProgressBarChunkWidth, ceData, elementFlags, widget );
 	    int u = r.width() / unit_width;
 	    int p_v = ceData.currentStep;
@@ -1047,7 +1047,7 @@ void TQMotifStyle::drawControl( ControlElement element,
 	    break;
 	}
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     case CE_PopupMenuItem:
 	{
 	    if ((elementFlags & CEF_UseGenericParameters) || opt.isDefault())
@@ -1187,7 +1187,7 @@ void TQMotifStyle::drawControl( ControlElement element,
 
 	    break;
 	}
-#endif // QT_NO_POPUPMENU
+#endif // TQT_NO_POPUPMENU
 
     case CE_MenuBarItem:
 	{
@@ -1287,7 +1287,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
 
     case CC_Slider:
 	{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 	    TQRect groove = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderGroove,
 						  opt, widget),
 		  handle = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderHandle,
@@ -1329,7 +1329,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
 	}
 
     case CC_ComboBox:
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 	if ( sub & SC_ComboBoxArrow ) {
 	    const TQComboBox * cb = (const TQComboBox *) widget;
 	    int awh, ax, ay, sh, sy, dh, ew;
@@ -1386,7 +1386,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
 	    break;
 	}
 
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
     case CC_ListView:
 	{
 	    if ( sub & SC_ListView ) {
@@ -1490,7 +1490,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
 
 	    break;
 	}
-#endif // QT_NO_LISTVIEW
+#endif // TQT_NO_LISTVIEW
 
     default:
 	TQCommonStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags,
@@ -1528,7 +1528,7 @@ int TQMotifStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementDa
 
     case PM_SliderControlThickness:
 	{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 	    const TQSlider * sl = (const TQSlider *) widget;
 	    int space = (sl->orientation() == Horizontal) ? sl->height()
 			: sl->width();
@@ -1554,7 +1554,7 @@ int TQMotifStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementDa
 
     case PM_SliderSpaceAvailable:
 	{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 	    const TQSlider * sl = (const TQSlider *) widget;
 	    if ( sl->orientation() == Horizontal )
 		ret = sl->width() - pixelMetric( PM_SliderLength, ceData, elementFlags, sl ) - 6;
@@ -1634,7 +1634,7 @@ TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
 	}
 	break; }
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case CC_Slider: {
 	if (sc == SC_SliderHandle) {
 	    int tickOffset  = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget );
@@ -1652,7 +1652,7 @@ TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
 	break; }
 #endif
 
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
     case CC_ScrollBar: {
 	if (elementFlags & CEF_UseGenericParameters)
 	    return TQRect();
@@ -1733,7 +1733,7 @@ TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
 	break; }
 #endif
 
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
     case CC_ComboBox:
 
 	switch ( sc ) {
@@ -1777,7 +1777,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
     switch(contents) {
     case CT_PushButton:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    sz = TQCommonStyle::sizeFromContents(contents, ceData, elementFlags, contentsSize, opt, widget);
 	    if (((elementFlags & CEF_IsDefault) || (elementFlags & CEF_AutoDefault)) &&
 		sz.width() < 80 && ceData.fgPixmap.isNull())
@@ -1788,7 +1788,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
 
     case CT_PopupMenuItem:
 	{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 	    if ((elementFlags & CEF_UseGenericParameters) || opt.isDefault())
 		break;
 
@@ -1871,7 +1871,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
 
     case SR_DockWindowHandleRect:
 	{
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 	    if ( (elementFlags & CEF_UseGenericParameters) || !(elementFlags & CEF_HasParentWidget) )
 		break;
 
@@ -1890,7 +1890,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
     case SR_ProgressBarGroove:
     case SR_ProgressBarContents:
 	{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
 	    TQFontMetrics fm( ( (!(elementFlags & CEF_UseGenericParameters)) ? TQFontMetrics(ceData.font) :
 			       TQApplication::fontMetrics() ) );
 	    int textw = 0;
@@ -1909,7 +1909,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
 
     case SR_ProgressBarLabel:
 	{
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
 	    TQFontMetrics fm( ( (!(elementFlags & CEF_UseGenericParameters)) ? TQFontMetrics(ceData.font) :
 			       TQApplication::fontMetrics() ) );
 	    int textw = 0;
@@ -1928,7 +1928,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
 
     case SR_CheckBoxContents:
 	{
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	    TQRect ir = subRect(SR_CheckBoxIndicator, ceData, elementFlags, widget);
 	    rect.setRect(ir.right() + 10, wrect.y(),
 			 wrect.width() - ir.width() - 10, wrect.height());
@@ -1955,7 +1955,7 @@ TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData
 */
 void TQMotifStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     if ( !(ceData.windowState & WState_Polished ) ) {
         widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable);
     }
@@ -1963,7 +1963,7 @@ void TQMotifStyle::polishPopupMenu( const TQStyleControlElementData &ceData, Con
 }
 
 
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
 static const char * const qt_close_xpm[] = {
 "12 12 2 1",
 "       s None  c None",
@@ -2274,7 +2274,7 @@ TQPixmap TQMotifStyle::stylePixmap(StylePixmap sp,
 				 const TQStyleOption& opt,
 				 const TQWidget *widget) const
 {
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
     switch (sp) {
     case SP_TitleBarShadeButton:
 	return TQPixmap((const char **)qt_shade_xpm);
diff --git a/src/styles/qplatinumstyle.cpp b/src/styles/qplatinumstyle.cpp
index 09f67db24..097198f7b 100644
--- a/src/styles/qplatinumstyle.cpp
+++ b/src/styles/qplatinumstyle.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqplatinumstyle.h"
 
-#if !defined(QT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_PLATINUM) || defined(QT_PLUGIN)
 
 #include "ntqapplication.h"
 #include "ntqcombobox.h"
@@ -753,7 +753,7 @@ void TQPlatinumStyle::drawControl( ControlElement element,
     switch( element ) {
     case CE_PushButton:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    TQColorGroup myCg( cg );
 	    int x1, y1, x2, y2;
 	    bool useBevelButton;
@@ -861,7 +861,7 @@ void TQPlatinumStyle::drawControl( ControlElement element,
 	}
     case CE_PushButtonLabel:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    bool on;
 	    int x, y, w, h;
 	    SFlags flags;
@@ -891,7 +891,7 @@ void TQPlatinumStyle::drawControl( ControlElement element,
 			       g, flags, opt );
 		w -= dx;
 	    }
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 	    if ( !ceData.iconSet.isNull() ) {
 		TQIconSet::Mode mode = ( elementFlags & CEF_IsEnabled )
 				      ? TQIconSet::Normal : TQIconSet::Disabled;
@@ -1078,7 +1078,7 @@ void TQPlatinumStyle::drawComplexControl( ComplexControl control,
 		p->drawPoint( a[6] );
 
 	    }
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 	    if ( sub & SC_ComboBoxEditField ) {
 		// sadly this is pretty much the windows code, except
 		// for the first fillRect call...
@@ -1127,7 +1127,7 @@ void TQPlatinumStyle::drawComplexControl( ComplexControl control,
 	}
     case CC_Slider:
 	{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 	    int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
 	    int len = pixelMetric( PM_SliderLength, ceData, elementFlags, widget );
 	    int ticks = ceData.tickMarkSetting;
@@ -1327,7 +1327,7 @@ TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
 					      const TQWidget *widget ) const
 {
     switch( control ) {
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
     case CC_ComboBox:
 	switch( sc ) {
 	case SC_ComboBoxArrow: {
@@ -1343,7 +1343,7 @@ TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
 	}
 	break;
 #endif
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
     case CC_ScrollBar: {
 	int sliderStart = ceData.startStep;
 	int sbextent = pixelMetric( PM_ScrollBarExtent, ceData, elementFlags, widget );
@@ -1401,7 +1401,7 @@ TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
 	}
 	break; }
 #endif
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case CC_Slider: {
 	int tickOffset = pixelMetric( PM_SliderTickmarkOffset, ceData, elementFlags, widget);
 	int thickness = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget);
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index aa88a6c95..c6a3c2ba7 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqsgistyle.h"
 
-#if !defined(QT_NO_STYLE_SGI) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_SGI) || defined(QT_PLUGIN)
 
 #include "ntqpopupmenu.h"
 #include "ntqapplication.h"
@@ -60,7 +60,7 @@
 #include "ntqmenubar.h"
 #include 
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 struct SliderLastPosition
 {
     SliderLastPosition() : rect(0,-1,0,-1), slider(0) {}
@@ -69,7 +69,7 @@ struct SliderLastPosition
 };
 #endif
 
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
 struct ScrollbarLastPosition
 {
     ScrollbarLastPosition() : rect( 0,-1, 0,-1 ), scrollbar(0) {}
@@ -88,10 +88,10 @@ public:
 
     const void* hotWidget;
     TQPoint mousePos;
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
     ScrollbarLastPosition lastScrollbarRect;
 #endif
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     SliderLastPosition lastSliderRect;
 #endif
 };
@@ -234,7 +234,7 @@ TQSGIStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags
     if ( (ceData.widgetObjectTypes.contains("TQButton")) || (ceData.widgetObjectTypes.contains("TQSlider")) || (ceData.widgetObjectTypes.contains("TQScrollBar")) ) {
         installObjectEventHandler(ceData, elementFlags, ptr, this);
         widgetActionRequest(ceData, elementFlags, ptr, WAR_EnableMouseTracking);
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
         if ( ceData.widgetObjectTypes.contains("TQScrollBar") ) {
             widgetActionRequest(ceData, elementFlags, ptr, WAR_SetBackgroundMode, TQStyleWidgetActionRequestData(TQWidget::NoBackground));
         }
@@ -244,7 +244,7 @@ TQSGIStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags
 	f.setBold( TRUE );
 	f.setItalic( TRUE );
 	widgetActionRequest(ceData, elementFlags, ptr, WAR_SetFont, TQStyleWidgetActionRequestData(f));
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     } else if ( ceData.widgetObjectTypes.contains("TQMenuBar") ) {
 	widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetStyle, TQStyleWidgetActionRequestData(TQFrame::StyledPanel | TQFrame::Raised));
 	widgetActionRequest(ceData, elementFlags, ptr, WAR_SetBackgroundMode, TQStyleWidgetActionRequestData(TQWidget::PaletteBackground));
@@ -253,7 +253,7 @@ TQSGIStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags
 	f.setItalic( TRUE );
 	widgetActionRequest(ceData, elementFlags, ptr, WAR_SetFont, TQStyleWidgetActionRequestData(f));
 #endif
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     } else if ( ceData.widgetObjectTypes.contains("TQPopupMenu") ) {
 	TQStyleWidgetActionRequestData requestData;
 	widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetLineWidth, TQStyleWidgetActionRequestData(pixelMetric( PM_DefaultFrameWidth, TQStyleControlElementData(), CEF_None ) + 1));
@@ -273,12 +273,12 @@ TQSGIStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFla
 {
     if ( (ceData.widgetObjectTypes.contains("TQButton")) || (ceData.widgetObjectTypes.contains("TQSlider")) || (ceData.widgetObjectTypes.contains("TQScrollBar")) ) {
         removeObjectEventHandler(ceData, elementFlags, ptr, this);
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     } else if ( ceData.widgetObjectTypes.contains("TQPopupMenu") ) {
 	widgetActionRequest(ceData, elementFlags, ptr, WAR_FrameSetLineWidth, TQStyleWidgetActionRequestData(pixelMetric( PM_DefaultFrameWidth, TQStyleControlElementData(), CEF_None )));
 	widgetActionRequest(ceData, elementFlags, ptr, WAR_SetFont, TQStyleWidgetActionRequestData(TQApplication::font()));
 #endif
-#if !defined(QT_NO_MENUBAR) || !defined(QT_NO_COMBOBOX)
+#if !defined(TQT_NO_MENUBAR) || !defined(TQT_NO_COMBOBOX)
     } else if ( (ceData.widgetObjectTypes.contains("TQMenuBar")) || (ceData.widgetObjectTypes.contains("TQComboBox")) ) {
 	widgetActionRequest(ceData, elementFlags, ptr, WAR_SetFont, TQStyleWidgetActionRequestData(TQApplication::font()));
 #endif
@@ -294,7 +294,7 @@ bool TQSGIStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co
     switch ( e->type() ) {
     case TQEvent::MouseButtonPress:
         {
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
 	    if (ceData.widgetObjectTypes.contains("TQScrollBar")) {
 		d->lastScrollbarRect.rect = ceData.sliderRect;
 		d->lastScrollbarRect.scrollbar = source;
@@ -302,7 +302,7 @@ bool TQSGIStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co
 	    } else
 #endif
 	    {
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 		if (ceData.widgetObjectTypes.contains("TQSlider")) {
 		    d->lastSliderRect.rect = ceData.sliderRect;
 		    d->lastSliderRect.slider = source;
@@ -316,13 +316,13 @@ bool TQSGIStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co
     case TQEvent::MouseButtonRelease:
         {
 	    if ( 0 ) {
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
 	    } else if (ceData.widgetObjectTypes.contains("TQScrollBar")) {
 		TQRect oldRect = d->lastScrollbarRect.rect;
 		d->lastScrollbarRect.rect = TQRect( 0, -1, 0, -1 );
 		widgetActionRequest(ceData, elementFlags, source, WAR_RepaintRect, TQStyleWidgetActionRequestData(oldRect));
 #endif
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 	    } else if (ceData.widgetObjectTypes.contains("TQSlider")) {
 		TQRect oldRect = d->lastSliderRect.rect;
 		d->lastSliderRect.rect = TQRect( 0, -1, 0, -1 );
@@ -957,7 +957,7 @@ void TQSGIStyle::drawControl( ControlElement element,
     switch ( element ) {
     case CE_PushButton:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    int x1, y1, x2, y2;
 	    r.coords( &x1, &y1, &x2, &y2 );
 
@@ -1003,7 +1003,7 @@ void TQSGIStyle::drawControl( ControlElement element,
 
     case CE_PopupMenuItem:
 	{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 	    if ( ( elementFlags & CEF_UseGenericParameters ) || opt.isDefault())
 		break;
 	    TQMenuItem *mi = opt.menuItem();
@@ -1136,7 +1136,7 @@ void TQSGIStyle::drawControl( ControlElement element,
 
     case CE_MenuBarItem:
 	{
-#ifndef QT_NO_MENUDATA
+#ifndef TQT_NO_MENUDATA
 	    if (opt.isDefault())
 		break;
 
@@ -1202,7 +1202,7 @@ void TQSGIStyle::drawComplexControl( ComplexControl control,
     switch ( control ) {
     case CC_Slider:
 	{
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 	    TQRect groove = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderGroove,
 						  opt, widget),
 		  handle = querySubControlMetrics(CC_Slider, ceData, elementFlags, SC_SliderHandle,
@@ -1265,7 +1265,7 @@ void TQSGIStyle::drawComplexControl( ComplexControl control,
 	}
     case CC_ComboBox:
 	{
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 	    if (sub & SC_ComboBoxFrame) {
 		TQRect fr =
 		    TQStyle::visualRect( querySubControlMetrics( CC_ComboBox, ceData, elementFlags,
@@ -1312,7 +1312,7 @@ void TQSGIStyle::drawComplexControl( ComplexControl control,
 
     case CC_ScrollBar:
 	{
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
 	    bool maxedOut = (ceData.minSteps == ceData.maxSteps);
 	    if ( maxedOut )
 		flags &= ~Style_Enabled;
@@ -1418,7 +1418,7 @@ TQSize TQSGIStyle::sizeFromContents( ContentsType contents,
     switch(contents) {
     case CT_PopupMenuItem:
 	{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 	    if ((elementFlags & CEF_UseGenericParameters) || opt.isDefault())
 		break;
 
@@ -1535,4 +1535,4 @@ int TQSGIStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData,
 	return ret;
 }
 
-#endif // QT_NO_STYLE_SGI
+#endif // TQT_NO_STYLE_SGI
diff --git a/src/styles/qstylefactory.cpp b/src/styles/qstylefactory.cpp
index c8c797e48..576104cd8 100644
--- a/src/styles/qstylefactory.cpp
+++ b/src/styles/qstylefactory.cpp
@@ -41,7 +41,7 @@
 #include "qstyleinterface_p.h" // up here for GCC 2.7.* compatibility
 #include "ntqstylefactory.h"
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 
 #include "ntqapplication.h"
 #include "ntqwindowsstyle.h"
@@ -51,17 +51,17 @@
 #include "ntqplatinumstyle.h"
 #include "ntqsgistyle.h"
 #include "ntqcompactstyle.h"
-#ifndef QT_NO_STYLE_WINDOWSXP
+#ifndef TQT_NO_STYLE_WINDOWSXP
 #include "qwindowsxpstyle.h"
 #endif
-#ifndef QT_NO_STYLE_AQUA
+#ifndef TQT_NO_STYLE_AQUA
 #include "qaquastyle.h"
 #endif
-#ifndef QT_NO_STYLE_POCKETPC
+#ifndef TQT_NO_STYLE_POCKETPC
 #include "qpocketpcstyle_wce.h"
 #endif
 
-#if !defined( QT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
+#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
 TQString p2qstring(const unsigned char *c); //qglobal.cpp
 #include "qt_mac.h"
 #include "qmacstyle_mac.h"
@@ -69,7 +69,7 @@ TQString p2qstring(const unsigned char *c); //qglobal.cpp
 #include 
 
 #include 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 class TQStyleFactoryPrivate : public TQObject
 {
 public:
@@ -96,7 +96,7 @@ TQStyleFactoryPrivate::~TQStyleFactoryPrivate()
     instance = 0;
 }
 
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
 /*!
     \class TQStyleFactory ntqstylefactory.h
@@ -124,61 +124,61 @@ TQStyle *TQStyleFactory::create( const TQString& key )
 {
     TQStyle *ret = 0;
     TQString style = key.lower();
-#ifndef QT_NO_STYLE_WINDOWS
+#ifndef TQT_NO_STYLE_WINDOWS
     if ( style == "windows" )
         ret = new TQWindowsStyle;
     else
 #endif
-#ifndef QT_NO_STYLE_WINDOWSXP
+#ifndef TQT_NO_STYLE_WINDOWSXP
     if ( style == "windowsxp" )
 	ret = new TQWindowsXPStyle;
     else
 #endif
-#ifndef QT_NO_STYLE_MOTIF
+#ifndef TQT_NO_STYLE_MOTIF
     if ( style == "motif" )
         ret = new TQMotifStyle;
     else
 #endif
-#ifndef QT_NO_STYLE_CDE
+#ifndef TQT_NO_STYLE_CDE
     if ( style == "cde" )
         ret = new TQCDEStyle;
     else
 #endif
-#ifndef QT_NO_STYLE_MOTIFPLUS
+#ifndef TQT_NO_STYLE_MOTIFPLUS
     if ( style == "motifplus" )
         ret = new TQMotifPlusStyle;
     else
 #endif
-#ifndef QT_NO_STYLE_PLATINUM
+#ifndef TQT_NO_STYLE_PLATINUM
     if ( style == "platinum" )
         ret = new TQPlatinumStyle;
     else
 #endif
-#ifndef QT_NO_STYLE_SGI
+#ifndef TQT_NO_STYLE_SGI
     if ( style == "sgi")
         ret = new TQSGIStyle;
     else
 #endif
-#ifndef QT_NO_STYLE_COMPACT
+#ifndef TQT_NO_STYLE_COMPACT
     if ( style == "compact" )
         ret = new TQCompactStyle;
     else
 #endif
-#ifndef QT_NO_STYLE_AQUA
+#ifndef TQT_NO_STYLE_AQUA
     if ( style == "aqua" )
         ret = new TQAquaStyle;
 #endif
-#ifndef QT_NO_STYLE_POCKETPC
+#ifndef TQT_NO_STYLE_POCKETPC
     if ( style == "pocketpc" )
 	ret = new TQPocketPCStyle;
 #endif
-#if !defined( QT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
+#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
     if( style.left(9) == "macintosh" )
 	ret = new TQMacStyle;
 #endif
     { } // Keep these here - they make the #ifdefery above work
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     if(!ret) {
 	if ( !instance )
 	    instance = new TQStyleFactoryPrivate;
@@ -195,7 +195,7 @@ TQStyle *TQStyleFactory::create( const TQString& key )
     return ret;
 }
 
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 /*!
     Returns the list of keys this factory can create styles for.
 
@@ -204,50 +204,50 @@ TQStyle *TQStyleFactory::create( const TQString& key )
 TQStringList TQStyleFactory::keys()
 {
     TQStringList list;
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     if ( !instance )
 	instance = new TQStyleFactoryPrivate;
 
     list = TQStyleFactoryPrivate::manager->featureList();
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
-#ifndef QT_NO_STYLE_WINDOWS
+#ifndef TQT_NO_STYLE_WINDOWS
     if ( !list.contains( "Windows" ) )
 	list << "Windows";
 #endif
-#ifndef QT_NO_STYLE_WINDOWSXP
+#ifndef TQT_NO_STYLE_WINDOWSXP
     if ( !list.contains( "WindowsXP" ) && TQWindowsXPStyle::resolveSymbols() )
 	list << "WindowsXP";
 #endif
-#ifndef QT_NO_STYLE_MOTIF
+#ifndef TQT_NO_STYLE_MOTIF
     if ( !list.contains( "Motif" ) )
 	list << "Motif";
 #endif
-#ifndef QT_NO_STYLE_CDE
+#ifndef TQT_NO_STYLE_CDE
     if ( !list.contains( "CDE" ) )
 	list << "CDE";
 #endif
-#ifndef QT_NO_STYLE_MOTIFPLUS
+#ifndef TQT_NO_STYLE_MOTIFPLUS
     if ( !list.contains( "MotifPlus" ) )
 	list << "MotifPlus";
 #endif
-#ifndef QT_NO_STYLE_PLATINUM
+#ifndef TQT_NO_STYLE_PLATINUM
     if ( !list.contains( "Platinum" ) )
 	list << "Platinum";
 #endif
-#ifndef QT_NO_STYLE_SGI
+#ifndef TQT_NO_STYLE_SGI
     if ( !list.contains( "SGI" ) )
 	list << "SGI";
 #endif
-#ifndef QT_NO_STYLE_COMPACT
+#ifndef TQT_NO_STYLE_COMPACT
     if ( !list.contains( "Compact" ) )
 	list << "Compact";
 #endif
-#ifndef QT_NO_STYLE_AQUA
+#ifndef TQT_NO_STYLE_AQUA
     if ( !list.contains( "Aqua" ) )
 	list << "Aqua";
 #endif
-#if !defined( QT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
+#if !defined( TQT_NO_STYLE_MAC ) && defined( Q_WS_MAC )
     TQString mstyle = "Macintosh";
     Collection c = NewCollection();
     if (c) {
@@ -265,4 +265,4 @@ TQStringList TQStyleFactory::keys()
     return list;
 }
 #endif
-#endif // QT_NO_STYLE
+#endif // TQT_NO_STYLE
diff --git a/src/styles/qstyleinterface_p.h b/src/styles/qstyleinterface_p.h
index 0f962a08e..afca34be7 100644
--- a/src/styles/qstyleinterface_p.h
+++ b/src/styles/qstyleinterface_p.h
@@ -55,8 +55,8 @@
 #include 
 #endif // QT_H
 
-#ifndef QT_NO_STYLE
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_STYLE
+#ifndef TQT_NO_COMPONENT
 
 class TQStyle;
 
@@ -70,7 +70,7 @@ struct Q_EXPORT TQStyleFactoryInterface : public TQFeatureListInterface
     virtual TQStyle* create( const TQString& style ) = 0;
 };
 
-#endif //QT_NO_COMPONENT
-#endif //QT_NO_STYLE
+#endif //TQT_NO_COMPONENT
+#endif //TQT_NO_STYLE
 
 #endif //TQSTYLEINTERFACE_P_H
diff --git a/src/styles/qstyleplugin.cpp b/src/styles/qstyleplugin.cpp
index a76b4d1a4..b9370baab 100644
--- a/src/styles/qstyleplugin.cpp
+++ b/src/styles/qstyleplugin.cpp
@@ -40,8 +40,8 @@
 
 #include "ntqstyleplugin.h"
 
-#ifndef QT_NO_STYLE
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_STYLE
+#ifndef TQT_NO_COMPONENT
 
 #include "qstyleinterface_p.h"
 #include "ntqobjectcleanuphandler.h"
@@ -181,5 +181,5 @@ TQStylePlugin::~TQStylePlugin()
     // don't delete d, as this is deleted by d
 }
 
-#endif // QT_NO_COMPONENT
-#endif // QT_NO_STYLE
+#endif // TQT_NO_COMPONENT
+#endif // TQT_NO_STYLE
diff --git a/src/styles/qt_styles.pri b/src/styles/qt_styles.pri
index 10e84b257..7eb9e5bcf 100644
--- a/src/styles/qt_styles.pri
+++ b/src/styles/qt_styles.pri
@@ -27,7 +27,7 @@ styles {
 			styles += windows
 		}
         }
-	else:DEFINES += QT_NO_STYLE_MAC
+	else:DEFINES += TQT_NO_STYLE_MAC
 
 	#embedded|!macx-*:styles -= aqua
 	contains( styles, aqua ) {
@@ -41,7 +41,7 @@ styles {
 			styles += windows
 		}
 	}
-	else:DEFINES += QT_NO_STYLE_AQUA
+	else:DEFINES += TQT_NO_STYLE_AQUA
 
 	contains( styles, cde ) {
 		HEADERS +=$$STYLES_H/ntqcdestyle.h
@@ -52,7 +52,7 @@ styles {
 			styles += motif
 		}
 	}
-	else:DEFINES += QT_NO_STYLE_CDE
+	else:DEFINES += TQT_NO_STYLE_CDE
 
 	contains( styles, motifplus ) {
 		HEADERS +=$$STYLES_H/ntqmotifplusstyle.h
@@ -62,7 +62,7 @@ styles {
 			styles += motif
 		}
 	}
-	else:DEFINES += QT_NO_STYLE_MOTIFPLUS
+	else:DEFINES += TQT_NO_STYLE_MOTIFPLUS
 
 	contains( styles, interlace ) {
 		HEADERS +=$$STYLES_H/ntqinterlacestyle.h
@@ -72,7 +72,7 @@ styles {
 			styles += windows
 		}
 	}
-	else:DEFINES += QT_NO_STYLE_INTERLACE
+	else:DEFINES += TQT_NO_STYLE_INTERLACE
 
 	contains( styles, platinum ) {
 		HEADERS +=$$STYLES_H/ntqplatinumstyle.h
@@ -82,7 +82,7 @@ styles {
 			styles += windows
 		}
 	}
-	else:DEFINES += QT_NO_STYLE_PLATINUM
+	else:DEFINES += TQT_NO_STYLE_PLATINUM
 
 	contains( styles, windowsxp ) {
 		HEADERS +=$$STYLES_H/qwindowsxpstyle.h
@@ -92,7 +92,7 @@ styles {
 			styles += windows
 		}
         }
-        else:DEFINES += QT_NO_STYLE_WINDOWSXP
+        else:DEFINES += TQT_NO_STYLE_WINDOWSXP
 
 	contains( styles, sgi ) {
 		HEADERS +=$$STYLES_H/ntqsgistyle.h
@@ -102,7 +102,7 @@ styles {
 			styles += motif
 		}
 	}
-	else:DEFINES += QT_NO_STYLE_SGI
+	else:DEFINES += TQT_NO_STYLE_SGI
 
 	contains( styles, compact ) {
 		HEADERS +=$$STYLES_H/ntqcompactstyle.h
@@ -112,7 +112,7 @@ styles {
 			styles += windows
 		}
 	}
-	else:DEFINES += QT_NO_STYLE_COMPACT
+	else:DEFINES += TQT_NO_STYLE_COMPACT
 
         wince-*:styles += pocketpc
 	contains( styles, pocketpc ) {
@@ -124,17 +124,17 @@ styles {
 			styles += windows
 		}
 	}
-        else:DEFINES += QT_NO_STYLE_POCKETPC
+        else:DEFINES += TQT_NO_STYLE_POCKETPC
         
 	contains( styles, windows ) {
 		HEADERS +=$$STYLES_H/ntqwindowsstyle.h
 		SOURCES +=$$STYLES_CPP/qwindowsstyle.cpp
 	}
-	else:DEFINES += QT_NO_STYLE_WINDOWS
+	else:DEFINES += TQT_NO_STYLE_WINDOWS
 
 	contains( styles, motif ) {
 		HEADERS +=$$STYLES_H/ntqmotifstyle.h
 		SOURCES +=$$STYLES_CPP/qmotifstyle.cpp
 	}
-	else:DEFINES += QT_NO_STYLE_MOTIF
+	else:DEFINES += TQT_NO_STYLE_MOTIF
 }
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index e7de564d2..d3b130707 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqwindowsstyle.h"
 
-#if !defined(QT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
+#if !defined(TQT_NO_STYLE_WINDOWS) || defined(QT_PLUGIN)
 
 #include "ntqpopupmenu.h"
 #include "ntqapplication.h"
@@ -697,7 +697,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
 				 const TQWidget *widget ) const
 {
     switch (element) {
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
     case CE_TabBarTab:
 	{
 	    if ( ( elementFlags & CEF_UseGenericParameters ) || (!( elementFlags & CEF_HasParentWidget )) || !opt.tab() )
@@ -812,7 +812,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
 	    }
 	    break;
 	}
-#endif // QT_NO_TABBAR
+#endif // TQT_NO_TABBAR
     case CE_ToolBoxTab:
 	{
 	    qDrawShadePanel( p, r, cg, flags & (Style_Sunken | Style_Down | Style_On) , 1,
@@ -820,7 +820,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
 	    break;
 	}
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     case CE_PopupMenuItem:
 	{
 	    if (( elementFlags & CEF_UseGenericParameters ) || opt.isDefault())
@@ -1034,7 +1034,7 @@ int TQWindowsStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementD
 	ret = 60;
 	break;
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case PM_SliderLength:
 	ret = 11;
 	break;
@@ -1066,7 +1066,7 @@ int TQWindowsStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementD
 	    ret = thick;
 	    break;
 	}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
 
     case PM_MenuBarFrameWidth:
 	ret = 0;
@@ -1107,7 +1107,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
     switch (contents) {
     case CT_PushButton:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    sz = TQCommonStyle::sizeFromContents(contents, ceData, elementFlags, contentsSize, opt, widget);
 	    int w = sz.width(), h = sz.height();
 
@@ -1127,7 +1127,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
 
     case CT_PopupMenuItem:
 	{
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 	    if (( elementFlags & CEF_UseGenericParameters ) || opt.isDefault())
 		break;
 
@@ -1198,14 +1198,14 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
 */
 void TQWindowsStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     if ( !(ceData.windowState & WState_Polished ) ) {
         widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable);
     }
 #endif
 }
 
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
 static const char * const qt_close_xpm[] = {
 "12 12 2 1",
 "# c #000000",
@@ -1482,7 +1482,7 @@ static const char *const question_xpm[] = {
 "..................***...........",
 "...................**...........",
 };
-#endif //QT_NO_IMAGEIO_XPM
+#endif //TQT_NO_IMAGEIO_XPM
 
 /*!
  \reimp
@@ -1493,7 +1493,7 @@ TQPixmap TQWindowsStyle::stylePixmap(StylePixmap stylepixmap,
 				   const TQStyleOption& opt,
 				   const TQWidget *widget) const
 {
-#ifndef QT_NO_IMAGEIO_XPM
+#ifndef TQT_NO_IMAGEIO_XPM
     switch (stylepixmap) {
     case SP_TitleBarShadeButton:
 	return TQPixmap( (const char **)qt_shade_xpm );
@@ -1520,7 +1520,7 @@ TQPixmap TQWindowsStyle::stylePixmap(StylePixmap stylepixmap,
     default:
 	break;
     }
-#endif //QT_NO_IMAGEIO_XPM
+#endif //TQT_NO_IMAGEIO_XPM
     return TQCommonStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget);
 }
 
@@ -1538,7 +1538,7 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
 					const TQWidget *widget ) const
 {
     switch (ctrl) {
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
     case CC_ListView:
 	{
 	    if ( sub & SC_ListView ) {
@@ -1698,9 +1698,9 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
 	    }
 	}
 	break;
-#endif //QT_NO_LISTVIEW
+#endif //TQT_NO_LISTVIEW
 
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
     case CC_ComboBox:
 	if ( sub & SC_ComboBoxArrow ) {
 	    SFlags flags = Style_Default;
@@ -1755,9 +1755,9 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
 	}
 
 	break;
-#endif	// QT_NO_COMBOBOX
+#endif	// TQT_NO_COMBOBOX
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case CC_Slider:
 	{
 	    int thickness  = pixelMetric( PM_SliderControlThickness, ceData, elementFlags, widget );
@@ -1963,7 +1963,7 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
 
 	    break;
 	}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
 
     default:
 	TQCommonStyle::drawComplexControl( ctrl, p, ceData, elementFlags, r, cg, flags, sub,
@@ -2037,13 +2037,13 @@ TQRect TQWindowsStyle::subRect(SubRect r, const TQStyleControlElementData &ceDat
     TQRect rect;
 
     switch (r) {
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
     case SR_SliderFocusRect:
 	{
 	    rect = ceData.rect;
 	    break;
 	}
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
     case SR_ToolBoxTabContents:
 	rect = ceData.rect;
 	break;
diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h
index 0c5e022e8..a74104c31 100644
--- a/src/table/ntqtable.h
+++ b/src/table/ntqtable.h
@@ -55,7 +55,7 @@
 #endif // QT_H
 
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 
 #if !defined( TQT_MODULE_TABLE ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_TABLE )
 #define TQM_EXPORT_TABLE
@@ -423,7 +423,7 @@ protected:
     void showEvent( TQShowEvent *e );
     void paintEvent( TQPaintEvent *e );
     void setEditMode( EditMode mode, int row, int col );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     virtual void contentsDragEnterEvent( TQDragEnterEvent *e );
     virtual void contentsDragMoveEvent( TQDragMoveEvent *e );
     virtual void contentsDragLeaveEvent( TQDragLeaveEvent *e );
@@ -464,7 +464,7 @@ signals:
     void selectionChanged();
     void valueChanged( int row, int col );
     void contextMenuRequested( int row, int col, const TQPoint &pos );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dropped( TQDropEvent *e );
 #endif
 
@@ -560,5 +560,5 @@ private:
 
 #define Q_DEFINED_QTABLE
 #include "ntqwinexport.h"
-#endif // QT_NO_TABLE
+#endif // TQT_NO_TABLE
 #endif // TABLE_H
diff --git a/src/table/qtable.cpp b/src/table/qtable.cpp
index 555b3e03a..771f5e22f 100644
--- a/src/table/qtable.cpp
+++ b/src/table/qtable.cpp
@@ -46,7 +46,7 @@
 
 #include "ntqtable.h"
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 
 #include 
 #include 
@@ -2069,7 +2069,7 @@ TQTable::TQTable( int numRows, int numCols, TQWidget *parent, const char *name )
 
 void TQTable::init( int rows, int cols )
 {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     setDragAutoScroll( FALSE );
 #endif
     d = new TQTablePrivate;
@@ -3590,7 +3590,7 @@ void TQTable::selectRow( int row )
     if ( row < 0 )
 	return;
     bool isDataTable = FALSE;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     isDataTable = ::tqt_cast(this) != 0;
 #endif
     if ( isDataTable || selectionMode() == SingleRow ) {
@@ -3785,7 +3785,7 @@ void TQTable::contentsMouseMoveEvent( TQMouseEvent *e )
     fixRow( tmpRow, e->pos().y() );
     fixCol( tmpCol, e->pos().x() );
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( dragEnabled() && startDragRow != -1 && startDragCol != -1 ) {
 	if (TQPoint(dragStartPos - e->pos()).manhattanLength() > TQApplication::startDragDistance())
 	    startDrag();
@@ -4071,7 +4071,7 @@ bool TQTable::eventFilter( TQObject *o, TQEvent *e )
 	    }
 	}
 	break;
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     case TQEvent::Wheel:
 	if ( o == this || o == viewport() ) {
 	    TQWheelEvent* we = (TQWheelEvent*)e;
@@ -6350,7 +6350,7 @@ void TQTable::editCell( int row, int col, bool replace )
     }
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 /*!
     This event handler is called whenever a TQTable object receives a
@@ -6770,7 +6770,7 @@ void TQTableHeader::mousePressEvent( TQMouseEvent *e )
 	startPos = -1;
     setCaching( TRUE );
     resizedSection = -1;
-#ifdef QT_NO_CURSOR
+#ifdef TQT_NO_CURSOR
     isResizing = FALSE;
 #else
     isResizing = cursor().shape() != ArrowCursor;
@@ -6785,7 +6785,7 @@ void TQTableHeader::mousePressEvent( TQMouseEvent *e )
 void TQTableHeader::mouseMoveEvent( TQMouseEvent *e )
 {
     if ( (e->state() & MouseButtonMask) != LeftButton // Using LeftButton simulates old behavior.
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
          || cursor().shape() != ArrowCursor
 #endif
          || ( ( e->state() & ControlButton ) == ControlButton &&
@@ -7367,4 +7367,4 @@ void TQTableHeader::setLabels(const TQStringList & labels)
 
 #include "qtable.moc"
 
-#endif // QT_NO_TABLE
+#endif // TQT_NO_TABLE
diff --git a/src/tools/ntqbitarray.h b/src/tools/ntqbitarray.h
index 45a022e6d..c63e4ac3f 100644
--- a/src/tools/ntqbitarray.h
+++ b/src/tools/ntqbitarray.h
@@ -161,7 +161,7 @@ inline TQBitVal &TQBitVal::operator=( bool v )
 /*****************************************************************************
   TQBitArray stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQBitArray & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQBitArray & );
 #endif
diff --git a/src/tools/ntqcstring.h b/src/tools/ntqcstring.h
index e60e09693..e009b0c09 100644
--- a/src/tools/ntqcstring.h
+++ b/src/tools/ntqcstring.h
@@ -105,7 +105,7 @@ public:
 typedef TQMemArray TQByteArray;
 #endif
 
-#ifndef QT_NO_COMPRESS
+#ifndef TQT_NO_COMPRESS
 Q_EXPORT TQByteArray tqCompress( const uchar* data, int nbytes );
 Q_EXPORT TQByteArray tqUncompress( const uchar* data, int nbytes );
 Q_EXPORT inline TQByteArray tqCompress( const TQByteArray& data)
@@ -117,7 +117,7 @@ Q_EXPORT inline TQByteArray tqUncompress( const TQByteArray& data )
 /*****************************************************************************
   TQByteArray stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQByteArray & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQByteArray & );
 #endif
@@ -158,17 +158,17 @@ public:
 
     int		find( char c, int index=0, bool cs=TRUE ) const;
     int		find( const char *str, int index=0, bool cs=TRUE ) const;
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     int		find( const TQRegExp &, int index=0 ) const;
 #endif
     int		findRev( char c, int index=-1, bool cs=TRUE) const;
     int		findRev( const char *str, int index=-1, bool cs=TRUE) const;
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     int		findRev( const TQRegExp &, int index=-1 ) const;
 #endif
     int		contains( char c, bool cs=TRUE ) const;
     int		contains( const char *str, bool cs=TRUE ) const;
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     int		contains( const TQRegExp & ) const;
 #endif
     TQCString	left( uint len )  const;
@@ -190,7 +190,7 @@ public:
     TQCString    &prepend( const char * );
     TQCString    &remove( uint index, uint len );
     TQCString    &replace( uint index, uint len, const char * );
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     TQCString    &replace( const TQRegExp &, const char * );
 #endif
     TQCString    &replace( char c, const char *after );
@@ -229,7 +229,7 @@ private:
 /*****************************************************************************
   TQCString stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQCString & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQCString & );
 #endif
diff --git a/src/tools/ntqdatastream.h b/src/tools/ntqdatastream.h
index 3c2df1474..47c6c2d38 100644
--- a/src/tools/ntqdatastream.h
+++ b/src/tools/ntqdatastream.h
@@ -46,7 +46,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 class Q_EXPORT TQDataStream				// data stream class
 {
 public:
@@ -189,5 +189,5 @@ inline TQDataStream &TQDataStream::operator<<( TQ_ULONG i )
 { return *this << (TQ_LONG)i; }
 #endif
 
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 #endif // TQDATASTREAM_H
diff --git a/src/tools/ntqdatetime.h b/src/tools/ntqdatetime.h
index 8439bf5fe..f4d989d14 100644
--- a/src/tools/ntqdatetime.h
+++ b/src/tools/ntqdatetime.h
@@ -70,7 +70,7 @@ public:
     int daysInYear() const;
     int weekNumber( int *yearNum = 0 ) const;
 
-#ifndef QT_NO_TEXTDATE
+#ifndef TQT_NO_TEXTDATE
 #ifndef TQT_NO_COMPAT
     static TQString monthName( int month ) { return shortMonthName( month ); }
     static TQString dayName( int weekday ) { return shortDayName( weekday ); }
@@ -79,9 +79,9 @@ public:
     static TQString shortDayName( int weekday );
     static TQString longMonthName( int month );
     static TQString longDayName( int weekday );
-#endif //QT_NO_TEXTDATE
-#ifndef QT_NO_TEXTSTRING
-#if !defined(QT_NO_SPRINTF)
+#endif //TQT_NO_TEXTDATE
+#ifndef TQT_NO_TEXTSTRING
+#if !defined(TQT_NO_SPRINTF)
     TQString toString( TQt::DateFormat f = TQt::TextDate ) const;
 #endif
     TQString toString( const TQString& format ) const;
@@ -102,7 +102,7 @@ public:
 
     static TQDate currentDate();
     static TQDate currentDate( TQt::TimeSpec );
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
     static TQDate fromString( const TQString& s, TQt::DateFormat f = TQt::TextDate );
 #endif
     static bool	 isValid( int y, int m, int d );
@@ -113,7 +113,7 @@ public:
 private:
     uint	 jd;
     friend class TQDateTime;
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & );
     friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & );
 #endif
@@ -137,8 +137,8 @@ public:
     int	   minute()	 const;			// 0..59
     int	   second()	 const;			// 0..59
     int	   msec()	 const;			// 0..999
-#ifndef QT_NO_DATESTRING
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_DATESTRING
+#ifndef TQT_NO_SPRINTF
     TQString toString( TQt::DateFormat f = TQt::TextDate )	 const;
 #endif
     TQString toString( const TQString& format ) const;
@@ -159,7 +159,7 @@ public:
 
     static TQTime currentTime();
     static TQTime currentTime( TQt::TimeSpec );
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
     static TQTime fromString( const TQString& s, TQt::DateFormat f = TQt::TextDate );
 #endif
     static bool	 isValid( int h, int m, int s, int ms=0 );
@@ -174,7 +174,7 @@ private:
 
     uint   ds;
     friend class TQDateTime;
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & );
     friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & );
 #endif
@@ -202,8 +202,8 @@ public:
     void   setTime( const TQTime &time ) { t = time; }
     void   setTime_t( time_t secsSince1Jan1970UTC );
     void   setTime_t( time_t secsSince1Jan1970UTC, TQt::TimeSpec );
-#ifndef QT_NO_DATESTRING
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_DATESTRING
+#ifndef TQT_NO_SPRINTF
     TQString toString( TQt::DateFormat f = TQt::TextDate )	const;
 #endif
     TQString toString( const TQString& format ) const;
@@ -224,13 +224,13 @@ public:
 
     static TQDateTime currentDateTime();
     static TQDateTime currentDateTime( TQt::TimeSpec );
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
     static TQDateTime fromString( const TQString& s, TQt::DateFormat f = TQt::TextDate );
 #endif
 private:
     TQDate  d;
     TQTime  t;
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     friend Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime &);
     friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & );
 #endif
@@ -241,14 +241,14 @@ private:
   Date and time stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDate & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDate & );
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQTime & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQTime & );
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQDateTime & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQDateTime & );
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
 #endif // TQDATETIME_H
 
diff --git a/src/tools/ntqdir.h b/src/tools/ntqdir.h
index 87083f8f4..332cc960e 100644
--- a/src/tools/ntqdir.h
+++ b/src/tools/ntqdir.h
@@ -48,7 +48,7 @@
 #endif // QT_H
 
 
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 typedef TQPtrList TQFileInfoList;
 typedef TQPtrListIterator TQFileInfoListIterator;
 class TQStringList;
@@ -246,5 +246,5 @@ struct TQDirSortItem {
     TQFileInfo* item;
 };
 
-#endif // QT_NO_DIR
+#endif // TQT_NO_DIR
 #endif // TQDIR_H
diff --git a/src/tools/ntqfeatures.h b/src/tools/ntqfeatures.h
index 289190a3e..9bc4921af 100644
--- a/src/tools/ntqfeatures.h
+++ b/src/tools/ntqfeatures.h
@@ -3,992 +3,992 @@
 // This list is generated from $TQTDIR/src/tools/qfeatures.txt
 //
 // Asynchronous I/O
-//#define QT_NO_ASYNC_IO
+//#define TQT_NO_ASYNC_IO
 
 // Bezier curves
-//#define QT_NO_BEZIER
+//#define TQT_NO_BEZIER
 
 // Buttons
-//#define QT_NO_BUTTON
+//#define TQT_NO_BUTTON
 
 // Named colors
-//#define QT_NO_COLORNAMES
+//#define TQT_NO_COLORNAMES
 
 // Cursors
-//#define QT_NO_CURSOR
+//#define TQT_NO_CURSOR
 
 // TQDataStream
-//#define QT_NO_DATASTREAM
+//#define TQT_NO_DATASTREAM
 
 // TQDate/TQTime/TQDateTime toString() and fromString()
-//#define QT_NO_DATESTRING
+//#define TQT_NO_DATESTRING
 
 // Dialogs
-//#define QT_NO_DIALOG
+//#define TQT_NO_DIALOG
 
 // TQDirectPainter
-//#define QT_NO_DIRECTPAINTER
+//#define TQT_NO_DIRECTPAINTER
 
 // Special widget effects (fading, scrolling)
-//#define QT_NO_EFFECTS
+//#define TQT_NO_EFFECTS
 
 // Freetype font engine
-//#define QT_NO_FREETYPE
+//#define TQT_NO_FREETYPE
 
 // Dither TQImage to 1-bit image
-//#define QT_NO_IMAGE_DITHER_TO_1
+//#define TQT_NO_IMAGE_DITHER_TO_1
 
 // TQImage::createHeuristicMask()
-//#define QT_NO_IMAGE_HEURISTIC_MASK
+//#define TQT_NO_IMAGE_HEURISTIC_MASK
 
 // TQImage mirroring
-//#define QT_NO_IMAGE_MIRROR
+//#define TQT_NO_IMAGE_MIRROR
 
 // Smooth TQImage scaling
-//#define QT_NO_IMAGE_SMOOTHSCALE
+//#define TQT_NO_IMAGE_SMOOTHSCALE
 
 // TrueColor TQImage
-//#define QT_NO_IMAGE_TRUECOLOR
+//#define TQT_NO_IMAGE_TRUECOLOR
 
 // Automatic widget layout
-//#define QT_NO_LAYOUT
+//#define TQT_NO_LAYOUT
 
 // Networking
-//#define QT_NO_NETWORK
+//#define TQT_NO_NETWORK
 
 // Palettes
-//#define QT_NO_PALETTE
+//#define TQT_NO_PALETTE
 
 // Alpha-blended cursor
-//#define QT_NO_QWS_ALPHA_CURSOR
+//#define TQT_NO_QWS_ALPHA_CURSOR
 
 // 1-bit monochrome
-//#define QT_NO_QWS_DEPTH_1
+//#define TQT_NO_QWS_DEPTH_1
 
 // 15 or 16-bit color
-//#define QT_NO_QWS_DEPTH_16
+//#define TQT_NO_QWS_DEPTH_16
 
 // 24-bit color
-//#define QT_NO_QWS_DEPTH_24
+//#define TQT_NO_QWS_DEPTH_24
 
 // 32-bit color
-//#define QT_NO_QWS_DEPTH_32
+//#define TQT_NO_QWS_DEPTH_32
 
 // 4-bit grayscale
-//#define QT_NO_QWS_DEPTH_4
+//#define TQT_NO_QWS_DEPTH_4
 
 // 8-bit color
-//#define QT_NO_QWS_DEPTH_8
+//#define TQT_NO_QWS_DEPTH_8
 
 // 8-bit grayscale
-//#define QT_NO_QWS_DEPTH_8GRAYSCALE
+//#define TQT_NO_QWS_DEPTH_8GRAYSCALE
 
 // Favour code size over graphics speed
-//#define QT_NO_QWS_GFX_SPEED
+//#define TQT_NO_QWS_GFX_SPEED
 
 // Console keyboard
-//#define QT_NO_QWS_KEYBOARD
+//#define TQT_NO_QWS_KEYBOARD
 
 // Linux framebuffer
-//#define QT_NO_QWS_LINUXFB
+//#define TQT_NO_QWS_LINUXFB
 
 // Mach64 acceleration
-//#define QT_NO_QWS_MACH64
+//#define TQT_NO_QWS_MACH64
 
 // Window Manager
-//#define QT_NO_QWS_MANAGER
+//#define TQT_NO_QWS_MANAGER
 
 // Matrox MGA acceleration
-//#define QT_NO_QWS_MATROX
+//#define TQT_NO_QWS_MATROX
 
 // Autodetecting mouse driver
-//#define QT_NO_QWS_MOUSE_AUTO
+//#define TQT_NO_QWS_MOUSE_AUTO
 
 // Non-autodetecting mouse driver
-//#define QT_NO_QWS_MOUSE_MANUAL
+//#define TQT_NO_QWS_MOUSE_MANUAL
 
 // TQt/Embedded window system properties.
-//#define QT_NO_QWS_PROPERTIES
+//#define TQT_NO_QWS_PROPERTIES
 
 // Repeater display
-//#define QT_NO_QWS_REPEATER
+//#define TQT_NO_QWS_REPEATER
 
 // Saving of fonts
-//#define QT_NO_QWS_SAVEFONTS
+//#define TQT_NO_QWS_SAVEFONTS
 
 // Shadow frame buffer
-//#define QT_NO_QWS_SHADOWFB
+//#define TQT_NO_QWS_SHADOWFB
 
 // Virtual frame buffer
-//#define QT_NO_QWS_VFB
+//#define TQT_NO_QWS_VFB
 
 // 4-bit VGA
-//#define QT_NO_QWS_VGA_16
+//#define TQT_NO_QWS_VGA_16
 
 // Voodoo3 acceleration
-//#define QT_NO_QWS_VOODOO3
+//#define TQT_NO_QWS_VOODOO3
 
 // Range-control widgets
-//#define QT_NO_RANGECONTROL
+//#define TQT_NO_RANGECONTROL
 
 // Regular expression capture
-//#define QT_NO_REGEXP
+//#define TQT_NO_REGEXP
 
 // TQSignalMapper
-//#define QT_NO_SIGNALMAPPER
+//#define TQT_NO_SIGNALMAPPER
 
 // Playing sounds
-//#define QT_NO_SOUND
+//#define TQT_NO_SOUND
 
 // Standard template library compatiblity
 //#define TQT_NO_STL
 
 // TQStringList
-//#define QT_NO_STRINGLIST
+//#define TQT_NO_STRINGLIST
 
 // Character set conversions
-//#define QT_NO_TEXTCODEC
+//#define TQT_NO_TEXTCODEC
 
 // TQTextStream
-//#define QT_NO_TEXTSTREAM
+//#define TQT_NO_TEXTSTREAM
 
 // Unicode property tables
-//#define QT_NO_UNICODETABLES
+//#define TQT_NO_UNICODETABLES
 
 // Input validators
-//#define QT_NO_VALIDATOR
+//#define TQT_NO_VALIDATOR
 
 // TQVariant
-//#define QT_NO_VARIANT
+//#define TQT_NO_VARIANT
 
 // Wheel-mouse events
-//#define QT_NO_WHEELEVENT
+//#define TQT_NO_WHEELEVENT
 
 // TQWMatrix
-//#define QT_NO_WMATRIX
+//#define TQT_NO_WMATRIX
 
 // Non-Unicode text conversions
-#if !defined(QT_NO_CODECS) && (defined(QT_NO_TEXTCODEC))
-#define QT_NO_CODECS
+#if !defined(TQT_NO_CODECS) && (defined(TQT_NO_TEXTCODEC))
+#define TQT_NO_CODECS
 #endif
 
 // TQCop IPC
-#if !defined(QT_NO_COP) && (defined(QT_NO_DATASTREAM))
-#define QT_NO_COP
+#if !defined(TQT_NO_COP) && (defined(TQT_NO_DATASTREAM))
+#define TQT_NO_COP
 #endif
 
 // TQFontDatabase
-#if !defined(QT_NO_FONTDATABASE) && (defined(QT_NO_STRINGLIST))
-#define QT_NO_FONTDATABASE
+#if !defined(TQT_NO_FONTDATABASE) && (defined(TQT_NO_STRINGLIST))
+#define TQT_NO_FONTDATABASE
 #endif
 
 // Image formats
-#if !defined(QT_NO_IMAGEIO) && (defined(QT_NO_REGEXP))
-#define QT_NO_IMAGEIO
+#if !defined(TQT_NO_IMAGEIO) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_IMAGEIO
 #endif
 
 // 16-bit TQImage
-#if !defined(QT_NO_IMAGE_16_BIT) && (defined(QT_NO_IMAGE_TRUECOLOR))
-#define QT_NO_IMAGE_16_BIT
+#if !defined(TQT_NO_IMAGE_16_BIT) && (defined(TQT_NO_IMAGE_TRUECOLOR))
+#define TQT_NO_IMAGE_16_BIT
 #endif
 
 // Image file text strings
-#if !defined(QT_NO_IMAGE_TEXT) && (defined(QT_NO_STRINGLIST))
-#define QT_NO_IMAGE_TEXT
+#if !defined(TQT_NO_IMAGE_TEXT) && (defined(TQT_NO_STRINGLIST))
+#define TQT_NO_IMAGE_TEXT
 #endif
 
 // Shared library wrapper
-#if !defined(QT_NO_LIBRARY) && (defined(QT_NO_REGEXP))
-#define QT_NO_LIBRARY
+#if !defined(TQT_NO_LIBRARY) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_LIBRARY
 #endif
 
 // Pixmap transformations
-#if !defined(QT_NO_PIXMAP_TRANSFORMATION) && (defined(QT_NO_WMATRIX))
-#define QT_NO_PIXMAP_TRANSFORMATION
+#if !defined(TQT_NO_PIXMAP_TRANSFORMATION) && (defined(TQT_NO_WMATRIX))
+#define TQT_NO_PIXMAP_TRANSFORMATION
 #endif
 
 // Convert UUID to/from string
-#if !defined(QT_NO_QUUID_STRING) && (defined(QT_NO_STRINGLIST))
-#define QT_NO_QUUID_STRING
+#if !defined(TQT_NO_QUUID_STRING) && (defined(TQT_NO_STRINGLIST))
+#define TQT_NO_QUUID_STRING
 #endif
 
 // The "BeOS" style
-#if !defined(QT_NO_QWS_BEOS_WM_STYLE) && (defined(QT_NO_QWS_MANAGER))
-#define QT_NO_QWS_BEOS_WM_STYLE
+#if !defined(TQT_NO_QWS_BEOS_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
+#define TQT_NO_QWS_BEOS_WM_STYLE
 #endif
 
 // Visible cursor
-#if !defined(QT_NO_QWS_CURSOR) && (defined(QT_NO_CURSOR))
-#define QT_NO_QWS_CURSOR
+#if !defined(TQT_NO_QWS_CURSOR) && (defined(TQT_NO_CURSOR))
+#define TQT_NO_QWS_CURSOR
 #endif
 
 // 32-bit color, BGR order
-#if !defined(QT_NO_QWS_DEPTH_32_BGR) && (defined(QT_NO_QWS_DEPTH_32))
-#define QT_NO_QWS_DEPTH_32_BGR
+#if !defined(TQT_NO_QWS_DEPTH_32_BGR) && (defined(TQT_NO_QWS_DEPTH_32))
+#define TQT_NO_QWS_DEPTH_32_BGR
 #endif
 
 // The "Hydro" style
-#if !defined(QT_NO_QWS_HYDRO_WM_STYLE) && (defined(QT_NO_QWS_MANAGER))
-#define QT_NO_QWS_HYDRO_WM_STYLE
+#if !defined(TQT_NO_QWS_HYDRO_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
+#define TQT_NO_QWS_HYDRO_WM_STYLE
 #endif
 
 // Keyboard for SHARP Zaurus SL5xxx devices
-#if !defined(QT_NO_QWS_KBD_SHARP) && (defined(QT_NO_QWS_KEYBOARD))
-#define QT_NO_QWS_KBD_SHARP
+#if !defined(TQT_NO_QWS_KBD_SHARP) && (defined(TQT_NO_QWS_KEYBOARD))
+#define TQT_NO_QWS_KBD_SHARP
 #endif
 
 // The "KDE2" style
-#if !defined(QT_NO_QWS_KDE2_WM_STYLE) && (defined(QT_NO_QWS_MANAGER))
-#define QT_NO_QWS_KDE2_WM_STYLE
+#if !defined(TQT_NO_QWS_KDE2_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
+#define TQT_NO_QWS_KDE2_WM_STYLE
 #endif
 
 // The "KDE" style
-#if !defined(QT_NO_QWS_KDE_WM_STYLE) && (defined(QT_NO_QWS_MANAGER))
-#define QT_NO_QWS_KDE_WM_STYLE
+#if !defined(TQT_NO_QWS_KDE_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
+#define TQT_NO_QWS_KDE_WM_STYLE
 #endif
 
 // Multi-process architecture
-#if !defined(QT_NO_QWS_MULTIPROCESS) && (defined(QT_NO_NETWORK))
-#define QT_NO_QWS_MULTIPROCESS
+#if !defined(TQT_NO_QWS_MULTIPROCESS) && (defined(TQT_NO_NETWORK))
+#define TQT_NO_QWS_MULTIPROCESS
 #endif
 
 // Transformed frame buffer
-#if !defined(QT_NO_QWS_TRANSFORMED) && (defined(QT_NO_QWS_LINUXFB))
-#define QT_NO_QWS_TRANSFORMED
+#if !defined(TQT_NO_QWS_TRANSFORMED) && (defined(TQT_NO_QWS_LINUXFB))
+#define TQT_NO_QWS_TRANSFORMED
 #endif
 
 // Remote frame buffer (VNC)
-#if !defined(QT_NO_QWS_VNC) && (defined(QT_NO_NETWORK))
-#define QT_NO_QWS_VNC
+#if !defined(TQT_NO_QWS_VNC) && (defined(TQT_NO_NETWORK))
+#define TQT_NO_QWS_VNC
 #endif
 
 // The "Windows" style
-#if !defined(QT_NO_QWS_WINDOWS_WM_STYLE) && (defined(QT_NO_QWS_MANAGER))
-#define QT_NO_QWS_WINDOWS_WM_STYLE
+#if !defined(TQT_NO_QWS_WINDOWS_WM_STYLE) && (defined(TQT_NO_QWS_MANAGER))
+#define TQT_NO_QWS_WINDOWS_WM_STYLE
 #endif
 
 // Regular expression anchors
-#if !defined(QT_NO_REGEXP_ANCHOR_ALT) && (defined(QT_NO_REGEXP))
-#define QT_NO_REGEXP_ANCHOR_ALT
+#if !defined(TQT_NO_REGEXP_ANCHOR_ALT) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_REGEXP_ANCHOR_ALT
 #endif
 
 // Regular expression back-reference
-#if !defined(QT_NO_REGEXP_BACKREF) && (defined(QT_NO_REGEXP))
-#define QT_NO_REGEXP_BACKREF
+#if !defined(TQT_NO_REGEXP_BACKREF) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_REGEXP_BACKREF
 #endif
 
 // Regular expression character-class
-#if !defined(QT_NO_REGEXP_CCLASS) && (defined(QT_NO_REGEXP))
-#define QT_NO_REGEXP_CCLASS
+#if !defined(TQT_NO_REGEXP_CCLASS) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_REGEXP_CCLASS
 #endif
 
 // Regular expression escape
-#if !defined(QT_NO_REGEXP_ESCAPE) && (defined(QT_NO_REGEXP))
-#define QT_NO_REGEXP_ESCAPE
+#if !defined(TQT_NO_REGEXP_ESCAPE) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_REGEXP_ESCAPE
 #endif
 
 // Regular expression interval
-#if !defined(QT_NO_REGEXP_INTERVAL) && (defined(QT_NO_REGEXP))
-#define QT_NO_REGEXP_INTERVAL
+#if !defined(TQT_NO_REGEXP_INTERVAL) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_REGEXP_INTERVAL
 #endif
 
 // Regular expression lookahead
-#if !defined(QT_NO_REGEXP_LOOKAHEAD) && (defined(QT_NO_REGEXP))
-#define QT_NO_REGEXP_LOOKAHEAD
+#if !defined(TQT_NO_REGEXP_LOOKAHEAD) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_REGEXP_LOOKAHEAD
 #endif
 
 // Regular expression optimization
-#if !defined(QT_NO_REGEXP_OPTIM) && (defined(QT_NO_REGEXP))
-#define QT_NO_REGEXP_OPTIM
+#if !defined(TQT_NO_REGEXP_OPTIM) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_REGEXP_OPTIM
 #endif
 
 // Regular expression wildcard
-#if !defined(QT_NO_REGEXP_WILDCARD) && (defined(QT_NO_REGEXP))
-#define QT_NO_REGEXP_WILDCARD
+#if !defined(TQT_NO_REGEXP_WILDCARD) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_REGEXP_WILDCARD
 #endif
 
 // Semi-modal dialogs
-#if !defined(QT_NO_SEMIMODAL) && (defined(QT_NO_DIALOG))
-#define QT_NO_SEMIMODAL
+#if !defined(TQT_NO_SEMIMODAL) && (defined(TQT_NO_DIALOG))
+#define TQT_NO_SEMIMODAL
 #endif
 
 // Session management
-#if !defined(QT_NO_SESSIONMANAGER) && (defined(QT_NO_STRINGLIST))
-#define QT_NO_SESSIONMANAGER
+#if !defined(TQT_NO_SESSIONMANAGER) && (defined(TQT_NO_STRINGLIST))
+#define TQT_NO_SESSIONMANAGER
 #endif
 
 // TQString::sprintf()
-#if !defined(QT_NO_SPRINTF) && (defined(QT_NO_REGEXP))
-#define QT_NO_SPRINTF
+#if !defined(TQT_NO_SPRINTF) && (defined(TQT_NO_REGEXP))
+#define TQT_NO_SPRINTF
 #endif
 
 // Scaling and rotation
-#if !defined(QT_NO_TRANSFORMATIONS) && (defined(QT_NO_WMATRIX))
-#define QT_NO_TRANSFORMATIONS
+#if !defined(TQT_NO_TRANSFORMATIONS) && (defined(TQT_NO_WMATRIX))
+#define TQT_NO_TRANSFORMATIONS
 #endif
 
 // Translations via TQObject::tr()
-#if !defined(TQT_NO_TRANSLATION) && (defined(QT_NO_DATASTREAM))
+#if !defined(TQT_NO_TRANSLATION) && (defined(TQT_NO_DATASTREAM))
 #define TQT_NO_TRANSLATION
 #endif
 
 // Window icon and caption
-#if !defined(QT_NO_WIDGET_TOPEXTRA) && (defined(QT_NO_IMAGE_HEURISTIC_MASK))
-#define QT_NO_WIDGET_TOPEXTRA
+#if !defined(TQT_NO_WIDGET_TOPEXTRA) && (defined(TQT_NO_IMAGE_HEURISTIC_MASK))
+#define TQT_NO_WIDGET_TOPEXTRA
 #endif
 
 // Keyboard accelerators and shortcuts
-#if !defined(QT_NO_ACCEL) && (defined(QT_NO_SPRINTF))
-#define QT_NO_ACCEL
+#if !defined(TQT_NO_ACCEL) && (defined(TQT_NO_SPRINTF))
+#define TQT_NO_ACCEL
 #endif
 
 // Asynchronous image I/O
-#if !defined(QT_NO_ASYNC_IMAGE_IO) && (defined(QT_NO_IMAGEIO))
-#define QT_NO_ASYNC_IMAGE_IO
+#if !defined(TQT_NO_ASYNC_IMAGE_IO) && (defined(TQT_NO_IMAGEIO))
+#define TQT_NO_ASYNC_IMAGE_IO
 #endif
 
 // BDF font files
-#if !defined(QT_NO_BDF) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_STRINGLIST))
-#define QT_NO_BDF
+#if !defined(TQT_NO_BDF) && (defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_STRINGLIST))
+#define TQT_NO_BDF
 #endif
 
 // TQDir
-#if !defined(QT_NO_DIR) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_REGEXP))
-#define QT_NO_DIR
+#if !defined(TQT_NO_DIR) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_REGEXP))
+#define TQT_NO_DIR
 #endif
 
 // JPEG image I/O
-#if !defined(QT_NO_IMAGEIO_JPEG) && (defined(QT_NO_IMAGEIO))
-#define QT_NO_IMAGEIO_JPEG
+#if !defined(TQT_NO_IMAGEIO_JPEG) && (defined(TQT_NO_IMAGEIO))
+#define TQT_NO_IMAGEIO_JPEG
 #endif
 
 // MNG image I/O
-#if !defined(QT_NO_IMAGEIO_MNG) && (defined(QT_NO_IMAGEIO))
-#define QT_NO_IMAGEIO_MNG
+#if !defined(TQT_NO_IMAGEIO_MNG) && (defined(TQT_NO_IMAGEIO))
+#define TQT_NO_IMAGEIO_MNG
 #endif
 
 // PNG image I/O
-#if !defined(QT_NO_IMAGEIO_PNG) && (defined(QT_NO_IMAGEIO))
-#define QT_NO_IMAGEIO_PNG
+#if !defined(TQT_NO_IMAGEIO_PNG) && (defined(TQT_NO_IMAGEIO))
+#define TQT_NO_IMAGEIO_PNG
 #endif
 
 // PPM image I/O
-#if !defined(QT_NO_IMAGEIO_PPM) && (defined(QT_NO_IMAGEIO))
-#define QT_NO_IMAGEIO_PPM
+#if !defined(TQT_NO_IMAGEIO_PPM) && (defined(TQT_NO_IMAGEIO))
+#define TQT_NO_IMAGEIO_PPM
 #endif
 
 // XBM image I/O
-#if !defined(QT_NO_IMAGEIO_XBM) && (defined(QT_NO_IMAGEIO))
-#define QT_NO_IMAGEIO_XBM
+#if !defined(TQT_NO_IMAGEIO_XBM) && (defined(TQT_NO_IMAGEIO))
+#define TQT_NO_IMAGEIO_XBM
 #endif
 
 // Image transformations
-#if !defined(QT_NO_IMAGE_TRANSFORMATION) && (defined(QT_NO_PIXMAP_TRANSFORMATION))
-#define QT_NO_IMAGE_TRANSFORMATION
+#if !defined(TQT_NO_IMAGE_TRANSFORMATION) && (defined(TQT_NO_PIXMAP_TRANSFORMATION))
+#define TQT_NO_IMAGE_TRANSFORMATION
 #endif
 
 // External process invocation.
-#if !defined(QT_NO_PROCESS) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_REGEXP))
-#define QT_NO_PROCESS
+#if !defined(TQT_NO_PROCESS) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_REGEXP))
+#define TQT_NO_PROCESS
 #endif
 
 // Regular expression capture
-#if !defined(QT_NO_REGEXP_CAPTURE) && (defined(QT_NO_REGEXP) || defined(QT_NO_STRINGLIST))
-#define QT_NO_REGEXP_CAPTURE
+#if !defined(TQT_NO_REGEXP_CAPTURE) && (defined(TQT_NO_REGEXP) || defined(TQT_NO_STRINGLIST))
+#define TQT_NO_REGEXP_CAPTURE
 #endif
 
 // Splash screen widget
-#if !defined(QT_NO_SPLASHSCREEN) && (defined(QT_NO_IMAGEIO))
-#define QT_NO_SPLASHSCREEN
+#if !defined(TQT_NO_SPLASHSCREEN) && (defined(TQT_NO_IMAGEIO))
+#define TQT_NO_SPLASHSCREEN
 #endif
 
 // Template classes in TQVariant
-#if !defined(QT_NO_TEMPLATE_VARIANT) && (defined(QT_NO_VARIANT) || defined(QT_NO_STRINGLIST))
-#define QT_NO_TEMPLATE_VARIANT
+#if !defined(TQT_NO_TEMPLATE_VARIANT) && (defined(TQT_NO_VARIANT) || defined(TQT_NO_STRINGLIST))
+#define TQT_NO_TEMPLATE_VARIANT
 #endif
 
 // Month and day names in dates
-#if !defined(QT_NO_TEXTDATE) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_DATESTRING))
-#define QT_NO_TEXTDATE
+#if !defined(TQT_NO_TEXTDATE) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_DATESTRING))
+#define TQT_NO_TEXTDATE
 #endif
 
 // Drawing utility functions
-#if !defined(QT_NO_DRAWUTIL) && (defined(QT_NO_SPRINTF) || defined(QT_NO_PALETTE))
-#define QT_NO_DRAWUTIL
+#if !defined(TQT_NO_DRAWUTIL) && (defined(TQT_NO_SPRINTF) || defined(TQT_NO_PALETTE))
+#define TQT_NO_DRAWUTIL
 #endif
 
 // BMP image I/O
-#if !defined(QT_NO_IMAGEIO_BMP) && (defined(QT_NO_IMAGEIO) || defined(QT_NO_DATASTREAM))
-#define QT_NO_IMAGEIO_BMP
+#if !defined(TQT_NO_IMAGEIO_BMP) && (defined(TQT_NO_IMAGEIO) || defined(TQT_NO_DATASTREAM))
+#define TQT_NO_IMAGEIO_BMP
 #endif
 
 // TQPicture
-#if !defined(QT_NO_PICTURE) && (defined(QT_NO_DATASTREAM) || defined(QT_NO_IMAGEIO))
-#define QT_NO_PICTURE
+#if !defined(TQT_NO_PICTURE) && (defined(TQT_NO_DATASTREAM) || defined(TQT_NO_IMAGEIO))
+#define TQT_NO_PICTURE
 #endif
 
 // Translations via TQObject::trUtf8()
-#if !defined(TQT_NO_TRANSLATION_UTF8) && (defined(TQT_NO_TRANSLATION) || defined(QT_NO_TEXTCODEC))
+#if !defined(TQT_NO_TRANSLATION_UTF8) && (defined(TQT_NO_TRANSLATION) || defined(TQT_NO_TEXTCODEC))
 #define TQT_NO_TRANSLATION_UTF8
 #endif
 
 // URL parser
-#if !defined(QT_NO_URL) && (defined(QT_NO_DIR))
-#define QT_NO_URL
+#if !defined(TQT_NO_URL) && (defined(TQT_NO_DIR))
+#define TQT_NO_URL
 #endif
 
 // Animated images
-#if !defined(QT_NO_MOVIE) && (defined(QT_NO_ASYNC_IO) || defined(QT_NO_ASYNC_IMAGE_IO))
-#define QT_NO_MOVIE
+#if !defined(TQT_NO_MOVIE) && (defined(TQT_NO_ASYNC_IO) || defined(TQT_NO_ASYNC_IMAGE_IO))
+#define TQT_NO_MOVIE
 #endif
 
 // TQStyle
-#if !defined(QT_NO_STYLE) && (defined(QT_NO_DRAWUTIL))
-#define QT_NO_STYLE
+#if !defined(TQT_NO_STYLE) && (defined(TQT_NO_DRAWUTIL))
+#define TQT_NO_STYLE
 #endif
 
 // DNS
-#if !defined(QT_NO_DNS) && (defined(QT_NO_NETWORK) || defined(QT_NO_STRINGLIST) || defined(QT_NO_TEXTSTREAM) || defined(QT_NO_SPRINTF))
-#define QT_NO_DNS
+#if !defined(TQT_NO_DNS) && (defined(TQT_NO_NETWORK) || defined(TQT_NO_STRINGLIST) || defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_SPRINTF))
+#define TQT_NO_DNS
 #endif
 
 // Framed widgets
-#if !defined(QT_NO_FRAME) && (defined(QT_NO_STYLE))
-#define QT_NO_FRAME
+#if !defined(TQT_NO_FRAME) && (defined(TQT_NO_STYLE))
+#define TQT_NO_FRAME
 #endif
 
 // TQIconSet
-#if !defined(QT_NO_ICONSET) && (defined(QT_NO_IMAGEIO) || defined(QT_NO_IMAGE_SMOOTHSCALE) || defined(QT_NO_PALETTE) || defined(QT_NO_IMAGE_HEURISTIC_MASK))
-#define QT_NO_ICONSET
+#if !defined(TQT_NO_ICONSET) && (defined(TQT_NO_IMAGEIO) || defined(TQT_NO_IMAGE_SMOOTHSCALE) || defined(TQT_NO_PALETTE) || defined(TQT_NO_IMAGE_HEURISTIC_MASK))
+#define TQT_NO_ICONSET
 #endif
 
 // XPM image I/O
-#if !defined(QT_NO_IMAGEIO_XPM) && (defined(QT_NO_IMAGEIO) || defined(QT_NO_SPRINTF) || defined(QT_NO_TEXTSTREAM))
-#define QT_NO_IMAGEIO_XPM
+#if !defined(TQT_NO_IMAGEIO_XPM) && (defined(TQT_NO_IMAGEIO) || defined(TQT_NO_SPRINTF) || defined(TQT_NO_TEXTSTREAM))
+#define TQT_NO_IMAGEIO_XPM
 #endif
 
 // Network file access
-#if !defined(QT_NO_NETWORKPROTOCOL) && (defined(QT_NO_TEXTCODEC) || defined(QT_NO_URL))
-#define QT_NO_NETWORKPROTOCOL
+#if !defined(TQT_NO_NETWORKPROTOCOL) && (defined(TQT_NO_TEXTCODEC) || defined(TQT_NO_URL))
+#define TQT_NO_NETWORKPROTOCOL
 #endif
 
 // TQSizeGrip
-#if !defined(QT_NO_SIZEGRIP) && (defined(QT_NO_STYLE))
-#define QT_NO_SIZEGRIP
+#if !defined(TQT_NO_SIZEGRIP) && (defined(TQT_NO_STYLE))
+#define TQT_NO_SIZEGRIP
 #endif
 
 // Motif style
-#if !defined(QT_NO_STYLE_MOTIF) && (defined(QT_NO_STYLE))
-#define QT_NO_STYLE_MOTIF
+#if !defined(TQT_NO_STYLE_MOTIF) && (defined(TQT_NO_STYLE))
+#define TQT_NO_STYLE_MOTIF
 #endif
 
 // Windows style
-#if !defined(QT_NO_STYLE_WINDOWS) && (defined(QT_NO_STYLE))
-#define QT_NO_STYLE_WINDOWS
+#if !defined(TQT_NO_STYLE_WINDOWS) && (defined(TQT_NO_STYLE))
+#define TQT_NO_STYLE_WINDOWS
 #endif
 
 // Internal titlebar widget
-#if !defined(QT_NO_TITLEBAR) && (defined(QT_NO_STYLE))
-#define QT_NO_TITLEBAR
+#if !defined(TQT_NO_TITLEBAR) && (defined(TQT_NO_STYLE))
+#define TQT_NO_TITLEBAR
 #endif
 
 // XML
-#if !defined(QT_NO_XML) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_TEXTCODEC) || defined(QT_NO_REGEXP_CAPTURE))
-#define QT_NO_XML
+#if !defined(TQT_NO_XML) && (defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_TEXTCODEC) || defined(TQT_NO_REGEXP_CAPTURE))
+#define TQT_NO_XML
 #endif
 
 // Check-boxes
-#if !defined(QT_NO_CHECKBOX) && (defined(QT_NO_BUTTON) || defined(QT_NO_STYLE))
-#define QT_NO_CHECKBOX
+#if !defined(TQT_NO_CHECKBOX) && (defined(TQT_NO_BUTTON) || defined(TQT_NO_STYLE))
+#define TQT_NO_CHECKBOX
 #endif
 
 // Dials
-#if !defined(QT_NO_DIAL) && (defined(QT_NO_RANGECONTROL) || defined(QT_NO_STYLE))
-#define QT_NO_DIAL
+#if !defined(TQT_NO_DIAL) && (defined(TQT_NO_RANGECONTROL) || defined(TQT_NO_STYLE))
+#define TQT_NO_DIAL
 #endif
 
 // TQLabel
-#if !defined(QT_NO_LABEL) && (defined(QT_NO_FRAME))
-#define QT_NO_LABEL
+#if !defined(TQT_NO_LABEL) && (defined(TQT_NO_FRAME))
+#define TQT_NO_LABEL
 #endif
 
 // TQLCDNumber
-#if !defined(QT_NO_LCDNUMBER) && (defined(QT_NO_FRAME))
-#define QT_NO_LCDNUMBER
+#if !defined(TQT_NO_LCDNUMBER) && (defined(TQT_NO_FRAME))
+#define TQT_NO_LCDNUMBER
 #endif
 
 // Single-line edits
-#if !defined(QT_NO_LINEEDIT) && (defined(QT_NO_FRAME))
-#define QT_NO_LINEEDIT
+#if !defined(TQT_NO_LINEEDIT) && (defined(TQT_NO_FRAME))
+#define TQT_NO_LINEEDIT
 #endif
 
 // MIME
-#if !defined(QT_NO_MIME) && (defined(QT_NO_DIR) || defined(QT_NO_IMAGEIO) || defined(QT_NO_TEXTCODEC))
-#define QT_NO_MIME
+#if !defined(TQT_NO_MIME) && (defined(TQT_NO_DIR) || defined(TQT_NO_IMAGEIO) || defined(TQT_NO_TEXTCODEC))
+#define TQT_NO_MIME
 #endif
 
 // Progress bars
-#if !defined(QT_NO_PROGRESSBAR) && (defined(QT_NO_FRAME))
-#define QT_NO_PROGRESSBAR
+#if !defined(TQT_NO_PROGRESSBAR) && (defined(TQT_NO_FRAME))
+#define TQT_NO_PROGRESSBAR
 #endif
 
 // Push-buttons
-#if !defined(QT_NO_PUSHBUTTON) && (defined(QT_NO_BUTTON) || defined(QT_NO_STYLE))
-#define QT_NO_PUSHBUTTON
+#if !defined(TQT_NO_PUSHBUTTON) && (defined(TQT_NO_BUTTON) || defined(TQT_NO_STYLE))
+#define TQT_NO_PUSHBUTTON
 #endif
 
 // Radio-buttons
-#if !defined(QT_NO_RADIOBUTTON) && (defined(QT_NO_BUTTON) || defined(QT_NO_STYLE))
-#define QT_NO_RADIOBUTTON
+#if !defined(TQT_NO_RADIOBUTTON) && (defined(TQT_NO_BUTTON) || defined(TQT_NO_STYLE))
+#define TQT_NO_RADIOBUTTON
 #endif
 
 // Internal resize handler
-#if !defined(QT_NO_RESIZEHANDLER) && (defined(QT_NO_FRAME))
-#define QT_NO_RESIZEHANDLER
+#if !defined(TQT_NO_RESIZEHANDLER) && (defined(TQT_NO_FRAME))
+#define TQT_NO_RESIZEHANDLER
 #endif
 
 // Scroll bars
-#if !defined(QT_NO_SCROLLBAR) && (defined(QT_NO_RANGECONTROL) || defined(QT_NO_STYLE))
-#define QT_NO_SCROLLBAR
+#if !defined(TQT_NO_SCROLLBAR) && (defined(TQT_NO_RANGECONTROL) || defined(TQT_NO_STYLE))
+#define TQT_NO_SCROLLBAR
 #endif
 
 // Sliders
-#if !defined(QT_NO_SLIDER) && (defined(QT_NO_RANGECONTROL) || defined(QT_NO_STYLE))
-#define QT_NO_SLIDER
+#if !defined(TQT_NO_SLIDER) && (defined(TQT_NO_RANGECONTROL) || defined(TQT_NO_STYLE))
+#define TQT_NO_SLIDER
 #endif
 
 // Spinbox control widget
-#if !defined(QT_NO_SPINWIDGET) && (defined(QT_NO_FRAME))
-#define QT_NO_SPINWIDGET
+#if !defined(TQT_NO_SPINWIDGET) && (defined(TQT_NO_FRAME))
+#define TQT_NO_SPINWIDGET
 #endif
 
 // Status bars
-#if !defined(QT_NO_STATUSBAR) && (defined(QT_NO_LAYOUT) || defined(QT_NO_STYLE))
-#define QT_NO_STATUSBAR
+#if !defined(TQT_NO_STATUSBAR) && (defined(TQT_NO_LAYOUT) || defined(TQT_NO_STYLE))
+#define TQT_NO_STATUSBAR
 #endif
 
 // Compact Windows style
-#if !defined(QT_NO_STYLE_COMPACT) && (defined(QT_NO_STYLE_WINDOWS))
-#define QT_NO_STYLE_COMPACT
+#if !defined(TQT_NO_STYLE_COMPACT) && (defined(TQT_NO_STYLE_WINDOWS))
+#define TQT_NO_STYLE_COMPACT
 #endif
 
 // Interlace-friendly style
-#if !defined(QT_NO_STYLE_INTERLACE) && (defined(QT_NO_STYLE_MOTIF))
-#define QT_NO_STYLE_INTERLACE
+#if !defined(TQT_NO_STYLE_INTERLACE) && (defined(TQT_NO_STYLE_MOTIF))
+#define TQT_NO_STYLE_INTERLACE
 #endif
 
 // Platinum style
-#if !defined(QT_NO_STYLE_PLATINUM) && (defined(QT_NO_STYLE_WINDOWS))
-#define QT_NO_STYLE_PLATINUM
+#if !defined(TQT_NO_STYLE_PLATINUM) && (defined(TQT_NO_STYLE_WINDOWS))
+#define TQT_NO_STYLE_PLATINUM
 #endif
 
 // Widget stacks
-#if !defined(QT_NO_WIDGETSTACK) && (defined(QT_NO_FRAME))
-#define QT_NO_WIDGETSTACK
+#if !defined(TQT_NO_WIDGETSTACK) && (defined(TQT_NO_FRAME))
+#define TQT_NO_WIDGETSTACK
 #endif
 
 // Grid layout widgets
-#if !defined(QT_NO_GRID) && (defined(QT_NO_LAYOUT) || defined(QT_NO_FRAME))
-#define QT_NO_GRID
+#if !defined(TQT_NO_GRID) && (defined(TQT_NO_LAYOUT) || defined(TQT_NO_FRAME))
+#define TQT_NO_GRID
 #endif
 
 // Group boxes
-#if !defined(QT_NO_GROUPBOX) && (defined(QT_NO_FRAME) || defined(QT_NO_LAYOUT))
-#define QT_NO_GROUPBOX
+#if !defined(TQT_NO_GROUPBOX) && (defined(TQT_NO_FRAME) || defined(TQT_NO_LAYOUT))
+#define TQT_NO_GROUPBOX
 #endif
 
 // Horizontal box layout widgets
-#if !defined(QT_NO_HBOX) && (defined(QT_NO_LAYOUT) || defined(QT_NO_FRAME))
-#define QT_NO_HBOX
+#if !defined(TQT_NO_HBOX) && (defined(TQT_NO_LAYOUT) || defined(TQT_NO_FRAME))
+#define TQT_NO_HBOX
 #endif
 
 // Menu-oriented widgets
-#if !defined(QT_NO_MENUDATA) && (defined(QT_NO_ICONSET) || defined(QT_NO_VARIANT))
-#define QT_NO_MENUDATA
+#if !defined(TQT_NO_MENUDATA) && (defined(TQT_NO_ICONSET) || defined(TQT_NO_VARIANT))
+#define TQT_NO_MENUDATA
 #endif
 
 // Persistent application settings
-#if !defined(QT_NO_SETTINGS) && (defined(QT_NO_DIR) || defined(QT_NO_TEXTSTREAM) || defined(QT_NO_REGEXP_CAPTURE))
-#define QT_NO_SETTINGS
+#if !defined(TQT_NO_SETTINGS) && (defined(TQT_NO_DIR) || defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_REGEXP_CAPTURE))
+#define TQT_NO_SETTINGS
 #endif
 
 // Splitters
-#if !defined(QT_NO_SPLITTER) && (defined(QT_NO_FRAME) || defined(QT_NO_LAYOUT))
-#define QT_NO_SPLITTER
+#if !defined(TQT_NO_SPLITTER) && (defined(TQT_NO_FRAME) || defined(TQT_NO_LAYOUT))
+#define TQT_NO_SPLITTER
 #endif
 
 // Table-like widgets
-#if !defined(QT_NO_TABLEVIEW) && (defined(QT_NO_SCROLLBAR))
-#define QT_NO_TABLEVIEW
+#if !defined(TQT_NO_TABLEVIEW) && (defined(TQT_NO_SCROLLBAR))
+#define TQT_NO_TABLEVIEW
 #endif
 
 // Tool tips
-#if !defined(QT_NO_TOOLTIP) && (defined(QT_NO_LABEL))
-#define QT_NO_TOOLTIP
+#if !defined(TQT_NO_TOOLTIP) && (defined(TQT_NO_LABEL))
+#define TQT_NO_TOOLTIP
 #endif
 
 // Cut and paste
-#if !defined(QT_NO_CLIPBOARD) && (defined(QT_NO_QWS_PROPERTIES) || defined(QT_NO_MIME))
-#define QT_NO_CLIPBOARD
+#if !defined(TQT_NO_CLIPBOARD) && (defined(TQT_NO_QWS_PROPERTIES) || defined(TQT_NO_MIME))
+#define TQT_NO_CLIPBOARD
 #endif
 
 // Horizontal group boxes
-#if !defined(QT_NO_HGROUPBOX) && (defined(QT_NO_GROUPBOX))
-#define QT_NO_HGROUPBOX
+#if !defined(TQT_NO_HGROUPBOX) && (defined(TQT_NO_GROUPBOX))
+#define TQT_NO_HGROUPBOX
 #endif
 
 // Properties
-#if !defined(QT_NO_PROPERTIES) && (defined(QT_NO_VARIANT) || defined(QT_NO_STRINGLIST) || defined(QT_NO_ICONSET))
-#define QT_NO_PROPERTIES
+#if !defined(TQT_NO_PROPERTIES) && (defined(TQT_NO_VARIANT) || defined(TQT_NO_STRINGLIST) || defined(TQT_NO_ICONSET))
+#define TQT_NO_PROPERTIES
 #endif
 
 // RichText (HTML) display
-#if !defined(QT_NO_RICHTEXT) && (defined(QT_NO_STYLE) || defined(QT_NO_LAYOUT) || defined(QT_NO_STRINGLIST) || defined(QT_NO_TEXTSTREAM))
-#define QT_NO_RICHTEXT
+#if !defined(TQT_NO_RICHTEXT) && (defined(TQT_NO_STYLE) || defined(TQT_NO_LAYOUT) || defined(TQT_NO_STRINGLIST) || defined(TQT_NO_TEXTSTREAM))
+#define TQT_NO_RICHTEXT
 #endif
 
 // SQL classes
-#if !defined(QT_NO_SQL) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_REGEXP_CAPTURE) || defined(QT_NO_VARIANT) || defined(QT_NO_SPRINTF) || defined(QT_NO_DATESTRING))
-#define QT_NO_SQL
+#if !defined(TQT_NO_SQL) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_REGEXP_CAPTURE) || defined(TQT_NO_VARIANT) || defined(TQT_NO_SPRINTF) || defined(TQT_NO_DATESTRING))
+#define TQT_NO_SQL
 #endif
 
 // CDE style
-#if !defined(QT_NO_STYLE_CDE) && (defined(QT_NO_STYLE_MOTIF) || defined(QT_NO_TRANSFORMATIONS))
-#define QT_NO_STYLE_CDE
+#if !defined(TQT_NO_STYLE_CDE) && (defined(TQT_NO_STYLE_MOTIF) || defined(TQT_NO_TRANSFORMATIONS))
+#define TQT_NO_STYLE_CDE
 #endif
 
 // Vertical box layout widgets
-#if !defined(QT_NO_VBOX) && (defined(QT_NO_HBOX))
-#define QT_NO_VBOX
+#if !defined(TQT_NO_VBOX) && (defined(TQT_NO_HBOX))
+#define TQT_NO_VBOX
 #endif
 
 // Button groups
-#if !defined(QT_NO_BUTTONGROUP) && (defined(QT_NO_GROUPBOX) || defined(QT_NO_BUTTON))
-#define QT_NO_BUTTONGROUP
+#if !defined(TQT_NO_BUTTONGROUP) && (defined(TQT_NO_GROUPBOX) || defined(TQT_NO_BUTTON))
+#define TQT_NO_BUTTONGROUP
 #endif
 
 // Complex scripts (eg. BiDi)
-#if !defined(QT_NO_COMPLEXTEXT) && (defined(QT_NO_RICHTEXT))
-#define QT_NO_COMPLEXTEXT
+#if !defined(TQT_NO_COMPLEXTEXT) && (defined(TQT_NO_RICHTEXT))
+#define TQT_NO_COMPLEXTEXT
 #endif
 
 // Cut and paste non-text
-#if !defined(QT_NO_MIMECLIPBOARD) && (defined(QT_NO_CLIPBOARD))
-#define QT_NO_MIMECLIPBOARD
+#if !defined(TQT_NO_MIMECLIPBOARD) && (defined(TQT_NO_CLIPBOARD))
+#define TQT_NO_MIMECLIPBOARD
 #endif
 
 // Printing
-#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_SPRINTF) || defined(QT_NO_FONTDATABASE) || defined(QT_NO_DATESTRING) || defined(QT_NO_REGEXP_CAPTURE))
-#define QT_NO_PRINTER
+#if !defined(TQT_NO_PRINTER) && (defined(TQT_NO_TEXTSTREAM) || defined(TQT_NO_SPRINTF) || defined(TQT_NO_FONTDATABASE) || defined(TQT_NO_DATESTRING) || defined(TQT_NO_REGEXP_CAPTURE))
+#define TQT_NO_PRINTER
 #endif
 
 // Aqua style
-#if !defined(QT_NO_STYLE_AQUA) && (defined(QT_NO_STYLE_WINDOWS) || defined(QT_NO_IMAGE_TRANSFORMATION))
-#define QT_NO_STYLE_AQUA
+#if !defined(TQT_NO_STYLE_AQUA) && (defined(TQT_NO_STYLE_WINDOWS) || defined(TQT_NO_IMAGE_TRANSFORMATION))
+#define TQT_NO_STYLE_AQUA
 #endif
 
 // Vertical group boxes
-#if !defined(QT_NO_VGROUPBOX) && (defined(QT_NO_HGROUPBOX))
-#define QT_NO_VGROUPBOX
+#if !defined(TQT_NO_VGROUPBOX) && (defined(TQT_NO_HGROUPBOX))
+#define TQT_NO_VGROUPBOX
 #endif
 
 // Horizontal button groups
-#if !defined(QT_NO_HBUTTONGROUP) && (defined(QT_NO_BUTTONGROUP))
-#define QT_NO_HBUTTONGROUP
+#if !defined(TQT_NO_HBUTTONGROUP) && (defined(TQT_NO_BUTTONGROUP))
+#define TQT_NO_HBUTTONGROUP
 #endif
 
 // Server to play sound
-#if !defined(QT_NO_QWS_SOUNDSERVER) && (defined(QT_NO_SOUND) || defined(QT_NO_DIR) || defined(QT_NO_DNS))
-#define QT_NO_QWS_SOUNDSERVER
+#if !defined(TQT_NO_QWS_SOUNDSERVER) && (defined(TQT_NO_SOUND) || defined(TQT_NO_DIR) || defined(TQT_NO_DNS))
+#define TQT_NO_QWS_SOUNDSERVER
 #endif
 
 // TQHeader
-#if !defined(QT_NO_HEADER) && (defined(QT_NO_STYLE) || defined(QT_NO_ICONSET))
-#define QT_NO_HEADER
+#if !defined(TQT_NO_HEADER) && (defined(TQT_NO_STYLE) || defined(TQT_NO_ICONSET))
+#define TQT_NO_HEADER
 #endif
 
 // Vertical button groups
-#if !defined(QT_NO_VBUTTONGROUP) && (defined(QT_NO_HBUTTONGROUP))
-#define QT_NO_VBUTTONGROUP
+#if !defined(TQT_NO_VBUTTONGROUP) && (defined(TQT_NO_HBUTTONGROUP))
+#define TQT_NO_VBUTTONGROUP
 #endif
 
 // Hebrew Codec
-#if !defined(QT_NO_CODEC_HEBREW) && (defined(QT_NO_CODECS) || defined(QT_NO_COMPLEXTEXT))
-#define QT_NO_CODEC_HEBREW
+#if !defined(TQT_NO_CODEC_HEBREW) && (defined(TQT_NO_CODECS) || defined(TQT_NO_COMPLEXTEXT))
+#define TQT_NO_CODEC_HEBREW
 #endif
 
 // HTTP file access
-#if !defined(QT_NO_NETWORKPROTOCOL_HTTP) && (defined(QT_NO_NETWORKPROTOCOL) || defined(QT_NO_DNS))
-#define QT_NO_NETWORKPROTOCOL_HTTP
+#if !defined(TQT_NO_NETWORKPROTOCOL_HTTP) && (defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_DNS))
+#define TQT_NO_NETWORKPROTOCOL_HTTP
 #endif
 
 // Tool-buttons
-#if !defined(QT_NO_TOOLBUTTON) && (defined(QT_NO_BUTTON) || defined(QT_NO_ICONSET) || defined(QT_NO_STYLE))
-#define QT_NO_TOOLBUTTON
+#if !defined(TQT_NO_TOOLBUTTON) && (defined(TQT_NO_BUTTON) || defined(TQT_NO_ICONSET) || defined(TQT_NO_STYLE))
+#define TQT_NO_TOOLBUTTON
 #endif
 
 // Big Codecs (eg. CJK)
-#if !defined(QT_NO_BIG_CODECS) && (defined(QT_NO_CODEC_HEBREW))
-#define QT_NO_BIG_CODECS
+#if !defined(TQT_NO_BIG_CODECS) && (defined(TQT_NO_CODEC_HEBREW))
+#define TQT_NO_BIG_CODECS
 #endif
 
 // Experimental internal class
-#if !defined(QT_NO_DIALOGBUTTONS) && (defined(QT_NO_LAYOUT) || defined(QT_NO_STYLE) || defined(QT_NO_PUSHBUTTON))
-#define QT_NO_DIALOGBUTTONS
+#if !defined(TQT_NO_DIALOGBUTTONS) && (defined(TQT_NO_LAYOUT) || defined(TQT_NO_STYLE) || defined(TQT_NO_PUSHBUTTON))
+#define TQT_NO_DIALOGBUTTONS
 #endif
 
 // Document Object Model
-#if !defined(QT_NO_DOM) && (defined(QT_NO_XML) || defined(QT_NO_MIME))
-#define QT_NO_DOM
+#if !defined(TQT_NO_DOM) && (defined(TQT_NO_XML) || defined(TQT_NO_MIME))
+#define TQT_NO_DOM
 #endif
 
 // Scrollable view widgets
-#if !defined(QT_NO_SCROLLVIEW) && (defined(QT_NO_SCROLLBAR) || defined(QT_NO_FRAME))
-#define QT_NO_SCROLLVIEW
+#if !defined(TQT_NO_SCROLLVIEW) && (defined(TQT_NO_SCROLLBAR) || defined(TQT_NO_FRAME))
+#define TQT_NO_SCROLLVIEW
 #endif
 
 // Tab-bars
-#if !defined(QT_NO_TABBAR) && (defined(QT_NO_TOOLBUTTON))
-#define QT_NO_TABBAR
+#if !defined(TQT_NO_TABBAR) && (defined(TQT_NO_TOOLBUTTON))
+#define TQT_NO_TABBAR
 #endif
 
 // Drag and drop
-#if !defined(QT_NO_DRAGANDDROP) && (defined(QT_NO_MIME) || defined(QT_NO_QWS_PROPERTIES) || defined(QT_NO_IMAGEIO_XPM))
-#define QT_NO_DRAGANDDROP
+#if !defined(TQT_NO_DRAGANDDROP) && (defined(TQT_NO_MIME) || defined(TQT_NO_QWS_PROPERTIES) || defined(TQT_NO_IMAGEIO_XPM))
+#define TQT_NO_DRAGANDDROP
 #endif
 
 // TQGridView
-#if !defined(QT_NO_GRIDVIEW) && (defined(QT_NO_SCROLLVIEW))
-#define QT_NO_GRIDVIEW
+#if !defined(TQT_NO_GRIDVIEW) && (defined(TQT_NO_SCROLLVIEW))
+#define TQT_NO_GRIDVIEW
 #endif
 
 // Popup-menus
-#if !defined(QT_NO_POPUPMENU) && (defined(QT_NO_MENUDATA) || defined(QT_NO_FRAME))
-#define QT_NO_POPUPMENU
+#if !defined(TQT_NO_POPUPMENU) && (defined(TQT_NO_MENUDATA) || defined(TQT_NO_FRAME))
+#define TQT_NO_POPUPMENU
 #endif
 
 // TQCanvas
-#if !defined(QT_NO_CANVAS) && (defined(QT_NO_SCROLLVIEW) || defined(QT_NO_BEZIER))
-#define QT_NO_CANVAS
+#if !defined(TQT_NO_CANVAS) && (defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_BEZIER))
+#define TQT_NO_CANVAS
 #endif
 
 // Dynamic module linking
-#if !defined(QT_NO_COMPONENT) && (defined(QT_NO_QUUID_STRING) || defined(QT_NO_SETTINGS) || defined(QT_NO_SPRINTF) || defined(QT_NO_LIBRARY) || defined(QT_NO_DATESTRING))
-#define QT_NO_COMPONENT
+#if !defined(TQT_NO_COMPONENT) && (defined(TQT_NO_QUUID_STRING) || defined(TQT_NO_SETTINGS) || defined(TQT_NO_SPRINTF) || defined(TQT_NO_LIBRARY) || defined(TQT_NO_DATESTRING))
+#define TQT_NO_COMPONENT
 #endif
 
 // TQListBox
-#if !defined(QT_NO_LISTBOX) && (defined(QT_NO_SCROLLVIEW) || defined(QT_NO_STRINGLIST))
-#define QT_NO_LISTBOX
+#if !defined(TQT_NO_LISTBOX) && (defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_STRINGLIST))
+#define TQT_NO_LISTBOX
 #endif
 
 // Menu bars
-#if !defined(QT_NO_MENUBAR) && (defined(QT_NO_POPUPMENU))
-#define QT_NO_MENUBAR
+#if !defined(TQT_NO_MENUBAR) && (defined(TQT_NO_POPUPMENU))
+#define TQT_NO_MENUBAR
 #endif
 
 // TQMessageBox
-#if !defined(QT_NO_MESSAGEBOX) && (defined(QT_NO_DIALOG) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LABEL))
-#define QT_NO_MESSAGEBOX
+#if !defined(TQT_NO_MESSAGEBOX) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LABEL))
+#define TQT_NO_MESSAGEBOX
 #endif
 
 // FTP file access
-#if !defined(QT_NO_NETWORKPROTOCOL_FTP) && (defined(QT_NO_NETWORKPROTOCOL) || defined(QT_NO_DNS) || defined(QT_NO_TEXTDATE))
-#define QT_NO_NETWORKPROTOCOL_FTP
+#if !defined(TQT_NO_NETWORKPROTOCOL_FTP) && (defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_DNS) || defined(TQT_NO_TEXTDATE))
+#define TQT_NO_NETWORKPROTOCOL_FTP
 #endif
 
 // Spin boxes
-#if !defined(QT_NO_SPINBOX) && (defined(QT_NO_RANGECONTROL) || defined(QT_NO_SPINWIDGET) || defined(QT_NO_LINEEDIT) || defined(QT_NO_VALIDATOR))
-#define QT_NO_SPINBOX
+#if !defined(TQT_NO_SPINBOX) && (defined(TQT_NO_RANGECONTROL) || defined(TQT_NO_SPINWIDGET) || defined(TQT_NO_LINEEDIT) || defined(TQT_NO_VALIDATOR))
+#define TQT_NO_SPINBOX
 #endif
 
 // RichText (HTML) tables and images
-#if !defined(QT_NO_TEXTCUSTOMITEM) && (defined(QT_NO_RICHTEXT) || defined(QT_NO_MIME))
-#define QT_NO_TEXTCUSTOMITEM
+#if !defined(TQT_NO_TEXTCUSTOMITEM) && (defined(TQT_NO_RICHTEXT) || defined(TQT_NO_MIME))
+#define TQT_NO_TEXTCUSTOMITEM
 #endif
 
 // TQDateTimeEdit
-#if !defined(QT_NO_DATETIMEEDIT) && (defined(QT_NO_RICHTEXT) || defined(QT_NO_SPINWIDGET) || defined(QT_NO_DATESTRING))
-#define QT_NO_DATETIMEEDIT
+#if !defined(TQT_NO_DATETIMEEDIT) && (defined(TQT_NO_RICHTEXT) || defined(TQT_NO_SPINWIDGET) || defined(TQT_NO_DATESTRING))
+#define TQT_NO_DATETIMEEDIT
 #endif
 
 // TQTextCodecPlugin
-#if !defined(QT_NO_TEXTCODECPLUGIN) && (defined(QT_NO_COMPONENT) || defined(QT_NO_TEXTCODEC))
-#define QT_NO_TEXTCODECPLUGIN
+#if !defined(TQT_NO_TEXTCODECPLUGIN) && (defined(TQT_NO_COMPONENT) || defined(TQT_NO_TEXTCODEC))
+#define TQT_NO_TEXTCODECPLUGIN
 #endif
 
 // TQImageFormatPlugin
-#if !defined(QT_NO_IMAGEFORMATPLUGIN) && (defined(QT_NO_COMPONENT) || defined(QT_NO_IMAGEIO))
-#define QT_NO_IMAGEFORMATPLUGIN
+#if !defined(TQT_NO_IMAGEFORMATPLUGIN) && (defined(TQT_NO_COMPONENT) || defined(TQT_NO_IMAGEIO))
+#define TQT_NO_IMAGEFORMATPLUGIN
 #endif
 
 // TQSqlForm
-#if !defined(QT_NO_SQL_FORM) && (defined(QT_NO_SQL) || defined(QT_NO_PROPERTIES))
-#define QT_NO_SQL_FORM
+#if !defined(TQT_NO_SQL_FORM) && (defined(TQT_NO_SQL) || defined(TQT_NO_PROPERTIES))
+#define TQT_NO_SQL_FORM
 #endif
 
 // Scalable Vector Graphics (SVG)
-#if !defined(QT_NO_SVG) && (defined(QT_NO_DOM) || defined(QT_NO_TRANSFORMATIONS) || defined(QT_NO_SPRINTF))
-#define QT_NO_SVG
+#if !defined(TQT_NO_SVG) && (defined(TQT_NO_DOM) || defined(TQT_NO_TRANSFORMATIONS) || defined(TQT_NO_SPRINTF))
+#define TQT_NO_SVG
 #endif
 
 // TQIconView
-#if !defined(QT_NO_ICONVIEW) && (defined(QT_NO_SCROLLVIEW) || defined(QT_NO_IMAGEIO_XPM) || defined(QT_NO_IMAGE_HEURISTIC_MASK))
-#define QT_NO_ICONVIEW
+#if !defined(TQT_NO_ICONVIEW) && (defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_IMAGEIO_XPM) || defined(TQT_NO_IMAGE_HEURISTIC_MASK))
+#define TQT_NO_ICONVIEW
 #endif
 
 // Tab widgets
-#if !defined(QT_NO_TABWIDGET) && (defined(QT_NO_TABBAR) || defined(QT_NO_WIDGETSTACK))
-#define QT_NO_TABWIDGET
+#if !defined(TQT_NO_TABWIDGET) && (defined(TQT_NO_TABBAR) || defined(TQT_NO_WIDGETSTACK))
+#define TQT_NO_TABWIDGET
 #endif
 
 // "What's this" help
-#if !defined(QT_NO_WHATSTHIS) && (defined(QT_NO_TOOLTIP) || defined(QT_NO_TOOLBUTTON))
-#define QT_NO_WHATSTHIS
+#if !defined(TQT_NO_WHATSTHIS) && (defined(TQT_NO_TOOLTIP) || defined(TQT_NO_TOOLBUTTON))
+#define TQT_NO_WHATSTHIS
 #endif
 
 // TQWidgetPlugin
-#if !defined(QT_NO_WIDGETPLUGIN) && (defined(QT_NO_COMPONENT) || defined(QT_NO_ICONSET))
-#define QT_NO_WIDGETPLUGIN
+#if !defined(TQT_NO_WIDGETPLUGIN) && (defined(TQT_NO_COMPONENT) || defined(TQT_NO_ICONSET))
+#define TQT_NO_WIDGETPLUGIN
 #endif
 
 // TQProgressDialog
-#if !defined(QT_NO_PROGRESSDIALOG) && (defined(QT_NO_SEMIMODAL) || defined(QT_NO_LABEL) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_PROGRESSBAR))
-#define QT_NO_PROGRESSDIALOG
+#if !defined(TQT_NO_PROGRESSDIALOG) && (defined(TQT_NO_SEMIMODAL) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_PROGRESSBAR))
+#define TQT_NO_PROGRESSDIALOG
 #endif
 
 // Motif-plus style
-#if !defined(QT_NO_STYLE_MOTIFPLUS) && (defined(QT_NO_STYLE_MOTIF) || defined(QT_NO_TRANSFORMATIONS) || defined(QT_NO_BUTTON) || defined(QT_NO_SCROLLBAR) || defined(QT_NO_SLIDER))
-#define QT_NO_STYLE_MOTIFPLUS
+#if !defined(TQT_NO_STYLE_MOTIFPLUS) && (defined(TQT_NO_STYLE_MOTIF) || defined(TQT_NO_TRANSFORMATIONS) || defined(TQT_NO_BUTTON) || defined(TQT_NO_SCROLLBAR) || defined(TQT_NO_SLIDER))
+#define TQT_NO_STYLE_MOTIFPLUS
 #endif
 
 // Rich text edit
-#if !defined(QT_NO_TEXTEDIT) && (defined(QT_NO_RICHTEXT) || defined(QT_NO_SCROLLVIEW))
-#define QT_NO_TEXTEDIT
+#if !defined(TQT_NO_TEXTEDIT) && (defined(TQT_NO_RICHTEXT) || defined(TQT_NO_SCROLLVIEW))
+#define TQT_NO_TEXTEDIT
 #endif
 
 // TQWizard
-#if !defined(QT_NO_WIZARD) && (defined(QT_NO_DIALOG) || defined(QT_NO_WIDGETSTACK) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LAYOUT) || defined(QT_NO_LABEL))
-#define QT_NO_WIZARD
+#if !defined(TQT_NO_WIZARD) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LAYOUT) || defined(TQT_NO_LABEL))
+#define TQT_NO_WIZARD
 #endif
 
 // Multi-line edits
-#if !defined(QT_NO_MULTILINEEDIT) && (defined(QT_NO_TEXTEDIT))
-#define QT_NO_MULTILINEEDIT
+#if !defined(TQT_NO_MULTILINEEDIT) && (defined(TQT_NO_TEXTEDIT))
+#define TQT_NO_MULTILINEEDIT
 #endif
 
 // Rich text syntax highlighting
-#if !defined(QT_NO_SYNTAXHIGHLIGHTER) && (defined(QT_NO_TEXTEDIT))
-#define QT_NO_SYNTAXHIGHLIGHTER
+#if !defined(TQT_NO_SYNTAXHIGHLIGHTER) && (defined(TQT_NO_TEXTEDIT))
+#define TQT_NO_SYNTAXHIGHLIGHTER
 #endif
 
 // TQTextView
-#if !defined(QT_NO_TEXTVIEW) && (defined(QT_NO_TEXTEDIT))
-#define QT_NO_TEXTVIEW
+#if !defined(TQT_NO_TEXTVIEW) && (defined(TQT_NO_TEXTEDIT))
+#define TQT_NO_TEXTVIEW
 #endif
 
 // TQTabDialog
-#if !defined(QT_NO_TABDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LAYOUT) || defined(QT_NO_TABWIDGET))
-#define QT_NO_TABDIALOG
+#if !defined(TQT_NO_TABDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LAYOUT) || defined(TQT_NO_TABWIDGET))
+#define TQT_NO_TABDIALOG
 #endif
 
 // TQTextBrowser
-#if !defined(QT_NO_TEXTBROWSER) && (defined(QT_NO_TEXTVIEW) || defined(QT_NO_MIME))
-#define QT_NO_TEXTBROWSER
+#if !defined(TQT_NO_TEXTBROWSER) && (defined(TQT_NO_TEXTVIEW) || defined(TQT_NO_MIME))
+#define TQT_NO_TEXTBROWSER
 #endif
 
 // TQListView
-#if !defined(QT_NO_LISTVIEW) && (defined(QT_NO_SCROLLVIEW) || defined(QT_NO_HEADER) || defined(QT_NO_LINEEDIT))
-#define QT_NO_LISTVIEW
+#if !defined(TQT_NO_LISTVIEW) && (defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_HEADER) || defined(TQT_NO_LINEEDIT))
+#define TQT_NO_LISTVIEW
 #endif
 
 // TQComboBox
-#if !defined(QT_NO_COMBOBOX) && (defined(QT_NO_LISTBOX) || defined(QT_NO_LINEEDIT) || defined(QT_NO_POPUPMENU))
-#define QT_NO_COMBOBOX
+#if !defined(TQT_NO_COMBOBOX) && (defined(TQT_NO_LISTBOX) || defined(TQT_NO_LINEEDIT) || defined(TQT_NO_POPUPMENU))
+#define TQT_NO_COMBOBOX
 #endif
 
 // TQColorDialog
-#if !defined(QT_NO_COLORDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_LABEL) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LINEEDIT) || defined(QT_NO_VALIDATOR) || defined(QT_NO_GRIDVIEW) || defined(QT_NO_LAYOUT))
-#define QT_NO_COLORDIALOG
+#if !defined(TQT_NO_COLORDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LINEEDIT) || defined(TQT_NO_VALIDATOR) || defined(TQT_NO_GRIDVIEW) || defined(TQT_NO_LAYOUT))
+#define TQT_NO_COLORDIALOG
 #endif
 
 // Tool box
-#if !defined(QT_NO_TOOLBOX) && (defined(QT_NO_ICONSET) || defined(QT_NO_SCROLLVIEW) || defined(QT_NO_TOOLTIP) || defined(QT_NO_LAYOUT) || defined(QT_NO_TOOLBUTTON))
-#define QT_NO_TOOLBOX
+#if !defined(TQT_NO_TOOLBOX) && (defined(TQT_NO_ICONSET) || defined(TQT_NO_SCROLLVIEW) || defined(TQT_NO_TOOLTIP) || defined(TQT_NO_LAYOUT) || defined(TQT_NO_TOOLBUTTON))
+#define TQT_NO_TOOLBOX
 #endif
 
 // SGI style
-#if !defined(QT_NO_STYLE_SGI) && (defined(QT_NO_STYLE_MOTIF) || defined(QT_NO_TRANSFORMATIONS) || defined(QT_NO_BUTTON) || defined(QT_NO_SCROLLBAR) || defined(QT_NO_SLIDER) || defined(QT_NO_LINEEDIT) || defined(QT_NO_MENUBAR))
-#define QT_NO_STYLE_SGI
+#if !defined(TQT_NO_STYLE_SGI) && (defined(TQT_NO_STYLE_MOTIF) || defined(TQT_NO_TRANSFORMATIONS) || defined(TQT_NO_BUTTON) || defined(TQT_NO_SCROLLBAR) || defined(TQT_NO_SLIDER) || defined(TQT_NO_LINEEDIT) || defined(TQT_NO_MENUBAR))
+#define TQT_NO_STYLE_SGI
 #endif
 
 // TQErrorMessage
-#if !defined(QT_NO_ERRORMESSAGE) && (defined(QT_NO_DIALOG) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_LABEL) || defined(QT_NO_CHECKBOX) || defined(QT_NO_TEXTVIEW))
-#define QT_NO_ERRORMESSAGE
+#if !defined(TQT_NO_ERRORMESSAGE) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_LABEL) || defined(TQT_NO_CHECKBOX) || defined(TQT_NO_TEXTVIEW))
+#define TQT_NO_ERRORMESSAGE
 #endif
 
 // Main-windows
-#if !defined(QT_NO_MAINWINDOW) && (defined(QT_NO_STRINGLIST) || defined(QT_NO_POPUPMENU) || defined(QT_NO_TITLEBAR) || defined(QT_NO_RESIZEHANDLER) || defined(QT_NO_TOOLBUTTON) || defined(QT_NO_STATUSBAR))
-#define QT_NO_MAINWINDOW
+#if !defined(TQT_NO_MAINWINDOW) && (defined(TQT_NO_STRINGLIST) || defined(TQT_NO_POPUPMENU) || defined(TQT_NO_TITLEBAR) || defined(TQT_NO_RESIZEHANDLER) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_STATUSBAR))
+#define TQT_NO_MAINWINDOW
 #endif
 
 // Toolbars
-#if !defined(QT_NO_TOOLBAR) && (defined(QT_NO_MAINWINDOW))
-#define QT_NO_TOOLBAR
+#if !defined(TQT_NO_TOOLBAR) && (defined(TQT_NO_MAINWINDOW))
+#define TQT_NO_TOOLBAR
 #endif
 
 // TQAction
-#if !defined(QT_NO_ACTION) && (defined(QT_NO_TOOLBUTTON) || defined(QT_NO_COMBOBOX))
-#define QT_NO_ACTION
+#if !defined(TQT_NO_ACTION) && (defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_COMBOBOX))
+#define TQT_NO_ACTION
 #endif
 
 // TQTable
-#if !defined(QT_NO_TABLE) && (defined(QT_NO_COMBOBOX) || defined(QT_NO_HEADER) || defined(QT_NO_CHECKBOX))
-#define QT_NO_TABLE
+#if !defined(TQT_NO_TABLE) && (defined(TQT_NO_COMBOBOX) || defined(TQT_NO_HEADER) || defined(TQT_NO_CHECKBOX))
+#define TQT_NO_TABLE
 #endif
 
 // TQFontDialog
-#if !defined(QT_NO_FONTDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_FONTDATABASE) || defined(QT_NO_COMBOBOX) || defined(QT_NO_LABEL) || defined(QT_NO_CHECKBOX) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_VGROUPBOX) || defined(QT_NO_VALIDATOR))
-#define QT_NO_FONTDIALOG
+#if !defined(TQT_NO_FONTDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_FONTDATABASE) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_LABEL) || defined(TQT_NO_CHECKBOX) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_VGROUPBOX) || defined(TQT_NO_VALIDATOR))
+#define TQT_NO_FONTDIALOG
 #endif
 
 // TQInputDialog
-#if !defined(QT_NO_INPUTDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_COMBOBOX) || defined(QT_NO_LABEL) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_SPINBOX) || defined(QT_NO_WIDGETSTACK) || defined(QT_NO_LAYOUT))
-#define QT_NO_INPUTDIALOG
+#if !defined(TQT_NO_INPUTDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_LABEL) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_SPINBOX) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_LAYOUT))
+#define TQT_NO_INPUTDIALOG
 #endif
 
 // SQL value editor widgets
-#if !defined(QT_NO_SQL_EDIT_WIDGETS) && (defined(QT_NO_SQL) || defined(QT_NO_SPINBOX) || defined(QT_NO_COMBOBOX) || defined(QT_NO_CHECKBOX) || defined(QT_NO_DATETIMEEDIT))
-#define QT_NO_SQL_EDIT_WIDGETS
+#if !defined(TQT_NO_SQL_EDIT_WIDGETS) && (defined(TQT_NO_SQL) || defined(TQT_NO_SPINBOX) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_CHECKBOX) || defined(TQT_NO_DATETIMEEDIT))
+#define TQT_NO_SQL_EDIT_WIDGETS
 #endif
 
 // TQPrintDialog
-#if !defined(QT_NO_PRINTDIALOG) && (defined(QT_NO_DIALOG) || defined(QT_NO_LISTVIEW) || defined(QT_NO_PRINTER) || defined(QT_NO_COMBOBOX) || defined(QT_NO_LABEL) || defined(QT_NO_BUTTONGROUP) || defined(QT_NO_SPINBOX) || defined(QT_NO_RADIOBUTTON) || defined(QT_NO_PUSHBUTTON) || defined(QT_NO_DIR))
-#define QT_NO_PRINTDIALOG
+#if !defined(TQT_NO_PRINTDIALOG) && (defined(TQT_NO_DIALOG) || defined(TQT_NO_LISTVIEW) || defined(TQT_NO_PRINTER) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_LABEL) || defined(TQT_NO_BUTTONGROUP) || defined(TQT_NO_SPINBOX) || defined(TQT_NO_RADIOBUTTON) || defined(TQT_NO_PUSHBUTTON) || defined(TQT_NO_DIR))
+#define TQT_NO_PRINTDIALOG
 #endif
 
 // TQFileDialog
-#if !defined(QT_NO_FILEDIALOG) && (defined(QT_NO_MESSAGEBOX) || defined(QT_NO_LISTVIEW) || defined(QT_NO_NETWORKPROTOCOL) || defined(QT_NO_COMBOBOX) || defined(QT_NO_SEMIMODAL) || defined(QT_NO_REGEXP_CAPTURE) || defined(QT_NO_TOOLBUTTON) || defined(QT_NO_BUTTONGROUP) || defined(QT_NO_VBOX) || defined(QT_NO_SPLITTER) || defined(QT_NO_PROGRESSBAR) || defined(QT_NO_WIDGETSTACK) || defined(QT_NO_DATESTRING))
-#define QT_NO_FILEDIALOG
+#if !defined(TQT_NO_FILEDIALOG) && (defined(TQT_NO_MESSAGEBOX) || defined(TQT_NO_LISTVIEW) || defined(TQT_NO_NETWORKPROTOCOL) || defined(TQT_NO_COMBOBOX) || defined(TQT_NO_SEMIMODAL) || defined(TQT_NO_REGEXP_CAPTURE) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_BUTTONGROUP) || defined(TQT_NO_VBOX) || defined(TQT_NO_SPLITTER) || defined(TQT_NO_PROGRESSBAR) || defined(TQT_NO_WIDGETSTACK) || defined(TQT_NO_DATESTRING))
+#define TQT_NO_FILEDIALOG
 #endif
 
 // SQL table widgets
-#if !defined(QT_NO_SQL_VIEW_WIDGETS) && (defined(QT_NO_SQL_FORM) || defined(QT_NO_SQL_EDIT_WIDGETS) || defined(QT_NO_TABLE))
-#define QT_NO_SQL_VIEW_WIDGETS
+#if !defined(TQT_NO_SQL_VIEW_WIDGETS) && (defined(TQT_NO_SQL_FORM) || defined(TQT_NO_SQL_EDIT_WIDGETS) || defined(TQT_NO_TABLE))
+#define TQT_NO_SQL_VIEW_WIDGETS
 #endif
 
 // TQWorkSpace
-#if !defined(QT_NO_WORKSPACE) && (defined(QT_NO_SCROLLBAR) || defined(QT_NO_VBOX) || defined(QT_NO_TITLEBAR) || defined(QT_NO_RESIZEHANDLER) || defined(QT_NO_POPUPMENU) || defined(QT_NO_LABEL) || defined(QT_NO_TOOLBUTTON) || defined(QT_NO_MAINWINDOW) || defined(QT_NO_TOOLBAR) || defined(QT_NO_MENUBAR))
-#define QT_NO_WORKSPACE
+#if !defined(TQT_NO_WORKSPACE) && (defined(TQT_NO_SCROLLBAR) || defined(TQT_NO_VBOX) || defined(TQT_NO_TITLEBAR) || defined(TQT_NO_RESIZEHANDLER) || defined(TQT_NO_POPUPMENU) || defined(TQT_NO_LABEL) || defined(TQT_NO_TOOLBUTTON) || defined(TQT_NO_MAINWINDOW) || defined(TQT_NO_TOOLBAR) || defined(TQT_NO_MENUBAR))
+#define TQT_NO_WORKSPACE
 #endif
 
 // Input method
-#if !defined(QT_NO_IM) && (defined(QT_NO_STRINGLIST))
-#define QT_NO_IM
+#if !defined(TQT_NO_IM) && (defined(TQT_NO_STRINGLIST))
+#define TQT_NO_IM
 #endif
 
 // Input method extensions
-#if !defined(QT_NO_IM_EXTENSIONS) && (defined(QT_NO_IM) || defined(QT_NO_STRINGLIST))
-#define QT_NO_IM_EXTENSIONS
+#if !defined(TQT_NO_IM_EXTENSIONS) && (defined(TQT_NO_IM) || defined(TQT_NO_STRINGLIST))
+#define TQT_NO_IM_EXTENSIONS
 #endif
 
diff --git a/src/tools/ntqfileinfo.h b/src/tools/ntqfileinfo.h
index 28f2aea98..3924a13fa 100644
--- a/src/tools/ntqfileinfo.h
+++ b/src/tools/ntqfileinfo.h
@@ -64,7 +64,7 @@ public:
     TQFileInfo();
     TQFileInfo( const TQString &file );
     TQFileInfo( const TQFile & );
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
     TQFileInfo( const TQDir &, const TQString &fileName );
 #endif
     TQFileInfo( const TQFileInfo & );
@@ -74,7 +74,7 @@ public:
 
     void	setFile( const TQString &file );
     void	setFile( const TQFile & );
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
     void	setFile( const TQDir &, const TQString &fileName );
 #endif
     bool	exists()	const;
@@ -84,16 +84,16 @@ public:
 
     TQString	filePath()	const;
     TQString	fileName()	const;
-#ifndef QT_NO_DIR //###
+#ifndef TQT_NO_DIR //###
     TQString	absFilePath()	const;
 #endif
     TQString	baseName( bool complete = FALSE ) const;
     TQString	extension( bool complete = TRUE ) const;
 
-#ifndef QT_NO_DIR //###
+#ifndef TQT_NO_DIR //###
     TQString	dirPath( bool absPath = FALSE ) const;
 #endif
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
     TQDir	dir( bool absPath = FALSE )	const;
 #endif
     bool	isReadable()	const;
@@ -101,7 +101,7 @@ public:
     bool	isExecutable()	const;
     bool 	isHidden()      const;
 
-#ifndef QT_NO_DIR //###
+#ifndef TQT_NO_DIR //###
     bool	isRelative()	const;
     bool	convertToAbs();
 #endif
diff --git a/src/tools/ntqgdict.h b/src/tools/ntqgdict.h
index 5465fd2f2..ace621ab3 100644
--- a/src/tools/ntqgdict.h
+++ b/src/tools/ntqgdict.h
@@ -114,7 +114,7 @@ public:
     TQPtrCollection::Item look_ascii( const char *key, TQPtrCollection::Item, int );
     TQPtrCollection::Item look_int( long key, TQPtrCollection::Item, int );
     TQPtrCollection::Item look_ptr( void *key, TQPtrCollection::Item, int );
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     TQDataStream &read( TQDataStream & );
     TQDataStream &write( TQDataStream & ) const;
 #endif
@@ -144,7 +144,7 @@ protected:
 
     void	statistics() const;
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     virtual TQDataStream &read( TQDataStream &, TQPtrCollection::Item & );
     virtual TQDataStream &write( TQDataStream &, TQPtrCollection::Item ) const;
 #endif
diff --git a/src/tools/ntqglist.h b/src/tools/ntqglist.h
index aaa0a4a3f..a3fce491e 100644
--- a/src/tools/ntqglist.h
+++ b/src/tools/ntqglist.h
@@ -71,7 +71,7 @@ friend class TQGVector;				// needed by TQGVector::toList
 public:
     uint  count() const;			// return number of nodes
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     TQDataStream &read( TQDataStream & );		// read list from stream
     TQDataStream &write( TQDataStream & ) const;	// write list to stream
 #endif
@@ -126,7 +126,7 @@ protected:
 
     virtual int compareItems( TQPtrCollection::Item, TQPtrCollection::Item );
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     virtual TQDataStream &read( TQDataStream &, TQPtrCollection::Item & );
     virtual TQDataStream &write( TQDataStream &, TQPtrCollection::Item ) const;
 #endif
@@ -211,7 +211,7 @@ inline TQPtrCollection::Item TQGList::clast() const
   TQGList stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQGList & );
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGList & );
 #endif
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index 282fecea2..e92c825fc 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -287,7 +287,7 @@
 /* ??? */
 #    define Q_BROKEN_TEMPLATE_SPECIALIZATION
 /* no template classes in TQVariant */
-#    define QT_NO_TEMPLATE_VARIANT
+#    define TQT_NO_TEMPLATE_VARIANT
 /* Wcc does not fill in functions needed by valuelists, maps, and
    valuestacks implicitly */
 #    define Q_FULL_TEMPLATE_INSTANTIATION
@@ -295,9 +295,9 @@
 #    define Q_FULL_TEMPLATE_INSTANTIATION_MEMCMP
 /* these are not useful to our customers */
 #    define QT_QWS_NO_SHM
-#    define QT_NO_QWS_MULTIPROCESS
-#    define QT_NO_SQL
-#    define QT_NO_QWS_CURSOR
+#    define TQT_NO_QWS_MULTIPROCESS
+#    define TQT_NO_SQL
+#    define TQT_NO_QWS_CURSOR
 #  endif
 
 #elif defined(__GNUC__)
@@ -583,7 +583,7 @@
 #elif defined(Q_OS_UNIX)
 #  if defined(TQWS)
 #    define Q_WS_QWS
-#    define QT_NO_QWS_IM
+#    define TQT_NO_QWS_IM
 #  elif defined(Q_OS_MACX)
 #    define Q_WS_MACX
 #  else
@@ -779,25 +779,25 @@ class TQDataStream;
 // prune to local config
 #include "ntqmodules.h"
 #ifndef TQT_MODULE_DIALOGS
-# define QT_NO_DIALOG
+# define TQT_NO_DIALOG
 #endif
 #ifndef TQT_MODULE_NETWORK
-#define QT_NO_NETWORK
+#define TQT_NO_NETWORK
 #endif
 #ifndef TQT_MODULE_CANVAS
-# define QT_NO_CANVAS
+# define TQT_NO_CANVAS
 #endif
 #ifndef TQT_MODULE_TABLE
-#define QT_NO_TABLE
+#define TQT_NO_TABLE
 #endif
 #ifndef TQT_MODULE_XML
-# define QT_NO_XML
+# define TQT_NO_XML
 #endif
 #ifndef TQT_MODULE_OPENGL
-# define QT_NO_OPENGL
+# define TQT_NO_OPENGL
 #endif
 #if !defined(TQT_MODULE_SQL)
-# define QT_NO_SQL
+# define TQT_NO_SQL
 #endif
 
 #if defined(Q_WS_MAC9)
@@ -822,8 +822,8 @@ class TQDataStream;
 #  endif
 #endif
 
-#if !defined(Q_WS_QWS) && !defined(QT_NO_COP)
-#  define QT_NO_COP
+#if !defined(Q_WS_QWS) && !defined(TQT_NO_COP)
+#  define TQT_NO_COP
 #endif
 
 #ifndef QT_H
@@ -940,14 +940,14 @@ Q_EXPORT int qWinVersion();
 // Debugging and error handling
 //
 
-#if !defined(QT_NO_CHECK)
+#if !defined(TQT_NO_CHECK)
 #  define QT_CHECK_STATE			// check state of objects etc.
 #  define QT_CHECK_RANGE			// check range of indexes etc.
 #  define QT_CHECK_NULL				// check null pointers
 #  define QT_CHECK_MATH				// check math functions
 #endif
 
-#if !defined(QT_NO_DEBUG) && !defined(QT_DEBUG)
+#if !defined(TQT_NO_DEBUG) && !defined(QT_DEBUG)
 #  define QT_DEBUG				// display debug messages
 #  if !defined(TQT_NO_COMPAT)			// compatibility with TQt 2
 #    if !defined(NO_DEBUG) && !defined(DEBUG)
@@ -1071,13 +1071,13 @@ Q_EXPORT const char *tqInstallPathSysconf();
 /*
  Avoid some particularly useless warnings from some stupid compilers.
  To get ALL C++ compiler warnings, define QT_CC_WARNINGS or comment out
- the line "#define QT_NO_WARNINGS"
+ the line "#define TQT_NO_WARNINGS"
 */
 
 #if !defined(QT_CC_WARNINGS)
-#  define QT_NO_WARNINGS
+#  define TQT_NO_WARNINGS
 #endif
-#if defined(QT_NO_WARNINGS)
+#if defined(TQT_NO_WARNINGS)
 #  if defined(Q_CC_MSVC)
 #    pragma warning(disable: 4244) // 'conversion' conversion from 'type1' to 'type2', possible loss of data
 #    pragma warning(disable: 4275) // non - DLL-interface classkey 'identifier' used as base for DLL-interface classkey 'identifier'
diff --git a/src/tools/ntqgvector.h b/src/tools/ntqgvector.h
index 40667c6aa..ad4b81f9e 100644
--- a/src/tools/ntqgvector.h
+++ b/src/tools/ntqgvector.h
@@ -50,7 +50,7 @@ class Q_EXPORT TQGVector : public TQPtrCollection	// generic vector
 {
 friend class TQGList;				// needed by TQGList::toVector
 public:
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     TQDataStream &read( TQDataStream & );		// read vector from stream
     TQDataStream &write( TQDataStream & ) const;	// write vector to stream
 #endif
@@ -99,7 +99,7 @@ protected:
 
     void toList( TQGList * ) const;		// put items in list
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     virtual TQDataStream &read( TQDataStream &, Item & );
     virtual TQDataStream &write( TQDataStream &, Item ) const;
 #endif
@@ -116,7 +116,7 @@ private:
   TQGVector stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQGVector & );
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQGVector & );
 #endif
diff --git a/src/tools/ntqlibrary.h b/src/tools/ntqlibrary.h
index c6c92fd5c..046d86855 100644
--- a/src/tools/ntqlibrary.h
+++ b/src/tools/ntqlibrary.h
@@ -45,7 +45,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#ifndef QT_NO_LIBRARY
+#ifndef TQT_NO_LIBRARY
 
 class TQLibraryPrivate;
 
@@ -82,5 +82,5 @@ private:	// Disabled copy constructor and operator=
 
 #define Q_DEFINED_QLIBRARY
 #include "ntqwinexport.h"
-#endif //QT_NO_LIBRARY
+#endif //TQT_NO_LIBRARY
 #endif //TQLIBRARY_H
diff --git a/src/tools/ntqmap.h b/src/tools/ntqmap.h
index d098f79be..084fbd7cb 100644
--- a/src/tools/ntqmap.h
+++ b/src/tools/ntqmap.h
@@ -576,7 +576,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQMapPrivate::Iterator TQMapPrivate:
 
 
 #ifdef QT_CHECK_RANGE
-# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE )
+# if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_MAP_RANGE )
 #  define QT_CHECK_INVALID_MAP_ELEMENT if ( empty() ) tqWarning( "TQMap: Warning invalid element" )
 #  define QT_CHECK_INVALID_MAP_ELEMENT_FATAL Q_ASSERT( !empty() );
 # else
@@ -849,7 +849,7 @@ Q_INLINE_TEMPLATES void TQMap::detachInternal()
 }
 
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 template
 Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQMap& m ) {
     m.clear();
diff --git a/src/tools/ntqpair.h b/src/tools/ntqpair.h
index 60f73f961..cc6cca22e 100644
--- a/src/tools/ntqpair.h
+++ b/src/tools/ntqpair.h
@@ -90,7 +90,7 @@ Q_INLINE_TEMPLATES TQPair qMakePair( const T1& x, const T2& y )
     return TQPair( x, y );
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 template 
 inline TQDataStream& operator>>( TQDataStream& s, TQPair& p )
 {
diff --git a/src/tools/ntqregexp.h b/src/tools/ntqregexp.h
index d600e452f..c61437452 100644
--- a/src/tools/ntqregexp.h
+++ b/src/tools/ntqregexp.h
@@ -45,7 +45,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 class TQRegExpEngine;
 struct TQRegExpPrivate;
 
@@ -70,7 +70,7 @@ public:
     void setPattern( const TQString& pattern );
     bool caseSensitive() const;
     void setCaseSensitive( bool sensitive );
-#ifndef QT_NO_REGEXP_WILDCARD
+#ifndef TQT_NO_REGEXP_WILDCARD
     bool wildcard() const;
     void setWildcard( bool wildcard );
 #endif
@@ -96,7 +96,7 @@ public:
     int searchRev( const TQString& str, int offset, CaretMode caretMode ) const;
 #endif
     int matchedLength() const;
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     int numCaptures() const;
     TQStringList capturedTexts();
     TQString cap( int nth = 0 );
@@ -116,5 +116,5 @@ private:
     TQRegExpEngine *eng;
     TQRegExpPrivate *priv;
 };
-#endif // QT_NO_REGEXP
+#endif // TQT_NO_REGEXP
 #endif // TQREGEXP_H
diff --git a/src/tools/ntqsettings.h b/src/tools/ntqsettings.h
index f6a30dacc..a788d35f2 100644
--- a/src/tools/ntqsettings.h
+++ b/src/tools/ntqsettings.h
@@ -46,7 +46,7 @@
 #include "ntqstringlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_SETTINGS
+#ifndef TQT_NO_SETTINGS
 
 class TQSettingsPrivate;
 
@@ -155,5 +155,5 @@ private:
     friend class TQApplication;
 };
 
-#endif // QT_NO_SETTINGS
+#endif // TQT_NO_SETTINGS
 #endif // TQSETTINGS_H
diff --git a/src/tools/ntqstring.h b/src/tools/ntqstring.h
index b3c0a32cc..b1ad52b1a 100644
--- a/src/tools/ntqstring.h
+++ b/src/tools/ntqstring.h
@@ -46,7 +46,7 @@
 #include "ntqcstring.h"
 #endif // QT_H
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 #include 
 #endif
 
@@ -64,7 +64,7 @@
 #endif
 #endif
 
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_SPRINTF
 #include 
 #endif
 
@@ -206,7 +206,7 @@ public:
 #else
     ushort &unicode() { return ucs; }
 #endif
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     // like all ifdef'd code this is undocumented
     operator char() const { return latin1(); }
 #endif
@@ -405,7 +405,7 @@ public:
     TQString( const TQString & );                 // impl-shared copy
     TQString( const TQByteArray& );               // deep copy
     TQString( const TQChar* unicode, uint length ); // deep copy
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     TQString( const char *str );                 // deep copy
 #endif
 #ifndef TQT_NO_STL
@@ -452,7 +452,7 @@ public:
     TQString arg( const TQString& a1, const TQString& a2, const TQString& a3,
 		 const TQString& a4 ) const;
 
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_SPRINTF
     TQString    &sprintf( const char* format, ... )
 #if defined(Q_CC_GNU) && !defined(__INSURE__)
         __attribute__ ((format (printf, 2, 3)))
@@ -468,29 +468,29 @@ public:
     int         find( TQChar c, int index=0, bool cs=TRUE ) const;
     int         find( char c, int index=0, bool cs=TRUE ) const;
     int         find( const TQString &str, int index=0, bool cs=TRUE ) const;
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     int         find( const TQRegExp &, int index=0 ) const;
 #endif
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     int         find( const char* str, int index=0 ) const;
 #endif
     int         findRev( TQChar c, int index=-1, bool cs=TRUE) const;
     int         findRev( char c, int index=-1, bool cs=TRUE) const;
     int         findRev( const TQString &str, int index=-1, bool cs=TRUE) const;
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     int         findRev( const TQRegExp &, int index=-1 ) const;
 #endif
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     int         findRev( const char* str, int index=-1 ) const;
 #endif
     int         contains( TQChar c, bool cs=TRUE ) const;
     int         contains( char c, bool cs=TRUE ) const
                     { return contains(TQChar(c), cs); }
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     int         contains( const char* str, bool cs=TRUE ) const;
 #endif
     int         contains( const TQString &str, bool cs=TRUE ) const;
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     int         contains( const TQRegExp & ) const;
 #endif
 
@@ -503,11 +503,11 @@ public:
     };
     TQString     section( TQChar sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const;
     TQString     section( char sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const;
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     TQString      section( const char *in_sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const;
 #endif
     TQString     section( const TQString &in_sep, int start, int end = 0xffffffff, int flags = SectionDefault ) const;
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     TQString     section( const TQRegExp ®, int start, int end = 0xffffffff, int flags = SectionDefault ) const;
 #endif
 
@@ -525,7 +525,7 @@ public:
     TQString     simplifyWhiteSpace()    const;
 
     TQString    &insert( uint index, const TQString & );
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     TQString    &insert( uint index, const TQByteArray & );
     TQString    &insert( uint index, const char * );
 #endif
@@ -535,21 +535,21 @@ public:
     TQString    &append( char );
     TQString    &append( TQChar );
     TQString    &append( const TQString & );
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     TQString    &append( const TQByteArray & );
     TQString    &append( const char * );
 #endif
-#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII)
+#if !defined(TQT_NO_STL) && !defined(TQT_NO_CAST_ASCII)
     TQString    &append( const std::string& );
 #endif
     TQString    &prepend( char );
     TQString    &prepend( TQChar );
     TQString    &prepend( const TQString & );
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     TQString    &prepend( const TQByteArray & );
     TQString    &prepend( const char * );
 #endif
-#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII)
+#if !defined(TQT_NO_STL) && !defined(TQT_NO_CAST_ASCII)
     TQString    &prepend( const std::string& );
 #endif
     TQString    &remove( uint index, uint len );
@@ -563,10 +563,10 @@ public:
     TQString    &remove( TQChar c );
     TQString    &remove( char c )
     { return remove( TQChar(c) ); }
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     TQString    &remove( const char * );
 #endif
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     TQString    &remove( const TQRegExp & );
 #endif
     TQString    &replace( uint index, uint len, const TQString & );
@@ -594,7 +594,7 @@ public:
     TQString    &replace( const TQString &, const TQString & );
     TQString    &replace( const TQString &, const TQString &, bool );
 #endif
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     TQString    &replace( const TQRegExp &, const TQString & );
 #endif
     TQString    &replace( TQChar, TQChar );
@@ -632,11 +632,11 @@ public:
     void        setExpand( uint index, TQChar c );
 
     TQString    &operator+=( const TQString &str );
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     TQString    &operator+=( const TQByteArray &str );
     TQString    &operator+=( const char *str );
 #endif
-#if !defined(TQT_NO_STL) && !defined(QT_NO_CAST_ASCII)
+#if !defined(TQT_NO_STL) && !defined(TQT_NO_CAST_ASCII)
     TQString    &operator+=( const std::string& );
 #endif
     TQString    &operator+=( TQChar c );
@@ -685,7 +685,7 @@ public:
     static int localeAwareCompare( const TQString& s1, const TQString& s2 )
     { return s1.localeAwareCompare( s2 ); }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     friend Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & );
 #endif
 
@@ -730,7 +730,7 @@ private:
 
     void checkSimpleText() const;
     void grow( uint newLength );
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     TQString &insertHelper( uint index, const char *s, uint len=UINT_MAX );
     TQString &operatorPlusEqHelper( const char *s, uint len2=UINT_MAX );
 #endif
@@ -828,7 +828,7 @@ public:
 /*****************************************************************************
   TQString stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQString & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQString & );
 #endif
@@ -847,7 +847,7 @@ inline TQString TQString::section( TQChar sep, int start, int end, int flags ) c
 inline TQString TQString::section( char sep, int start, int end, int flags ) const
 { return section(TQChar(sep), start, end, flags); }
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 inline TQString TQString::section( const char *in_sep, int start, int end, int flags ) const
 { return section(TQString(in_sep), start, end, flags); }
 #endif
@@ -876,7 +876,7 @@ inline bool TQString::isEmpty() const
 inline TQString TQString::copy() const
 { return TQString( *this ); }
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 inline TQString &TQString::insert( uint index, const char *s )
 { return insertHelper( index, s ); }
 
@@ -896,12 +896,12 @@ inline TQString &TQString::prepend( TQChar c )
 inline TQString &TQString::prepend( char c )
 { return insert(0,c); }
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 inline TQString &TQString::prepend( const TQByteArray & s )
 { return insert(0,s); }
 #endif
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 inline TQString &TQString::operator+=( const TQByteArray &s )
 {
     int pos = s.find( 0 );
@@ -912,7 +912,7 @@ inline TQString &TQString::operator+=( const TQByteArray &s )
 inline TQString &TQString::append( const TQString & s )
 { return operator+=(s); }
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 inline TQString &TQString::append( const TQByteArray &s )
 { return operator+=(s); }
 
@@ -929,7 +929,7 @@ inline TQString &TQString::append( char c )
 #ifndef TQT_NO_STL
 inline TQString &TQString::operator=( const std::string& str )
 { return operator=(str.c_str()); }
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 inline TQString &TQString::operator+=( const std::string& s )
 { return operator+=(s.c_str()); }
 inline TQString &TQString::append( const std::string& s )
@@ -986,7 +986,7 @@ inline int TQString::find( char c, int index, bool cs ) const
 inline int TQString::findRev( char c, int index, bool cs ) const
 { return findRev( TQChar(c), index, cs ); }
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 inline int TQString::find( const char* str, int index ) const
 { return find(TQString::fromAscii(str), index); }
 
@@ -1005,7 +1005,7 @@ Q_EXPORT bool operator<=( const TQString &s1, const TQString &s2 );
 Q_EXPORT bool operator==( const TQString &s1, const TQString &s2 );
 Q_EXPORT bool operator>( const TQString &s1, const TQString &s2 );
 Q_EXPORT bool operator>=( const TQString &s1, const TQString &s2 );
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 Q_EXPORT bool operator!=( const TQString &s1, const char *s2 );
 Q_EXPORT bool operator<( const TQString &s1, const char *s2 );
 Q_EXPORT bool operator<=( const TQString &s1, const char *s2 );
@@ -1027,7 +1027,7 @@ Q_EXPORT inline const TQString operator+( const TQString &s1, const TQString &s2
     return tmp;
 }
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 Q_EXPORT inline const TQString operator+( const TQString &s1, const char *s2 )
 {
     TQString tmp( s1 );
diff --git a/src/tools/ntqstringlist.h b/src/tools/ntqstringlist.h
index b5f857d5c..5fc82435d 100644
--- a/src/tools/ntqstringlist.h
+++ b/src/tools/ntqstringlist.h
@@ -47,7 +47,7 @@
 #include "ntqstrlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 
 class TQRegExp;
 template  class TQDeepCopy;
@@ -65,7 +65,7 @@ public:
     TQStringList( const TQStringList& l ) : TQValueList(l) { }
     TQStringList( const TQValueList& l ) : TQValueList(l) { }
     TQStringList( const TQString& i ) { append(i); }
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
     TQStringList( const char* i ) { append(i); }
 #endif
 
@@ -75,19 +75,19 @@ public:
 
     static TQStringList split( const TQString &sep, const TQString &str, bool allowEmptyEntries = FALSE );
     static TQStringList split( const TQChar &sep, const TQString &str, bool allowEmptyEntries = FALSE );
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     static TQStringList split( const TQRegExp &sep, const TQString &str, bool allowEmptyEntries = FALSE );
 #endif
     TQString join( const TQString &sep ) const;
 
     TQStringList grep( const TQString &str, bool cs = TRUE ) const;
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
     TQStringList grep( const TQRegExp &expr ) const;
 #endif
 
     TQStringList& gres( const TQString &before, const TQString &after,
 		       bool cs = TRUE );
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     TQStringList& gres( const TQRegExp &expr, const TQString &after );
 #endif
 
@@ -96,11 +96,11 @@ protected:
     friend class TQDeepCopy< TQStringList >;
 };
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 class TQDataStream;
 extern Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQStringList& );
 extern Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQStringList& );
 #endif
 
-#endif // QT_NO_STRINGLIST
+#endif // TQT_NO_STRINGLIST
 #endif // TQSTRINGLIST_H
diff --git a/src/tools/ntqstrlist.h b/src/tools/ntqstrlist.h
index 1f346ad5d..2d278a1e8 100644
--- a/src/tools/ntqstrlist.h
+++ b/src/tools/ntqstrlist.h
@@ -68,7 +68,7 @@ private:
     void deleteItem( TQPtrCollection::Item d ) { if ( del_item ) delete[] (char*)d; }
     int compareItems( TQPtrCollection::Item s1, TQPtrCollection::Item s2 ) { return qstrcmp((const char*)s1,
 							 (const char*)s2); }
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     TQDataStream &read( TQDataStream &s, TQPtrCollection::Item &d )
 				{ s >> (char *&)d; return s; }
     TQDataStream &write( TQDataStream &s, TQPtrCollection::Item d ) const
diff --git a/src/tools/ntqstrvec.h b/src/tools/ntqstrvec.h
index f69f6273b..a1c538663 100644
--- a/src/tools/ntqstrvec.h
+++ b/src/tools/ntqstrvec.h
@@ -59,7 +59,7 @@ private:
     int	 compareItems( Item s1, Item s2 )
 				{ return qstrcmp((const char*)s1,
 						(const char*)s2); }
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     TQDataStream &read( TQDataStream &s, Item &d )
 				{ s >> (char *&)d; return s; }
     TQDataStream &write( TQDataStream &s, Item d ) const
diff --git a/src/tools/ntqtextstream.h b/src/tools/ntqtextstream.h
index 609cd0dcd..7e7345d91 100644
--- a/src/tools/ntqtextstream.h
+++ b/src/tools/ntqtextstream.h
@@ -47,7 +47,7 @@
 #include 
 #endif // QT_H
 
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
 class TQTextCodec;
 class TQTextDecoder;
 
@@ -60,7 +60,7 @@ public:
 		    UnicodeReverse, RawUnicode, UnicodeUTF8 };
 
     void	setEncoding( Encoding );
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     void	setCodec( TQTextCodec* );
     TQTextCodec *codec();
 #endif
@@ -337,5 +337,5 @@ Q_EXPORT inline TQTSManip qSetPrecision( int p )
     return TQTSManip(func,p);
 }
 
-#endif // QT_NO_TEXTSTREAM
+#endif // TQT_NO_TEXTSTREAM
 #endif // TQTEXTSTREAM_H
diff --git a/src/tools/ntqtl.h b/src/tools/ntqtl.h
index ee601c157..a282b9c9c 100644
--- a/src/tools/ntqtl.h
+++ b/src/tools/ntqtl.h
@@ -47,7 +47,7 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
 template 
 class TQTextOStreamIterator
 {
@@ -69,7 +69,7 @@ public:
     TQTextOStreamIterator& operator++() { return *this; }
     TQTextOStreamIterator& operator++(int) { return *this; }
 };
-#endif //QT_NO_TEXTSTREAM
+#endif //TQT_NO_TEXTSTREAM
 
 template 
 inline OutputIterator tqCopy( InputIterator _begin, InputIterator _end,
diff --git a/src/tools/ntquuid.h b/src/tools/ntquuid.h
index f518f3e75..317a0af82 100644
--- a/src/tools/ntquuid.h
+++ b/src/tools/ntquuid.h
@@ -101,7 +101,7 @@ struct Q_EXPORT TQUuid
     {
 	memcpy( this, &uuid, sizeof(TQUuid) );
     }
-#ifndef QT_NO_QUUID_STRING
+#ifndef TQT_NO_QUUID_STRING
     TQUuid( const TQString & );
     TQUuid( const char * );
     TQString toString() const;
@@ -186,7 +186,7 @@ struct Q_EXPORT TQUuid
     uchar   data4[ 8 ];
 };
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator<<( TQDataStream &, const TQUuid & );
 Q_EXPORT TQDataStream &operator>>( TQDataStream &, TQUuid & );
 #endif
diff --git a/src/tools/ntqvaluelist.h b/src/tools/ntqvaluelist.h
index 677c0cf51..c6711830d 100644
--- a/src/tools/ntqvaluelist.h
+++ b/src/tools/ntqvaluelist.h
@@ -399,7 +399,7 @@ Q_INLINE_TEMPLATES void TQValueListPrivate::clear()
 }
 
 #ifdef QT_CHECK_RANGE
-# if !defined( QT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE )
+# if !defined( TQT_NO_DEBUG ) && defined( QT_CHECK_VALUELIST_RANGE )
 #  define QT_CHECK_INVALID_LIST_ELEMENT if ( empty() ) tqWarning( "TQValueList: Warning invalid element" )
 #  define QT_CHECK_INVALID_LIST_ELEMENT_FATAL Q_ASSERT( !empty() );
 # else
@@ -648,7 +648,7 @@ Q_INLINE_TEMPLATES TQValueList& TQValueList::operator+= ( const TQValueLis
     return *this;
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 template 
 Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueList& l )
 {
@@ -673,7 +673,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueList<
 	s << *it;
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
 #define Q_DEFINED_QVALUELIST
 #define Q_DEFINED_QVALUELIST
diff --git a/src/tools/ntqvaluevector.h b/src/tools/ntqvaluevector.h
index 7bc80c640..87dfd7482 100644
--- a/src/tools/ntqvaluevector.h
+++ b/src/tools/ntqvaluevector.h
@@ -542,7 +542,7 @@ Q_INLINE_TEMPLATES Q_TYPENAME TQValueVector::iterator TQValueVector::inser
 }
 
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 template
 Q_INLINE_TEMPLATES TQDataStream& operator>>( TQDataStream& s, TQValueVector& v )
 {
@@ -570,7 +570,7 @@ Q_INLINE_TEMPLATES TQDataStream& operator<<( TQDataStream& s, const TQValueVecto
 	s << *it;
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
 #define Q_DEFINED_QVALUEVECTOR
 #include "ntqwinexport.h"
diff --git a/src/tools/qbitarray.cpp b/src/tools/qbitarray.cpp
index ec8503276..5fac8222b 100644
--- a/src/tools/qbitarray.cpp
+++ b/src/tools/qbitarray.cpp
@@ -629,7 +629,7 @@ TQBitArray operator^( const TQBitArray &a1, const TQBitArray &a2 )
 
     \sa \link datastreamformat.html Format of the TQDataStream operators \endlink
 */
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 TQDataStream &operator<<( TQDataStream &s, const TQBitArray &a )
 {
     TQ_UINT32 len = a.size();
@@ -662,4 +662,4 @@ TQDataStream &operator>>( TQDataStream &s, TQBitArray &a )
     return s;
 }
 
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h
index afb122855..cc4e381f9 100644
--- a/src/tools/qcom_p.h
+++ b/src/tools/qcom_p.h
@@ -60,7 +60,7 @@
 #pragma GCC system_header
 #endif
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 class TQObject;
 struct TQUInterfaceDescription;
@@ -339,6 +339,6 @@ public:		   \
 #    define Q_EXPORT_INTERFACE() Q_EXPORT_COMPONENT()
 #endif
 
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
 #endif //TQCOM_P_H
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp
index 60899a6ab..20366db9a 100644
--- a/src/tools/qcomlibrary.cpp
+++ b/src/tools/qcomlibrary.cpp
@@ -38,7 +38,7 @@
 
 #include "qcomlibrary_p.h"
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 #include 
 #include 
 #include 
@@ -535,4 +535,4 @@ uint TQComLibrary::qtVersion()
 }
 
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
diff --git a/src/tools/qcomlibrary_p.h b/src/tools/qcomlibrary_p.h
index 201ca476d..8d53e2952 100644
--- a/src/tools/qcomlibrary_p.h
+++ b/src/tools/qcomlibrary_p.h
@@ -56,7 +56,7 @@
 #include "ntqlibrary.h"
 #endif // QT_H
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 class Q_EXPORT TQComLibrary : public TQLibrary
 {
@@ -77,6 +77,6 @@ private:
 
 };
 
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
 #endif
diff --git a/src/tools/qcomponentfactory.cpp b/src/tools/qcomponentfactory.cpp
index 09bb358ad..12fe33e10 100644
--- a/src/tools/qcomponentfactory.cpp
+++ b/src/tools/qcomponentfactory.cpp
@@ -40,7 +40,7 @@
 
 #include "qcomponentfactory_p.h"
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 #include "ntqsettings.h"
 #include 
 #include "ntqdir.h"
@@ -352,4 +352,4 @@ bool TQComponentFactory::unregisterComponent( const TQUuid &cid )
     return ok;
 }
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
diff --git a/src/tools/qcomponentfactory_p.h b/src/tools/qcomponentfactory_p.h
index a157ffde8..0c343c74d 100644
--- a/src/tools/qcomponentfactory_p.h
+++ b/src/tools/qcomponentfactory_p.h
@@ -57,7 +57,7 @@
 //
 //
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 class Q_EXPORT TQComponentFactory
 {
@@ -71,6 +71,6 @@ public:
     static bool unregisterComponent( const TQUuid &cid );
 };
 
-#endif // QT_NO_COMPONENT
+#endif // TQT_NO_COMPONENT
 
 #endif // TQCOMPONENTFACTORY_P_H
diff --git a/src/tools/qconfig-large.h b/src/tools/qconfig-large.h
index 1ce4e78cc..1f169fe14 100644
--- a/src/tools/qconfig-large.h
+++ b/src/tools/qconfig-large.h
@@ -1,42 +1,42 @@
 #ifndef QT_H
 #endif /* QT_H */
-#ifndef QT_NO_CODECS
-#define QT_NO_CODECS
+#ifndef TQT_NO_CODECS
+#define TQT_NO_CODECS
 #endif
-#define QT_NO_UNICODETABLES
-#define QT_NO_IMAGEIO_BMP
-#define QT_NO_IMAGEIO_PPM
-#define QT_NO_ASYNC_IO
-#define QT_NO_ASYNC_IMAGE_IO
-/* #define QT_NO_FREETYPE */
-#define QT_NO_BDF
-//#define QT_NO_FONTDATABASE
+#define TQT_NO_UNICODETABLES
+#define TQT_NO_IMAGEIO_BMP
+#define TQT_NO_IMAGEIO_PPM
+#define TQT_NO_ASYNC_IO
+#define TQT_NO_ASYNC_IMAGE_IO
+/* #define TQT_NO_FREETYPE */
+#define TQT_NO_BDF
+//#define TQT_NO_FONTDATABASE
 #define TQT_NO_TRANSLATION
-#define QT_NO_DRAGANDDROP
-#define QT_NO_CLIPBOARD
-#define QT_NO_SOUND
-#define QT_NO_PROPERTIES
-#define QT_NO_DNS
-#define QT_NO_NETWORKPROTOCOL
-#define QT_NO_URL
-#define QT_NO_COLORNAMES
-#define QT_NO_TRANSFORMATIONS
-#define QT_NO_PRINTER
-#define QT_NO_PICTURE
-#define QT_NO_ICONVIEW
-#define QT_NO_DIAL
-#define QT_NO_WORKSPACE
-#define QT_NO_TABLE
-#define QT_NO_ACTION
-#define QT_NO_STYLE_MOTIF
-#define QT_NO_STYLE_PLATINUM
-/* #define QT_NO_FILEDIALOG */
-#define QT_NO_FONTDIALOG
-#define QT_NO_PRINTDIALOG
-/* #define QT_NO_COLORDIALOG */
-#define QT_NO_INPUTDIALOG
-/* #define QT_NO_MESSAGEBOX */
-#define QT_NO_PROGRESSDIALOG
-/* #define QT_NO_TABDIALOG */
-#define QT_NO_WIZARD
-#define QT_NO_EFFECTS
+#define TQT_NO_DRAGANDDROP
+#define TQT_NO_CLIPBOARD
+#define TQT_NO_SOUND
+#define TQT_NO_PROPERTIES
+#define TQT_NO_DNS
+#define TQT_NO_NETWORKPROTOCOL
+#define TQT_NO_URL
+#define TQT_NO_COLORNAMES
+#define TQT_NO_TRANSFORMATIONS
+#define TQT_NO_PRINTER
+#define TQT_NO_PICTURE
+#define TQT_NO_ICONVIEW
+#define TQT_NO_DIAL
+#define TQT_NO_WORKSPACE
+#define TQT_NO_TABLE
+#define TQT_NO_ACTION
+#define TQT_NO_STYLE_MOTIF
+#define TQT_NO_STYLE_PLATINUM
+/* #define TQT_NO_FILEDIALOG */
+#define TQT_NO_FONTDIALOG
+#define TQT_NO_PRINTDIALOG
+/* #define TQT_NO_COLORDIALOG */
+#define TQT_NO_INPUTDIALOG
+/* #define TQT_NO_MESSAGEBOX */
+#define TQT_NO_PROGRESSDIALOG
+/* #define TQT_NO_TABDIALOG */
+#define TQT_NO_WIZARD
+#define TQT_NO_EFFECTS
diff --git a/src/tools/qconfig-medium.h b/src/tools/qconfig-medium.h
index e10291188..23a305738 100644
--- a/src/tools/qconfig-medium.h
+++ b/src/tools/qconfig-medium.h
@@ -1,108 +1,108 @@
 #ifndef QT_H
 #endif /* QT_H */
-#ifndef QT_NO_TEXTCODEC /* moc? */
-#define QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC /* moc? */
+#define TQT_NO_TEXTCODEC
 #endif
-#define QT_NO_UNICODETABLES
-#define QT_NO_IMAGEIO_BMP
-#define QT_NO_IMAGEIO_PPM
-/* #define QT_NO_IMAGEIO_PNG */
-#define QT_NO_ASYNC_IO
-#define QT_NO_ASYNC_IMAGE_IO
-/* #define QT_NO_FREETYPE */
-#define QT_NO_BDF
-//#define QT_NO_FONTDATABASE
+#define TQT_NO_UNICODETABLES
+#define TQT_NO_IMAGEIO_BMP
+#define TQT_NO_IMAGEIO_PPM
+/* #define TQT_NO_IMAGEIO_PNG */
+#define TQT_NO_ASYNC_IO
+#define TQT_NO_ASYNC_IMAGE_IO
+/* #define TQT_NO_FREETYPE */
+#define TQT_NO_BDF
+//#define TQT_NO_FONTDATABASE
 #define TQT_NO_TRANSLATION
-#define QT_NO_DRAGANDDROP
-#define QT_NO_CLIPBOARD
-#define QT_NO_SOUND
-#define QT_NO_PROPERTIES
-#define QT_NO_DNS
-#define QT_NO_NETWORKPROTOCOL
-#define QT_NO_COLORNAMES
-#define QT_NO_TRANSFORMATIONS
-#define QT_NO_PRINTER
-#define QT_NO_PICTURE
-#define QT_NO_ICONVIEW
-#define QT_NO_DIAL
-#define QT_NO_WORKSPACE
-#define QT_NO_TABLE
-#define QT_NO_ACTION
-#define QT_NO_STYLE_MOTIF
-#define QT_NO_STYLE_PLATINUM
-/* #define QT_NO_FILEDIALOG */
-#define QT_NO_FONTDIALOG
-#define QT_NO_PRINTDIALOG
-/* #define QT_NO_COLORDIALOG */
-#define QT_NO_INPUTDIALOG
-/* #define QT_NO_MESSAGEBOX */
-#define QT_NO_PROGRESSDIALOG
-/* #define QT_NO_TABDIALOG */
-#define QT_NO_WIZARD
-#define QT_NO_EFFECTS
-
-
-#define QT_NO_MIME
-/* #define QT_NO_NETWORK //??? means single-process only */
-
-
-#define QT_NO_IMAGE_TRUECOLOR
-/* #define QT_NO_IMAGE_SMOOTHSCALE  //needed for iconset --> pushbutton */
-#define QT_NO_IMAGE_TEXT
-#define QT_NO_DIR
-
-/* #define QT_NO_TEXTSTREAM */
-#define QT_NO_DATASTREAM
-#define QT_NO_QWS_SAVEFONTS
-
-#define QT_NO_SESSIONMANAGER
-
-
-/* #define QT_NO_DIALOG */
-
-#define QT_NO_SEMIMODAL
-
-#define QT_NO_EFFECTS
-#define QT_NO_COP
-
-#define QT_NO_QWS_PROPERTIES
-
-/* #define QT_NO_RANGECONTROL */
-/* #define QT_NO_SPLITTER */
-#define QT_NO_STATUSBAR
-#define QT_NO_TABBAR
-#define QT_NO_TOOLBAR
-#define QT_NO_TOOLTIP
-/* #define QT_NO_VALIDATOR */
-#define QT_NO_WHATSTHIS
-#define QT_NO_WIDGETSTACK
-#define QT_NO_ACCEL
-#define QT_NO_SIZEGRIP
-#define QT_NO_HEADER
-#define QT_NO_WORKSPACE
-#define QT_NO_LCDNUMBER
-#define QT_NO_STYLE_MOTIF
-#define QT_NO_STYLE_PLATINUM
-#define QT_NO_PROGRESSBAR
-
-#define QT_NO_ICONVIEW
-#define QT_NO_DIAL
-
-#define QT_NO_TABLE
-
-/* #define QT_NO_FILEDIALOG */
-#define QT_NO_FONTDIALOG
-#define QT_NO_PRINTDIALOG
-#define QT_NO_COLORDIALOG
-#define QT_NO_INPUTDIALOG
-/* #define QT_NO_MESSAGEBOX */
-#define QT_NO_PROGRESSDIALOG
-/* #define QT_NO_TABDIALOG */
-#define QT_NO_WIZARD
-#define QT_NO_EFFECTS
-
-/* #define QT_NO_QWS_HYDRO_WM_STYLE */
-#define QT_NO_QWS_BEOS_WM_STYLE
-#define QT_NO_QWS_KDE2_WM_STYLE
-#define QT_NO_QWS_KDE_WM_STYLE
-/* #define QT_NO_QWS_WINDOWS_WM_STYLE */
+#define TQT_NO_DRAGANDDROP
+#define TQT_NO_CLIPBOARD
+#define TQT_NO_SOUND
+#define TQT_NO_PROPERTIES
+#define TQT_NO_DNS
+#define TQT_NO_NETWORKPROTOCOL
+#define TQT_NO_COLORNAMES
+#define TQT_NO_TRANSFORMATIONS
+#define TQT_NO_PRINTER
+#define TQT_NO_PICTURE
+#define TQT_NO_ICONVIEW
+#define TQT_NO_DIAL
+#define TQT_NO_WORKSPACE
+#define TQT_NO_TABLE
+#define TQT_NO_ACTION
+#define TQT_NO_STYLE_MOTIF
+#define TQT_NO_STYLE_PLATINUM
+/* #define TQT_NO_FILEDIALOG */
+#define TQT_NO_FONTDIALOG
+#define TQT_NO_PRINTDIALOG
+/* #define TQT_NO_COLORDIALOG */
+#define TQT_NO_INPUTDIALOG
+/* #define TQT_NO_MESSAGEBOX */
+#define TQT_NO_PROGRESSDIALOG
+/* #define TQT_NO_TABDIALOG */
+#define TQT_NO_WIZARD
+#define TQT_NO_EFFECTS
+
+
+#define TQT_NO_MIME
+/* #define TQT_NO_NETWORK //??? means single-process only */
+
+
+#define TQT_NO_IMAGE_TRUECOLOR
+/* #define TQT_NO_IMAGE_SMOOTHSCALE  //needed for iconset --> pushbutton */
+#define TQT_NO_IMAGE_TEXT
+#define TQT_NO_DIR
+
+/* #define TQT_NO_TEXTSTREAM */
+#define TQT_NO_DATASTREAM
+#define TQT_NO_QWS_SAVEFONTS
+
+#define TQT_NO_SESSIONMANAGER
+
+
+/* #define TQT_NO_DIALOG */
+
+#define TQT_NO_SEMIMODAL
+
+#define TQT_NO_EFFECTS
+#define TQT_NO_COP
+
+#define TQT_NO_QWS_PROPERTIES
+
+/* #define TQT_NO_RANGECONTROL */
+/* #define TQT_NO_SPLITTER */
+#define TQT_NO_STATUSBAR
+#define TQT_NO_TABBAR
+#define TQT_NO_TOOLBAR
+#define TQT_NO_TOOLTIP
+/* #define TQT_NO_VALIDATOR */
+#define TQT_NO_WHATSTHIS
+#define TQT_NO_WIDGETSTACK
+#define TQT_NO_ACCEL
+#define TQT_NO_SIZEGRIP
+#define TQT_NO_HEADER
+#define TQT_NO_WORKSPACE
+#define TQT_NO_LCDNUMBER
+#define TQT_NO_STYLE_MOTIF
+#define TQT_NO_STYLE_PLATINUM
+#define TQT_NO_PROGRESSBAR
+
+#define TQT_NO_ICONVIEW
+#define TQT_NO_DIAL
+
+#define TQT_NO_TABLE
+
+/* #define TQT_NO_FILEDIALOG */
+#define TQT_NO_FONTDIALOG
+#define TQT_NO_PRINTDIALOG
+#define TQT_NO_COLORDIALOG
+#define TQT_NO_INPUTDIALOG
+/* #define TQT_NO_MESSAGEBOX */
+#define TQT_NO_PROGRESSDIALOG
+/* #define TQT_NO_TABDIALOG */
+#define TQT_NO_WIZARD
+#define TQT_NO_EFFECTS
+
+/* #define TQT_NO_QWS_HYDRO_WM_STYLE */
+#define TQT_NO_QWS_BEOS_WM_STYLE
+#define TQT_NO_QWS_KDE2_WM_STYLE
+#define TQT_NO_QWS_KDE_WM_STYLE
+/* #define TQT_NO_QWS_WINDOWS_WM_STYLE */
diff --git a/src/tools/qconfig-minimal.h b/src/tools/qconfig-minimal.h
index e08cd5e29..4a4b87899 100644
--- a/src/tools/qconfig-minimal.h
+++ b/src/tools/qconfig-minimal.h
@@ -1,97 +1,97 @@
 #ifndef QT_H
 #endif /* QT_H */
 
-#ifndef QT_NO_CHECK
-# define QT_NO_CHECK
+#ifndef TQT_NO_CHECK
+# define TQT_NO_CHECK
 #endif
-#define QT_NO_PROCESS
-#define QT_NO_PALETTE
-#define QT_NO_ACTION
-#ifndef QT_NO_TEXTCODEC /* moc? */
-#define QT_NO_TEXTCODEC
+#define TQT_NO_PROCESS
+#define TQT_NO_PALETTE
+#define TQT_NO_ACTION
+#ifndef TQT_NO_TEXTCODEC /* moc? */
+#define TQT_NO_TEXTCODEC
 #endif
-#define QT_NO_UNICODETABLES
-#define QT_NO_IMAGEIO_BMP
-#define QT_NO_IMAGEIO_PPM
-#define QT_NO_IMAGEIO_XBM
-#define QT_NO_IMAGEIO_XPM
-/* #define QT_NO_IMAGEIO_PNG //done by configure -no-png */
-#define QT_NO_ASYNC_IO
-#define QT_NO_ASYNC_IMAGE_IO
-/* //#define QT_NO_FREETYPE //done by configure -no-freetype */
-#define QT_NO_BDF
-//#define QT_NO_FONTDATABASE
+#define TQT_NO_UNICODETABLES
+#define TQT_NO_IMAGEIO_BMP
+#define TQT_NO_IMAGEIO_PPM
+#define TQT_NO_IMAGEIO_XBM
+#define TQT_NO_IMAGEIO_XPM
+/* #define TQT_NO_IMAGEIO_PNG //done by configure -no-png */
+#define TQT_NO_ASYNC_IO
+#define TQT_NO_ASYNC_IMAGE_IO
+/* //#define TQT_NO_FREETYPE //done by configure -no-freetype */
+#define TQT_NO_BDF
+//#define TQT_NO_FONTDATABASE
 #define TQT_NO_TRANSLATION
-#define QT_NO_MIME
-#define QT_NO_SOUND
-/* #define QT_NO_PROPERTIES */
-#define QT_NO_QWS_CURSOR
-#define QT_NO_CURSOR
-#define QT_NO_QWS_GFX_SPEED
-#define QT_NO_NETWORK
-#define QT_NO_COLORNAMES
-#define QT_NO_TRANSFORMATIONS
-#define QT_NO_PRINTER
-#define QT_NO_PICTURE
-#define QT_NO_LAYOUT
-#define QT_NO_DRAWUTIL
-#define QT_NO_IMAGE_TRUECOLOR
-#define QT_NO_IMAGE_SMOOTHSCALE
-#define QT_NO_IMAGE_TEXT
-#define QT_NO_DIR
-#define QT_NO_QWS_MANAGER
-#define QT_NO_TEXTSTREAM
-#define QT_NO_DATASTREAM
-#define QT_NO_QWS_SAVEFONTS
-//#define QT_NO_STRINGLIST
-#define QT_NO_TEMPLATE_VARIANT
-#define QT_NO_SESSIONMANAGER
-#define QT_NO_QWS_KEYBOARD
-#define QT_NO_SYNTAXHIGHLIGHTER
-
-#define QT_NO_ACCEL
-#define QT_NO_BUTTON
-#define QT_NO_DIALOG
-#define QT_NO_FRAME
-#define QT_NO_SEMIMODAL
-
-#define QT_NO_STYLE
-#define QT_NO_EFFECTS
-#define QT_NO_COP
-
-#define QT_NO_SQL
-
-#define QT_NO_REGEXP_CAPTURE
-#define QT_NO_REGEXP_WILDCARD
-
-#define QT_NO_VALIDATOR
-#define QT_NO_SPRINTF
-
-#define QT_NO_REGEXP
-
-#define QT_NO_IMAGEIO
-
-/* #define QT_NO_VARIANT //needed for signals/slots */
-
-#define QT_NO_RANGECONTROL
-#define QT_NO_QUUID_STRING
-#define QT_NO_SIGNALMAPPER
-
-#define QT_NO_WHEELEVENT
-#define QT_NO_BEZIER
-
-#define QT_NO_QWS_MOUSE_AUTO
-/* #define QT_NO_QWS_MOUSE_MANUAL */
-
-#define QT_NO_IMAGE_DITHER_TO_1
-#define QT_NO_IMAGE_HEURISTIC_MASK
-#define QT_NO_IMAGE_MIRROR
+#define TQT_NO_MIME
+#define TQT_NO_SOUND
+/* #define TQT_NO_PROPERTIES */
+#define TQT_NO_QWS_CURSOR
+#define TQT_NO_CURSOR
+#define TQT_NO_QWS_GFX_SPEED
+#define TQT_NO_NETWORK
+#define TQT_NO_COLORNAMES
+#define TQT_NO_TRANSFORMATIONS
+#define TQT_NO_PRINTER
+#define TQT_NO_PICTURE
+#define TQT_NO_LAYOUT
+#define TQT_NO_DRAWUTIL
+#define TQT_NO_IMAGE_TRUECOLOR
+#define TQT_NO_IMAGE_SMOOTHSCALE
+#define TQT_NO_IMAGE_TEXT
+#define TQT_NO_DIR
+#define TQT_NO_QWS_MANAGER
+#define TQT_NO_TEXTSTREAM
+#define TQT_NO_DATASTREAM
+#define TQT_NO_QWS_SAVEFONTS
+//#define TQT_NO_STRINGLIST
+#define TQT_NO_TEMPLATE_VARIANT
+#define TQT_NO_SESSIONMANAGER
+#define TQT_NO_QWS_KEYBOARD
+#define TQT_NO_SYNTAXHIGHLIGHTER
+
+#define TQT_NO_ACCEL
+#define TQT_NO_BUTTON
+#define TQT_NO_DIALOG
+#define TQT_NO_FRAME
+#define TQT_NO_SEMIMODAL
+
+#define TQT_NO_STYLE
+#define TQT_NO_EFFECTS
+#define TQT_NO_COP
+
+#define TQT_NO_SQL
+
+#define TQT_NO_REGEXP_CAPTURE
+#define TQT_NO_REGEXP_WILDCARD
+
+#define TQT_NO_VALIDATOR
+#define TQT_NO_SPRINTF
+
+#define TQT_NO_REGEXP
+
+#define TQT_NO_IMAGEIO
+
+/* #define TQT_NO_VARIANT //needed for signals/slots */
+
+#define TQT_NO_RANGECONTROL
+#define TQT_NO_QUUID_STRING
+#define TQT_NO_SIGNALMAPPER
+
+#define TQT_NO_WHEELEVENT
+#define TQT_NO_BEZIER
+
+#define TQT_NO_QWS_MOUSE_AUTO
+/* #define TQT_NO_QWS_MOUSE_MANUAL */
+
+#define TQT_NO_IMAGE_DITHER_TO_1
+#define TQT_NO_IMAGE_HEURISTIC_MASK
+#define TQT_NO_IMAGE_MIRROR
 
 #ifndef TQT_NO_STL
 # define TQT_NO_STL
 #endif
 
-#define QT_NO_DATESTRING
-#define QT_NO_WMATRIX
+#define TQT_NO_DATESTRING
+#define TQT_NO_WMATRIX
 
-#define QT_NO_DIRECTPAINTER
+#define TQT_NO_DIRECTPAINTER
diff --git a/src/tools/qconfig-small.h b/src/tools/qconfig-small.h
index 225098272..4190ec926 100644
--- a/src/tools/qconfig-small.h
+++ b/src/tools/qconfig-small.h
@@ -2,93 +2,93 @@
 #ifndef QT_H
 #endif /* QT_H */
 
-#define QT_NO_ACTION
-#ifndef QT_NO_TEXTCODEC /* moc? */
-#define QT_NO_TEXTCODEC
+#define TQT_NO_ACTION
+#ifndef TQT_NO_TEXTCODEC /* moc? */
+#define TQT_NO_TEXTCODEC
 #endif
-#define QT_NO_UNICODETABLES
-#define QT_NO_IMAGEIO_BMP
-#define QT_NO_IMAGEIO_PPM
-#define QT_NO_IMAGEIO_XBM
-#define QT_NO_IMAGEIO_XPM
-/* #define QT_NO_IMAGEIO_PNG //done by configure -no-png */
-#define QT_NO_ASYNC_IO
-#define QT_NO_ASYNC_IMAGE_IO
-/* #define QT_NO_FREETYPE //done by configure -no-freetype */
-#define QT_NO_BDF
-//#define QT_NO_FONTDATABASE
+#define TQT_NO_UNICODETABLES
+#define TQT_NO_IMAGEIO_BMP
+#define TQT_NO_IMAGEIO_PPM
+#define TQT_NO_IMAGEIO_XBM
+#define TQT_NO_IMAGEIO_XPM
+/* #define TQT_NO_IMAGEIO_PNG //done by configure -no-png */
+#define TQT_NO_ASYNC_IO
+#define TQT_NO_ASYNC_IMAGE_IO
+/* #define TQT_NO_FREETYPE //done by configure -no-freetype */
+#define TQT_NO_BDF
+//#define TQT_NO_FONTDATABASE
 #define TQT_NO_TRANSLATION
-#define QT_NO_MIME
-#define QT_NO_SOUND
-#define QT_NO_PROPERTIES
-#define QT_NO_SYNTAXHIGHLIGHTER
-
-#define QT_NO_QWS_GFX_SPEED
-#define QT_NO_NETWORK /* ?????????????? */
-#define QT_NO_COLORNAMES
-#define QT_NO_TRANSFORMATIONS
-#define QT_NO_PRINTER
-#define QT_NO_PICTURE
-
-#define QT_NO_IMAGE_TRUECOLOR
-/* #define QT_NO_IMAGE_SMOOTHSCALE  //needed for iconset --> pushbutton */
-#define QT_NO_IMAGE_TEXT
-#define QT_NO_DIR
-
-#define QT_NO_TEXTSTREAM
-#define QT_NO_DATASTREAM
-#define QT_NO_QWS_SAVEFONTS
-//#define QT_NO_STRINGLIST
-#define QT_NO_SESSIONMANAGER
-
-
-#define QT_NO_DIALOG
-
-#define QT_NO_SEMIMODAL
-
-/* #define QT_NO_STYLE //will require substantial work... */
-
-#define QT_NO_EFFECTS
-#define QT_NO_COP
-
-#define QT_NO_QWS_PROPERTIES
-
-#define QT_NO_RANGECONTROL
-#define QT_NO_SPLITTER
-#define QT_NO_STATUSBAR
-#define QT_NO_TABBAR
-#define QT_NO_TOOLBAR
-#define QT_NO_TOOLTIP
-#define QT_NO_VALIDATOR
-#define QT_NO_WHATSTHIS
-#define QT_NO_WIDGETSTACK
-#define QT_NO_ACCEL
-#define QT_NO_SIZEGRIP
-#define QT_NO_HEADER
-#define QT_NO_WORKSPACE
-#define QT_NO_LCDNUMBER
-#define QT_NO_STYLE_MOTIF
-#define QT_NO_STYLE_PLATINUM
-#define QT_NO_PROGRESSBAR
-
-
-#define QT_NO_QWS_HYDRO_WM_STYLE
-#define QT_NO_QWS_BEOS_WM_STYLE
-#define QT_NO_QWS_KDE2_WM_STYLE
-#define QT_NO_QWS_KDE_WM_STYLE
-#define QT_NO_QWS_WINDOWS_WM_STYLE
+#define TQT_NO_MIME
+#define TQT_NO_SOUND
+#define TQT_NO_PROPERTIES
+#define TQT_NO_SYNTAXHIGHLIGHTER
+
+#define TQT_NO_QWS_GFX_SPEED
+#define TQT_NO_NETWORK /* ?????????????? */
+#define TQT_NO_COLORNAMES
+#define TQT_NO_TRANSFORMATIONS
+#define TQT_NO_PRINTER
+#define TQT_NO_PICTURE
+
+#define TQT_NO_IMAGE_TRUECOLOR
+/* #define TQT_NO_IMAGE_SMOOTHSCALE  //needed for iconset --> pushbutton */
+#define TQT_NO_IMAGE_TEXT
+#define TQT_NO_DIR
+
+#define TQT_NO_TEXTSTREAM
+#define TQT_NO_DATASTREAM
+#define TQT_NO_QWS_SAVEFONTS
+//#define TQT_NO_STRINGLIST
+#define TQT_NO_SESSIONMANAGER
+
+
+#define TQT_NO_DIALOG
+
+#define TQT_NO_SEMIMODAL
+
+/* #define TQT_NO_STYLE //will require substantial work... */
+
+#define TQT_NO_EFFECTS
+#define TQT_NO_COP
+
+#define TQT_NO_QWS_PROPERTIES
+
+#define TQT_NO_RANGECONTROL
+#define TQT_NO_SPLITTER
+#define TQT_NO_STATUSBAR
+#define TQT_NO_TABBAR
+#define TQT_NO_TOOLBAR
+#define TQT_NO_TOOLTIP
+#define TQT_NO_VALIDATOR
+#define TQT_NO_WHATSTHIS
+#define TQT_NO_WIDGETSTACK
+#define TQT_NO_ACCEL
+#define TQT_NO_SIZEGRIP
+#define TQT_NO_HEADER
+#define TQT_NO_WORKSPACE
+#define TQT_NO_LCDNUMBER
+#define TQT_NO_STYLE_MOTIF
+#define TQT_NO_STYLE_PLATINUM
+#define TQT_NO_PROGRESSBAR
+
+
+#define TQT_NO_QWS_HYDRO_WM_STYLE
+#define TQT_NO_QWS_BEOS_WM_STYLE
+#define TQT_NO_QWS_KDE2_WM_STYLE
+#define TQT_NO_QWS_KDE_WM_STYLE
+#define TQT_NO_QWS_WINDOWS_WM_STYLE
 
 
 /* other widgets that could be removed: */
 /*
-#define QT_NO_MENUDATA
+#define TQT_NO_MENUDATA
 */
 
 
 /* possible options: */
 /*
-#define QT_NO_CURSOR
-#define QT_NO_LAYOUT
-#define QT_NO_QWS_MANAGER
-#define QT_NO_QWS_KEYBOARD
+#define TQT_NO_CURSOR
+#define TQT_NO_LAYOUT
+#define TQT_NO_QWS_MANAGER
+#define TQT_NO_QWS_KEYBOARD
 */
diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp
index 6bfaa9c36..b875e3017 100644
--- a/src/tools/qcstring.cpp
+++ b/src/tools/qcstring.cpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 #include 
-#ifndef QT_NO_COMPRESS
+#ifndef TQT_NO_COMPRESS
 #include "../3rdparty/zlib/zlib.h"
 #endif
 
@@ -354,7 +354,7 @@ TQ_UINT16 tqChecksum( const char *data, uint len )
     compressed byte array.
 */
 
-#ifndef QT_NO_COMPRESS
+#ifndef TQT_NO_COMPRESS
 TQByteArray tqCompress( const uchar* data, int nbytes )
 {
     if ( nbytes == 0 ) {
@@ -428,7 +428,7 @@ TQByteArray tqCompress( const uchar* data, int nbytes )
     the uncompressed byte array.
 */
 
-#ifndef QT_NO_COMPRESS
+#ifndef TQT_NO_COMPRESS
 TQByteArray tqUncompress( const uchar* data, int nbytes )
 {
     if ( !data ) {
@@ -526,7 +526,7 @@ TQByteArray tqUncompress( const uchar* data, int nbytes )
 
     \sa \link datastreamformat.html Format of the TQDataStream operators \endlink
 */
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 
 TQDataStream &operator<<( TQDataStream &s, const TQByteArray &a )
 {
@@ -561,7 +561,7 @@ TQDataStream &operator>>( TQDataStream &s, TQByteArray &a )
     return s;
 }
 
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 /*****************************************************************************
   TQCString member functions
@@ -1793,7 +1793,7 @@ TQCString &TQCString::replace( char c1, char c2 )
 }
 
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 /*!
     \overload
 
@@ -1891,7 +1891,7 @@ TQCString &TQCString::replace( const TQRegExp &rx, const char *str )
     setStr( d.ascii() );
     return *this;
 }
-#endif //QT_NO_REGEXP
+#endif //TQT_NO_REGEXP
 
 /*!
     Returns the string converted to a \c long value.
@@ -2291,7 +2291,7 @@ TQCString &TQCString::operator+=( char c )
 /*****************************************************************************
   TQCString stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQCString
 
@@ -2331,7 +2331,7 @@ TQDataStream &operator>>( TQDataStream &s, TQCString &str )
 	s.readRawBytes( str.data(), (uint)len );
     return s;
 }
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 /*****************************************************************************
   Documentation for related functions
diff --git a/src/tools/qdatastream.cpp b/src/tools/qdatastream.cpp
index 7b4f605a7..aced16e9e 100644
--- a/src/tools/qdatastream.cpp
+++ b/src/tools/qdatastream.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdatastream.h"
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 #include "ntqbuffer.h"
 #include 
 #include 
@@ -1177,4 +1177,4 @@ TQDataStream &TQDataStream::writeRawBytes( const char *s, uint len )
     return *this;
 }
 
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp
index 235ba7457..e30f3e75c 100644
--- a/src/tools/qdatetime.cpp
+++ b/src/tools/qdatetime.cpp
@@ -69,7 +69,7 @@ static const char * const qt_shortMonthNames[] = {
 	"Jan", "Feb", "Mar", "Apr", "May", "Jun",
 	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec" };
 
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
 /*****************************************************************************
   Some static function used by TQDate, TQTime and TQDateTime
  *****************************************************************************/
@@ -125,7 +125,7 @@ static TQString getFmtString( const TQString& f, const TQTime* dt = 0, const TQD
 	    buf = TQString::number( dd->month() );
 	} else if ( f == "MM" ) {
 	    buf = TQString::number( dd->month() ).rightJustify( 2, '0', TRUE );
-#ifndef QT_NO_TEXTDATE
+#ifndef TQT_NO_TEXTDATE
 	} else if ( f == "ddd" ) {
 	    buf = dd->shortDayName( dd->dayOfWeek() );
 	} else if ( f == "dddd" ) {
@@ -195,7 +195,7 @@ static TQString fmtDateTime( const TQString& f, const TQTime* dt = 0, const TQDa
 
     return buf;
 }
-#endif // QT_NO_DATESTRING
+#endif // TQT_NO_DATESTRING
 
 /*****************************************************************************
   TQDate member functions
@@ -497,7 +497,7 @@ int TQDate::weekNumber( int *yearNumber ) const
 
   Use shortMonthName() instead.
 */
-#ifndef QT_NO_TEXTDATE
+#ifndef TQT_NO_TEXTDATE
 /*!
     Returns the name of the \a month.
 
@@ -693,11 +693,11 @@ TQString TQDate::longDayName( int weekday )
 
     return TQString::null;
 }
-#endif //QT_NO_TEXTDATE
+#endif //TQT_NO_TEXTDATE
 
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
 
-#if !defined(QT_NO_SPRINTF)
+#if !defined(TQT_NO_SPRINTF)
 /*!
     \overload
 
@@ -761,7 +761,7 @@ TQString TQDate::toString( TQt::DateFormat f ) const
 	    return TQString::null;
 	}
     default:
-#ifndef QT_NO_TEXTDATE
+#ifndef TQT_NO_TEXTDATE
     case TQt::TextDate:
 	{
 	    TQString buf = shortDayName( dayOfWeek() );
@@ -781,7 +781,7 @@ TQString TQDate::toString( TQt::DateFormat f ) const
 	}
     }
 }
-#endif //QT_NO_SPRINTF
+#endif //TQT_NO_SPRINTF
 
 /*!
     Returns the date as a string. The \a format parameter determines
@@ -830,7 +830,7 @@ TQString TQDate::toString( const TQString& format ) const
 {
     return fmtDateTime( format, 0, this );
 }
-#endif //QT_NO_DATESTRING
+#endif //TQT_NO_DATESTRING
 
 /*!
     Sets the date's year \a y, month \a m and day \a d.
@@ -1058,7 +1058,7 @@ TQDate TQDate::currentDate( TQt::TimeSpec ts )
     return d;
 }
 
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
 /*!
     Returns the TQDate represented by the string \a s, using the format
     \a f, or an invalid date if the string cannot be parsed.
@@ -1090,7 +1090,7 @@ TQDate TQDate::fromString( const TQString& s, TQt::DateFormat f )
 	}
 	break;
     default:
-#ifndef QT_NO_TEXTDATE
+#ifndef TQT_NO_TEXTDATE
     case TQt::TextDate:
 	{
 	    /*
@@ -1138,7 +1138,7 @@ TQDate TQDate::fromString( const TQString& s, TQt::DateFormat f )
     }
     return TQDate();
 }
-#endif //QT_NO_DATESTRING
+#endif //TQT_NO_DATESTRING
 
 /*!
     \overload
@@ -1368,8 +1368,8 @@ int TQTime::msec() const
     return ds % 1000;
 }
 
-#ifndef QT_NO_DATESTRING
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_DATESTRING
+#ifndef TQT_NO_SPRINTF
 /*!
     \overload
 
@@ -1477,7 +1477,7 @@ TQString TQTime::toString( const TQString& format ) const
 {
     return fmtDateTime( format, this, 0 );
 }
-#endif //QT_NO_DATESTRING
+#endif //TQT_NO_DATESTRING
 /*!
     Sets the time to hour \a h, minute \a m, seconds \a s and
     milliseconds \a ms.
@@ -1653,7 +1653,7 @@ TQTime TQTime::currentTime( TQt::TimeSpec ts )
     return t;
 }
 
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
 /*!
     Returns the representation \a s as a TQTime using the format \a f,
     or an invalid time if this is not possible.
@@ -2076,8 +2076,8 @@ void TQDateTime::setTime_t( time_t secsSince1Jan1970UTC, TQt::TimeSpec ts )
 	   MSECS_PER_MIN * brokenDown->tm_min +
 	   1000 * brokenDown->tm_sec;
 }
-#ifndef QT_NO_DATESTRING
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_DATESTRING
+#ifndef TQT_NO_SPRINTF
 /*!
     \overload
 
@@ -2110,7 +2110,7 @@ TQString TQDateTime::toString( TQt::DateFormat f ) const
     if ( f == TQt::ISODate ) {
 	return d.toString( TQt::ISODate ) + "T" + t.toString( TQt::ISODate );
     }
-#ifndef QT_NO_TEXTDATE
+#ifndef TQT_NO_TEXTDATE
     else if ( f == TQt::TextDate ) {
 #ifndef Q_WS_WIN
 	TQString buf = d.shortDayName( d.dayOfWeek() );
@@ -2222,7 +2222,7 @@ TQString TQDateTime::toString( const TQString& format ) const
 {
     return fmtDateTime( format, &t, &d );
 }
-#endif //QT_NO_DATESTRING
+#endif //TQT_NO_DATESTRING
 
 /*!
     Returns a TQDateTime object containing a datetime \a ndays days
@@ -2434,7 +2434,7 @@ TQDateTime TQDateTime::currentDateTime( TQt::TimeSpec ts )
     return dt;
 }
 
-#ifndef QT_NO_DATESTRING
+#ifndef TQT_NO_DATESTRING
 /*!
     Returns the TQDateTime represented by the string \a s, using the
     format \a f, or an invalid datetime if this is not possible.
@@ -2459,7 +2459,7 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f )
 	return TQDateTime( TQDate::fromString( s.mid(0,10), TQt::ISODate ),
 			  TQTime::fromString( s.mid(11), TQt::ISODate ) );
     }
-#if !defined(QT_NO_REGEXP) && !defined(QT_NO_TEXTDATE)
+#if !defined(TQT_NO_REGEXP) && !defined(TQT_NO_TEXTDATE)
     else if ( f == TQt::TextDate ) {
         const int firstSpace = s.find(' ');
 	TQString monthName( s.mid( firstSpace + 1, 3 ) );
@@ -2502,17 +2502,17 @@ TQDateTime TQDateTime::fromString( const TQString& s, TQt::DateFormat f )
 	}
 	return TQDateTime( date, time );
     }
-#endif //QT_NO_REGEXP
+#endif //TQT_NO_REGEXP
     return TQDateTime();
 }
-#endif //QT_NO_DATESTRING
+#endif //TQT_NO_DATESTRING
 
 
 /*****************************************************************************
   Date/time stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQDate
 
@@ -2597,4 +2597,4 @@ TQDataStream &operator>>( TQDataStream &s, TQDateTime &dt )
     s >> dt.d >> dt.t;
     return s;
 }
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
diff --git a/src/tools/qdir.cpp b/src/tools/qdir.cpp
index 4079b7ea5..5b0c4c674 100644
--- a/src/tools/qdir.cpp
+++ b/src/tools/qdir.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 #include "ntqdir.h"
 
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 #include 
 #include "ntqfileinfo.h"
 #include "ntqregexp.h"
@@ -1387,4 +1387,4 @@ void TQDir::detach()
     }
 }
 
-#endif // QT_NO_DIR
+#endif // TQT_NO_DIR
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp
index 5c421a3e3..87976bddd 100644
--- a/src/tools/qdir_unix.cpp
+++ b/src/tools/qdir_unix.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 #include "ntqdir.h"
 
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 
 #include "qdir_p.h"
 #include "ntqfileinfo.h"
@@ -325,4 +325,4 @@ const TQFileInfoList * TQDir::drives()
 
     return knownMemoryLeak;
 }
-#endif //QT_NO_DIR
+#endif //TQT_NO_DIR
diff --git a/src/tools/qfileinfo.cpp b/src/tools/qfileinfo.cpp
index 288df5b67..763324d15 100644
--- a/src/tools/qfileinfo.cpp
+++ b/src/tools/qfileinfo.cpp
@@ -199,7 +199,7 @@ TQFileInfo::TQFileInfo( const TQFile &file )
 
     \sa isRelative()
 */
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 TQFileInfo::TQFileInfo( const TQDir &d, const TQString &fileName )
 {
     fn	  = d.filePath( fileName );
@@ -332,7 +332,7 @@ void TQFileInfo::setFile( const TQFile &file )
 
     \sa isRelative()
 */
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 void TQFileInfo::setFile( const TQDir &d, const TQString &fileName )
 {
     fn	= d.filePath( fileName );
@@ -481,7 +481,7 @@ TQString TQFileInfo::extension( bool complete ) const
 
     \sa dirPath(), filePath(), fileName(), isRelative()
 */
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 TQDir TQFileInfo::dir( bool absPath ) const
 {
     return TQDir( dirPath(absPath) );
@@ -550,7 +550,7 @@ bool TQFileInfo::isHidden() const
     the path is absolute (e.g. under Unix a path is absolute if it
     begins with a "/").
 */
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 bool TQFileInfo::isRelative() const
 {
     return TQDir::isRelativePath( fn );
@@ -656,7 +656,7 @@ TQDateTime TQFileInfo::lastRead() const
     }
 }
 
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 
 /*!
     Returns the absolute path including the file name.
diff --git a/src/tools/qfileinfo_unix.cpp b/src/tools/qfileinfo_unix.cpp
index a78452fdf..0bf143845 100644
--- a/src/tools/qfileinfo_unix.cpp
+++ b/src/tools/qfileinfo_unix.cpp
@@ -358,7 +358,7 @@ void TQFileInfo::doStat() const
 
     \sa dir(), filePath(), fileName(), isRelative()
 */
-#ifndef QT_NO_DIR
+#ifndef TQT_NO_DIR
 TQString TQFileInfo::dirPath( bool absPath ) const
 {
     TQString s;
diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp
index e794a43f1..e459eb35d 100644
--- a/src/tools/qgdict.cpp
+++ b/src/tools/qgdict.cpp
@@ -154,7 +154,7 @@ int TQGDict::hashKeyAscii( const char *key )
     return index;
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 
 /*!
     \overload
@@ -184,7 +184,7 @@ TQDataStream& TQGDict::write( TQDataStream &s, TQPtrCollection::Item ) const
 {
     return s;
 }
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 /*****************************************************************************
   TQGDict member functions
@@ -887,7 +887,7 @@ void TQGDict::statistics() const
 /*****************************************************************************
   TQGDict stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 TQDataStream &operator>>( TQDataStream &s, TQGDict &dict )
 {
     return dict.read( s );
@@ -990,7 +990,7 @@ TQDataStream& TQGDict::write( TQDataStream &s ) const
     }
     return s;
 }
-#endif //QT_NO_DATASTREAM
+#endif //TQT_NO_DATASTREAM
 
 /*****************************************************************************
   TQGDictIterator member functions
diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp
index 3ed8bd93b..5456c7416 100644
--- a/src/tools/qglist.cpp
+++ b/src/tools/qglist.cpp
@@ -182,7 +182,7 @@ int TQGList::compareItems( TQPtrCollection::Item item1, TQPtrCollection::Item it
     return item1 != item2;			// compare pointers
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \overload
   Reads a collection/list item from the stream \a s and returns a reference
@@ -213,7 +213,7 @@ TQDataStream &TQGList::write( TQDataStream &s, TQPtrCollection::Item ) const
 {
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
 /*****************************************************************************
   TQGList member functions
@@ -1283,7 +1283,7 @@ void TQGList::sort()
   TQGList stream functions
  *****************************************************************************/
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 TQDataStream &operator>>( TQDataStream &s, TQGList &list )
 {						// read list
     return list.read( s );
@@ -1353,7 +1353,7 @@ TQDataStream &TQGList::write( TQDataStream &s ) const
     return s;
 }
 
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
 
 
diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp
index 07074c9fd..8d7edf1d3 100644
--- a/src/tools/qglobal.cpp
+++ b/src/tools/qglobal.cpp
@@ -643,12 +643,12 @@ void fatal( const char *msg, ... )
   error code will be used if possible. Use this method to handle
   failures in platform specific API calls.
 
-  This function does nothing when TQt is built with \c QT_NO_DEBUG
+  This function does nothing when TQt is built with \c TQT_NO_DEBUG
   defined.
 */
 void tqSystemWarning( const char* msg, int code )
 {
-#ifndef QT_NO_DEBUG
+#ifndef TQT_NO_DEBUG
 #if defined(Q_OS_WIN32)
     if ( code == -1 )
 	code = GetLastError();
diff --git a/src/tools/qgpluginmanager.cpp b/src/tools/qgpluginmanager.cpp
index 1e96cf8fe..c1d6e15f0 100644
--- a/src/tools/qgpluginmanager.cpp
+++ b/src/tools/qgpluginmanager.cpp
@@ -37,7 +37,7 @@
 **********************************************************************/
 
 #include "qgpluginmanager_p.h"
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 #include "qcomlibrary_p.h"
 #include "ntqmap.h"
 #include "ntqdir.h"
@@ -549,4 +549,4 @@ TQRESULT TQGPluginManager::queryUnknownInterface(const TQString& feature, TQUnkn
     return plugin ? plugin->queryInterface( interfaceId, (TQUnknownInterface**)iface ) : TQE_NOINTERFACE;
 }
 
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
diff --git a/src/tools/qgpluginmanager_p.h b/src/tools/qgpluginmanager_p.h
index 82bfdf053..371299e9a 100644
--- a/src/tools/qgpluginmanager_p.h
+++ b/src/tools/qgpluginmanager_p.h
@@ -59,7 +59,7 @@
 //
 //
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 #if defined(Q_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp
index 2c8b13d68..0253151a3 100644
--- a/src/tools/qgvector.cpp
+++ b/src/tools/qgvector.cpp
@@ -126,7 +126,7 @@ int TQGVector::compareItems( Item d1, Item d2 )
     return d1 != d2;				// compare pointers
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
   Reads a collection/vector item from the stream \a s and returns a reference
   to the stream.
@@ -155,7 +155,7 @@ TQDataStream &TQGVector::write( TQDataStream &s, Item ) const
 {						// write item to stream
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
 /*****************************************************************************
   TQGVector member functions
@@ -540,7 +540,7 @@ void TQGVector::warningIndexRange( uint i )
 /*****************************************************************************
   TQGVector stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 TQDataStream &operator>>( TQDataStream &s, TQGVector &vec )
 {						// read vector
     return vec.read( s );
@@ -595,4 +595,4 @@ bool TQGVector::operator==( const TQGVector &v ) const
     return TRUE;
 }
 
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp
index 80a328d8b..2181f7fc5 100644
--- a/src/tools/qlibrary.cpp
+++ b/src/tools/qlibrary.cpp
@@ -43,7 +43,7 @@
 #include 
 #include 
 
-#ifndef QT_NO_LIBRARY
+#ifndef TQT_NO_LIBRARY
 
 // uncomment this to get error messages
 //#define QT_DEBUG_COMPONENT 1
@@ -59,7 +59,7 @@
 #if (defined(Q_WS_WIN) && !defined(QT_MAKEDLL)) \
     || (defined(Q_OS_FREEBSD) && defined(Q_CC_INTEL)) \
     || (defined(Q_OS_IRIX) && defined(Q_CC_GNU))
-#define QT_NO_LIBRARY_UNLOAD
+#define TQT_NO_LIBRARY_UNLOAD
 #endif
 
 TQLibraryPrivate::TQLibraryPrivate( TQLibrary *lib )
@@ -339,7 +339,7 @@ bool TQLibrary::unload()
     if ( !d->pHnd )
 	return TRUE;
 
-#if !defined(QT_NO_LIBRARY_UNLOAD)
+#if !defined(TQT_NO_LIBRARY_UNLOAD)
     if ( !d->freeLibrary() ) {
 # if defined(QT_DEBUG_COMPONENT)
 	tqWarning( "%s could not be unloaded", (const char*) TQFile::encodeName(library()) );
@@ -440,4 +440,4 @@ TQString TQLibrary::library() const
 #endif
     return filename;
 }
-#endif //QT_NO_LIBRARY
+#endif //TQT_NO_LIBRARY
diff --git a/src/tools/qlibrary_p.h b/src/tools/qlibrary_p.h
index c2e4166b1..c494f16a3 100644
--- a/src/tools/qlibrary_p.h
+++ b/src/tools/qlibrary_p.h
@@ -55,7 +55,7 @@
 
 #include "ntqlibrary.h"
 
-#ifndef QT_NO_LIBRARY
+#ifndef TQT_NO_LIBRARY
 
 #ifndef QT_H
 #include "ntqwindowdefs.h"
@@ -80,5 +80,5 @@ private:
     TQLibrary *library;
 };
 
-#endif // QT_NO_LIBRARY
+#endif // TQT_NO_LIBRARY
 #endif // TQLIBRARY_P_H
diff --git a/src/tools/qlibrary_unix.cpp b/src/tools/qlibrary_unix.cpp
index 09962d283..8c08772ac 100644
--- a/src/tools/qlibrary_unix.cpp
+++ b/src/tools/qlibrary_unix.cpp
@@ -41,7 +41,7 @@
 #include "qplatformdefs.h"
 #include "private/qlibrary_p.h"
 
-#ifndef QT_NO_LIBRARY
+#ifndef TQT_NO_LIBRARY
 
 #if defined(QT_AOUT_UNDERSCORE)
 #include 
diff --git a/src/tools/qpluginmanager_p.h b/src/tools/qpluginmanager_p.h
index 23dc4b8e9..8c29aaf84 100644
--- a/src/tools/qpluginmanager_p.h
+++ b/src/tools/qpluginmanager_p.h
@@ -57,7 +57,7 @@
 #include "qgpluginmanager_p.h"
 #endif // QT_H
 
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
 
 template
 class TQPluginManager : public TQGPluginManager
@@ -71,6 +71,6 @@ public:
     }
 };
 
-#endif //QT_NO_COMPONENT
+#endif //TQT_NO_COMPONENT
 
 #endif //TQPLUGINMANAGER_P_H
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp
index 7adf03768..9d3653969 100644
--- a/src/tools/qregexp.cpp
+++ b/src/tools/qregexp.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqregexp.h"
 
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 
 #include "ntqmemarray.h"
 #include "ntqbitarray.h"
@@ -746,7 +746,7 @@ static void mergeInto( TQMemArray *a, const TQMemArray& b )
     int bsize = b.size();
     if ( asize == 0 ) {
 	*a = b.copy();
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     } else if ( bsize == 1 && (*a)[asize - 1] < b[0] ) {
 	a->resize( asize + 1 );
 	(*a)[asize] = b[0];
@@ -802,7 +802,7 @@ static int at( const TQMap& m, int k )
 	return *it;
 }
 
-#ifndef QT_NO_REGEXP_WILDCARD
+#ifndef TQT_NO_REGEXP_WILDCARD
 /*
   Translates a wildcard pattern to an equivalent regular expression
   pattern (e.g., *.cpp to .*\.cpp).
@@ -864,7 +864,7 @@ static TQString wc2rx( const TQString& wc_str )
 class TQRegExpEngine : public TQShared
 {
 public:
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
     /*
       The class CharClass represents a set of characters, such as can
       be found in regular expressions (e.g., [a-z] denotes the set
@@ -886,7 +886,7 @@ public:
 	void addSingleton( ushort ch ) { addRange( ch, ch ); }
 
 	bool in( TQChar ch ) const;
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	const TQMemArray& firstOccurrence() const { return occ1; }
 #endif
 
@@ -908,7 +908,7 @@ public:
 	int c; // character classes
 	TQMemArray r; // character ranges
 	bool n; // negative?
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	TQMemArray occ1; // first-occurrence array
 #endif
     };
@@ -917,7 +917,7 @@ public:
     {
 	int dummy;
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	CharClass() { occ1.fill( 0, NumBadChars ); }
 
 	const TQMemArray& firstOccurrence() const { return occ1; }
@@ -928,7 +928,7 @@ public:
 
     TQRegExpEngine( bool caseSensitive ) { setup( caseSensitive ); }
     TQRegExpEngine( const TQString& rx, bool caseSensitive );
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     ~TQRegExpEngine();
 #endif
 
@@ -942,18 +942,18 @@ public:
 
     int createState( TQChar ch );
     int createState( const CharClass& cc );
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
     int createState( int bref );
 #endif
 
     void addCatTransitions( const TQMemArray& from,
 			    const TQMemArray& to );
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     void addPlusTransitions( const TQMemArray& from,
 			     const TQMemArray& to, int atom );
 #endif
 
-#ifndef QT_NO_REGEXP_ANCHOR_ALT
+#ifndef TQT_NO_REGEXP_ANCHOR_ALT
     int anchorAlternation( int a, int b );
     int anchorConcatenation( int a, int b );
 #else
@@ -962,7 +962,7 @@ public:
 #endif
     void addAnchors( int from, int to, int a );
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     void heuristicallyChooseHeuristic();
 #endif
 
@@ -981,7 +981,7 @@ private:
     */
     struct State
     {
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 	int atom; // which atom does this state belong to?
 #endif
 	int match; // what does it match? (see CharClassBit and BackRefBit)
@@ -989,7 +989,7 @@ private:
 	TQMap *reenter; // atoms reentered when transiting out
 	TQMap *anchors; // anchors met when transiting out
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 	State( int a, int m )
 	    : atom( a ), match( m ), reenter( 0 ), anchors( 0 ) { }
 #else
@@ -999,7 +999,7 @@ private:
 	~State() { delete reenter; delete anchors; }
     };
 
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
     /*
       The struct Lookahead represents a lookahead a la Perl (e.g.,
       (?=foo) and (?!bar)).
@@ -1015,7 +1015,7 @@ private:
     };
 #endif
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     /*
       The struct Atom represents one node in the hierarchy of regular
       expression atoms.
@@ -1027,7 +1027,7 @@ private:
     };
 #endif
 
-#ifndef QT_NO_REGEXP_ANCHOR_ALT
+#ifndef TQT_NO_REGEXP_ANCHOR_ALT
     /*
       The struct AnchorAlternation represents a pair of anchors with
       OR semantics.
@@ -1057,22 +1057,22 @@ private:
 
 	   Anchor_LookaheadMask = ( Anchor_FirstLookahead - 1 ) ^
 		   ( (Anchor_FirstLookahead << MaxLookaheads) - 1 ) };
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     int startAtom( bool capture );
     void finishAtom( int atom ) { cf = f[atom].parent; }
 #endif
 
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
     int addLookahead( TQRegExpEngine *eng, bool negative );
 #endif
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     bool isBetterCapture( const int *begin1, const int *end1, const int *begin2,
 			  const int *end2 );
 #endif
     bool testAnchor( int i, int a, const int *capBegin );
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     bool goodStringMatch();
     bool badCharMatch();
 #else
@@ -1082,33 +1082,33 @@ private:
 
     TQPtrVector s; // array of states
     int ns; // number of states
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     TQMemArray f; // atom hierarchy
     int nf; // number of atoms
     int cf; // current atom
 #endif
     int officialncap; // number of captures, seen from the outside
     int ncap; // number of captures, seen from the inside
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
     TQPtrVector cl; // array of character classes
 #endif
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
     TQPtrVector ahead; // array of lookaheads
 #endif
-#ifndef QT_NO_REGEXP_ANCHOR_ALT
+#ifndef TQT_NO_REGEXP_ANCHOR_ALT
     TQMemArray aa; // array of (a, b) pairs of anchors
 #endif
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     bool caretAnchored; // does the regexp start with ^?
     bool trivial; // is the good-string all that needs to match?
 #endif
     bool valid; // is the regular expression valid?
     bool cs; // case sensitive?
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
     int nbrefs; // number of back-references
 #endif
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     bool useGoodStringHeuristic; // use goodStringMatch? otherwise badCharMatch
 
     int goodEarlyStart; // the index where goodStr can first occur in a match
@@ -1137,7 +1137,7 @@ private:
 	void clear() { operator=( Box(eng) ); }
 	void set( TQChar ch );
 	void set( const CharClass& cc );
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 	void set( int bref );
 #endif
 
@@ -1146,7 +1146,7 @@ private:
 	void plus( int atom );
 	void opt();
 	void catAnchor( int a );
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	void setupHeuristics();
 #endif
 
@@ -1164,7 +1164,7 @@ private:
 	TQMap ranchors; // the right anchors
 	int skipanchors; // the anchors to match if the box is skipped
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	int earlyStart; // the index where str can first occur
 	int lateStart; // the index where str can last occur
 	TQString str; // a string that has to occur in any match
@@ -1174,7 +1174,7 @@ private:
 #endif
 
 	int minl; // the minimum length of this box
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	TQMemArray occ1; // first-occurrence array
 #endif
     };
@@ -1189,10 +1189,10 @@ private:
 	   Tok_Char = 0x10000, Tok_BackRef = 0x20000 };
     int getChar();
     int getEscape();
-#ifndef QT_NO_REGEXP_INTERVAL
+#ifndef TQT_NO_REGEXP_INTERVAL
     int getRep( int def );
 #endif
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
     void skipChars( int n );
 #endif
     void error( const char *msg );
@@ -1244,7 +1244,7 @@ private:
     int *mmCapEnd; // end of captures for a next state
     int *mmSlideTab; // bump-along slide table for bad-character heuristic
     int mmSlideTabSize; // size of slide table
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
     TQIntDict mmSleeping; // dictionary of back-reference sleepers
 #endif
     int mmMatchLen; // length of match
@@ -1252,21 +1252,21 @@ private:
 };
 
 TQRegExpEngine::TQRegExpEngine( const TQString& rx, bool caseSensitive )
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
     : mmSleeping( 101 )
 #endif
 {
     setup( caseSensitive );
     valid = ( parse(rx.unicode(), rx.length()) == (int) rx.length() );
     if ( !valid ) {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	trivial = FALSE;
 #endif
 	error( RXERR_LEFTDELIM );
     }
 }
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 TQRegExpEngine::~TQRegExpEngine()
 {
 }
@@ -1282,7 +1282,7 @@ void TQRegExpEngine::match( const TQString& str, int pos, bool minimal,
 {
     bool matched = FALSE;
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     if ( trivial && !oneTest ) {
 	mmPos = str.find( goodStr, pos, cs );
 	mmMatchLen = goodStr.length();
@@ -1302,7 +1302,7 @@ void TQRegExpEngine::match( const TQString& str, int pos, bool minimal,
 	mmOneTestMatchedLen = 0;
 
 	if ( valid && mmPos >= 0 && mmPos <= mmLen ) {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	    if ( oneTest ) {
 		matched = matchHere();
 	    } else {
@@ -1351,7 +1351,7 @@ int TQRegExpEngine::createState( TQChar ch )
 
 int TQRegExpEngine::createState( const CharClass& cc )
 {
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
     int n = cl.size();
     cl.resize( n + 1 );
     cl.insert( n, new CharClass(cc) );
@@ -1362,7 +1362,7 @@ int TQRegExpEngine::createState( const CharClass& cc )
 #endif
 }
 
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 int TQRegExpEngine::createState( int bref )
 {
     if ( bref > nbrefs ) {
@@ -1393,7 +1393,7 @@ void TQRegExpEngine::addCatTransitions( const TQMemArray& from,
     }
 }
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 void TQRegExpEngine::addPlusTransitions( const TQMemArray& from,
 					const TQMemArray& to, int atom )
 {
@@ -1414,7 +1414,7 @@ void TQRegExpEngine::addPlusTransitions( const TQMemArray& from,
 }
 #endif
 
-#ifndef QT_NO_REGEXP_ANCHOR_ALT
+#ifndef TQT_NO_REGEXP_ANCHOR_ALT
 /*
   Returns an anchor that means a OR b.
 */
@@ -1424,7 +1424,7 @@ int TQRegExpEngine::anchorAlternation( int a, int b )
 	return a & b;
 
     int n = aa.size();
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     if ( n > 0 && aa[n - 1].a == a && aa[n - 1].b == b )
 	return Anchor_Alternation | ( n - 1 );
 #endif
@@ -1465,7 +1465,7 @@ void TQRegExpEngine::addAnchors( int from, int to, int a )
     st->anchors->insert( to, a );
 }
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 /*
   This function chooses between the good-string and the bad-character
   heuristics. It computes two scores and chooses the heuristic with
@@ -1522,13 +1522,13 @@ void TQRegExpEngine::dump() const
 	tqDebug( "  %d%s", i,
 		i == InitialState ? " (initial)" :
 		i == FinalState ? " (final)" : "" );
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 	tqDebug( "    in atom %d", s[i]->atom );
 #endif
 	int m = s[i]->match;
 	if ( (m & CharClassBit) != 0 ) {
 	    tqDebug( "    match character class %d", m ^ CharClassBit );
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
 	    cl[m ^ CharClassBit]->dump();
 #else
 	    tqDebug( "    negative character class" );
@@ -1549,14 +1549,14 @@ void TQRegExpEngine::dump() const
 		tqDebug( "       [anchors 0x%.8x]", (*s[i]->anchors)[next] );
 	}
     }
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     if ( nf > 0 ) {
 	tqDebug( "  Atom    Parent  Capture" );
 	for ( i = 0; i < nf; i++ )
 	    tqDebug( "  %6d  %6d  %6d", i, f[i].parent, f[i].capture );
     }
 #endif
-#ifndef QT_NO_REGEXP_ANCHOR_ALT
+#ifndef TQT_NO_REGEXP_ANCHOR_ALT
     for ( i = 0; i < (int) aa.size(); i++ )
 	tqDebug( "  Anchor alternation 0x%.8x: 0x%.8x 0x%.9x", i, aa[i].a,
 		aa[i].b );
@@ -1569,29 +1569,29 @@ void TQRegExpEngine::setup( bool caseSensitive )
     s.setAutoDelete( TRUE );
     s.resize( 32 );
     ns = 0;
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     f.resize( 32 );
     nf = 0;
     cf = -1;
 #endif
     officialncap = 0;
     ncap = 0;
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
     cl.setAutoDelete( TRUE );
 #endif
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
     ahead.setAutoDelete( TRUE );
 #endif
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     caretAnchored = TRUE;
     trivial = TRUE;
 #endif
     valid = FALSE;
     cs = caseSensitive;
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
     nbrefs = 0;
 #endif
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     useGoodStringHeuristic = TRUE;
     minl = 0;
     occ1.fill( 0, NumBadChars );
@@ -1602,7 +1602,7 @@ int TQRegExpEngine::setupState( int match )
 {
     if ( (ns & (ns + 1)) == 0 && ns + 1 >= (int) s.size() )
 	s.resize( (ns + 1) << 1 );
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     s.insert( ns, new State(cf, match) );
 #else
     s.insert( ns, new State(match) );
@@ -1610,7 +1610,7 @@ int TQRegExpEngine::setupState( int match )
     return ns++;
 }
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 /*
   Functions startAtom() and finishAtom() should be called to delimit
   atoms. When a state is created, it is assigned to the current atom.
@@ -1627,7 +1627,7 @@ int TQRegExpEngine::startAtom( bool capture )
 }
 #endif
 
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
 /*
   Creates a lookahead anchor.
 */
@@ -1644,7 +1644,7 @@ int TQRegExpEngine::addLookahead( TQRegExpEngine *eng, bool negative )
 }
 #endif
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 /*
   We want the longest leftmost captures.
 */
@@ -1671,7 +1671,7 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin )
 {
     int j;
 
-#ifndef QT_NO_REGEXP_ANCHOR_ALT
+#ifndef TQT_NO_REGEXP_ANCHOR_ALT
     if ( (a & Anchor_Alternation) != 0 ) {
 	return testAnchor( i, aa[a ^ Anchor_Alternation].a, capBegin ) ||
 	       testAnchor( i, aa[a ^ Anchor_Alternation].b, capBegin );
@@ -1686,7 +1686,7 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin )
 	if ( mmPos + i != mmLen )
 	    return FALSE;
     }
-#ifndef QT_NO_REGEXP_ESCAPE
+#ifndef TQT_NO_REGEXP_ESCAPE
     if ( (a & (Anchor_Word | Anchor_NonWord)) != 0 ) {
 	bool before = FALSE;
 	bool after = FALSE;
@@ -1700,7 +1700,7 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin )
 	    return FALSE;
     }
 #endif
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
     if ( (a & Anchor_LookaheadMask) != 0 ) {
 	TQConstString cstr = TQConstString( (TQChar *) mmIn + mmPos + i,
 					   mmLen - mmPos - i );
@@ -1715,8 +1715,8 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin )
 	}
     }
 #endif
-#ifndef QT_NO_REGEXP_CAPTURE
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_BACKREF
     for ( j = 0; j < nbrefs; j++ ) {
 	if ( (a & (Anchor_BackRef1Empty << j)) != 0 ) {
 	    if ( capBegin[j] != EmptyCapture )
@@ -1728,7 +1728,7 @@ bool TQRegExpEngine::testAnchor( int i, int a, const int *capBegin )
     return TRUE;
 }
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 /*
   The three following functions are what Jeffrey Friedl would call
   transmissions (or bump-alongs). Using one or the other should make
@@ -1843,7 +1843,7 @@ bool TQRegExpEngine::matchHere()
     mmOneTestMatchedLen = -1;
     mmCurStack[0] = InitialState;
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     if ( ncap > 0 ) {
 	for ( j = 0; j < ncap; j++ ) {
 	    mmCurCapBegin[j] = EmptyCapture;
@@ -1852,7 +1852,7 @@ bool TQRegExpEngine::matchHere()
     }
 #endif
 
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
     int *zzZ = 0;
 
     while ( (ncur > 0 || !mmSleeping.isEmpty()) && i <= mmLen - mmPos &&
@@ -1870,7 +1870,7 @@ bool TQRegExpEngine::matchHere()
 		int next = outs[k];
 		State *snext = s[next];
 		bool in = TRUE;
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 		int needSomeSleep = 0;
 #endif
 
@@ -1898,7 +1898,7 @@ bool TQRegExpEngine::matchHere()
 			stop = mmMinimal;
 			in = TRUE;
 		    } else if ( (m & CharClassBit) != 0 ) {
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
 			const CharClass *cc = cl[m ^ CharClassBit];
 			if ( cs )
 			    in = cc->in( ch );
@@ -1909,7 +1909,7 @@ bool TQRegExpEngine::matchHere()
 			    in = cc->in( TQChar(ch).lower() ) ||
 				 cc->in( TQChar(ch).upper() );
 #endif
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 		    } else { /* ( (m & BackRefBit) != 0 ) */
 			int bref = m ^ BackRefBit;
 			int ell = j * ncap + ( bref - 1 );
@@ -1965,7 +1965,7 @@ bool TQRegExpEngine::matchHere()
 		  We must now update our data structures.
 		*/
 		if ( in ) {
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 		    int *capBegin, *capEnd;
 #endif
 		    /*
@@ -1976,7 +1976,7 @@ bool TQRegExpEngine::matchHere()
 			m = nnext++;
 			mmNextStack[m] = next;
 			mmInNextStack[next] = m;
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 			capBegin = mmNextCapBegin + m * ncap;
 			capEnd = mmNextCapEnd + m * ncap;
 
@@ -1992,7 +1992,7 @@ bool TQRegExpEngine::matchHere()
 #endif
 		    }
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 		    /*
 		      Updating the capture zones is much of a task.
 		    */
@@ -2097,7 +2097,7 @@ bool TQRegExpEngine::matchHere()
 				    ncap * sizeof(int) );
 			}
 		    }
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 		    /*
 		      We are done with updating the capture zones.
 		      It's now time to put the next state to sleep,
@@ -2120,7 +2120,7 @@ bool TQRegExpEngine::matchHere()
 		}
 	    }
 	}
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 	/*
 	  If we reached the final state, hurray! Copy the captured
 	  zone.
@@ -2129,7 +2129,7 @@ bool TQRegExpEngine::matchHere()
 	    memcpy( mmCapBegin, mmNextCapBegin + m * ncap, ncap * sizeof(int) );
 	    memcpy( mmCapEnd, mmNextCapEnd + m * ncap, ncap * sizeof(int) );
 	}
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 	/*
 	  It's time to wake up the sleepers.
 	*/
@@ -2165,14 +2165,14 @@ bool TQRegExpEngine::matchHere()
 
 	// avoid needless iteration that confuses mmOneTestMatchedLen
 	if ( nnext == 1 && mmNextStack[0] == FinalState
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 	     && mmSleeping.isEmpty()
 #endif
 	     )
 	    stop = TRUE;
 
 	tqSwap( mmCurStack, mmNextStack );
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 	tqSwap( mmCurCapBegin, mmNextCapBegin );
 	tqSwap( mmCurCapEnd, mmNextCapEnd );
 #endif
@@ -2181,7 +2181,7 @@ bool TQRegExpEngine::matchHere()
 	i++;
     }
 
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
     /*
       If minimal matching is enabled, we might have some sleepers
       left.
@@ -2196,12 +2196,12 @@ bool TQRegExpEngine::matchHere()
     return ( mmMatchLen >= 0 );
 }
 
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
 
 TQRegExpEngine::CharClass::CharClass()
     : c( 0 ), n( FALSE )
 {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     occ1.fill( NoOccurrence, NumBadChars );
 #endif
 }
@@ -2212,7 +2212,7 @@ TQRegExpEngine::CharClass& TQRegExpEngine::CharClass::operator=(
     c = cc.c;
     r = cc.r.copy();
     n = cc.n;
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     occ1 = cc.occ1;
 #endif
     return *this;
@@ -2228,7 +2228,7 @@ void TQRegExpEngine::CharClass::clear()
 void TQRegExpEngine::CharClass::setNegative( bool negative )
 {
     n = negative;
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     occ1.fill( 0, NumBadChars );
 #endif
 }
@@ -2236,7 +2236,7 @@ void TQRegExpEngine::CharClass::setNegative( bool negative )
 void TQRegExpEngine::CharClass::addCategories( int cats )
 {
     c |= cats;
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     occ1.fill( 0, NumBadChars );
 #endif
 }
@@ -2250,7 +2250,7 @@ void TQRegExpEngine::CharClass::addRange( ushort from, ushort to )
     r[m].from = from;
     r[m].to = to;
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     int i;
 
     if ( to - from < NumBadChars ) {
@@ -2272,7 +2272,7 @@ void TQRegExpEngine::CharClass::addRange( ushort from, ushort to )
 
 bool TQRegExpEngine::CharClass::in( TQChar ch ) const
 {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     if ( occ1[BadChar(ch)] == NoOccurrence )
 	return n;
 #endif
@@ -2291,7 +2291,7 @@ void TQRegExpEngine::CharClass::dump() const
 {
     int i;
     tqDebug( "    %stive character class", n ? "nega" : "posi" );
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
     if ( c != 0 )
 	tqDebug( "      categories 0x%.8x", c );
 #endif
@@ -2303,11 +2303,11 @@ void TQRegExpEngine::CharClass::dump() const
 
 TQRegExpEngine::Box::Box( TQRegExpEngine *engine )
     : eng( engine ), skipanchors( 0 )
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
       , earlyStart( 0 ), lateStart( 0 ), maxl( 0 )
 #endif
 {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     occ1.fill( NoOccurrence, NumBadChars );
 #endif
     minl = 0;
@@ -2321,7 +2321,7 @@ TQRegExpEngine::Box& TQRegExpEngine::Box::operator=( const Box& b )
     lanchors = b.lanchors;
     ranchors = b.ranchors;
     skipanchors = b.skipanchors;
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     earlyStart = b.earlyStart;
     lateStart = b.lateStart;
     str = b.str;
@@ -2340,7 +2340,7 @@ void TQRegExpEngine::Box::set( TQChar ch )
     ls[0] = eng->createState( ch );
     rs = ls;
     rs.detach();
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     str = ch;
     leftStr = ch;
     rightStr = ch;
@@ -2357,14 +2357,14 @@ void TQRegExpEngine::Box::set( const CharClass& cc )
     ls[0] = eng->createState( cc );
     rs = ls;
     rs.detach();
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     maxl = 1;
     occ1 = cc.firstOccurrence();
 #endif
     minl = 1;
 }
 
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 void TQRegExpEngine::Box::set( int bref )
 {
     ls.resize( 1 );
@@ -2373,7 +2373,7 @@ void TQRegExpEngine::Box::set( int bref )
     rs.detach();
     if ( bref >= 1 && bref <= MaxBackRefs )
 	skipanchors = Anchor_BackRef0Empty << bref;
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     maxl = InftyLen;
 #endif
     minl = 0;
@@ -2410,7 +2410,7 @@ void TQRegExpEngine::Box::cat( const Box& b )
 	rs = b.rs;
     }
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     if ( maxl != InftyLen ) {
 	if ( rightStr.length() + b.leftStr.length() >
 	     TQMAX(str.length(), b.str.length()) ) {
@@ -2467,7 +2467,7 @@ void TQRegExpEngine::Box::orx( const Box& b )
 	    skipanchors = b.skipanchors;
     }
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     occ1.detach();
     for ( int i = 0; i < NumBadChars; i++ ) {
 	if ( occ1[i] > b.occ1[i] )
@@ -2487,21 +2487,21 @@ void TQRegExpEngine::Box::orx( const Box& b )
 
 void TQRegExpEngine::Box::plus( int atom )
 {
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     eng->addPlusTransitions( rs, ls, atom );
 #else
     Q_UNUSED( atom );
     eng->addCatTransitions( rs, ls );
 #endif
     addAnchorsToEngine( *this );
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     maxl = InftyLen;
 #endif
 }
 
 void TQRegExpEngine::Box::opt()
 {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     earlyStart = 0;
     lateStart = 0;
     str = TQString();
@@ -2524,7 +2524,7 @@ void TQRegExpEngine::Box::catAnchor( int a )
     }
 }
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 void TQRegExpEngine::Box::setupHeuristics()
 {
     eng->goodEarlyStart = earlyStart;
@@ -2596,7 +2596,7 @@ int TQRegExpEngine::getChar()
 
 int TQRegExpEngine::getEscape()
 {
-#ifndef QT_NO_REGEXP_ESCAPE
+#ifndef TQT_NO_REGEXP_ESCAPE
     const char tab[] = "afnrtv"; // no b, as \b means word boundary
     const char backTab[] = "\a\f\n\r\t\v";
     ushort low;
@@ -2610,7 +2610,7 @@ int TQRegExpEngine::getEscape()
 	return Tok_Char | '\\';
     }
     yyCh = getChar();
-#ifndef QT_NO_REGEXP_ESCAPE
+#ifndef TQT_NO_REGEXP_ESCAPE
     if ( (prevCh & ~0xff) == 0 ) {
 	const char *p = strchr( tab, prevCh );
 	if ( p != 0 )
@@ -2619,7 +2619,7 @@ int TQRegExpEngine::getEscape()
 #endif
 
     switch ( prevCh ) {
-#ifndef QT_NO_REGEXP_ESCAPE
+#ifndef TQT_NO_REGEXP_ESCAPE
     case '0':
 	val = 0;
 	for ( i = 0; i < 3; i++ ) {
@@ -2633,11 +2633,11 @@ int TQRegExpEngine::getEscape()
 	    error( RXERR_OCTAL );
 	return Tok_Char | val;
 #endif
-#ifndef QT_NO_REGEXP_ESCAPE
+#ifndef TQT_NO_REGEXP_ESCAPE
     case 'B':
 	return Tok_NonWord;
 #endif
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
     case 'D':
 	// see TQChar::isDigit()
 	yyCharClass->addCategories( 0x7fffffef );
@@ -2661,11 +2661,11 @@ int TQRegExpEngine::getEscape()
 	yyCharClass->addSingleton( 0xff65 );
 	return Tok_CharClass;
 #endif
-#ifndef QT_NO_REGEXP_ESCAPE
+#ifndef TQT_NO_REGEXP_ESCAPE
     case 'b':
 	return Tok_Word;
 #endif
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
     case 'd':
 	// see TQChar::isDigit()
 	yyCharClass->addCategories( 0x00000010 );
@@ -2681,7 +2681,7 @@ int TQRegExpEngine::getEscape()
 	yyCharClass->addSingleton( 0x005f ); // '_'
 	return Tok_CharClass;
 #endif
-#ifndef QT_NO_REGEXP_ESCAPE
+#ifndef TQT_NO_REGEXP_ESCAPE
     case 'x':
 	val = 0;
 	for ( i = 0; i < 4; i++ ) {
@@ -2698,7 +2698,7 @@ int TQRegExpEngine::getEscape()
 #endif
     default:
 	if ( prevCh >= '1' && prevCh <= '9' ) {
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 	    val = prevCh - '0';
 	    while ( yyCh >= '0' && yyCh <= '9' ) {
 		val = ( val * 10 ) + ( yyCh - '0' );
@@ -2713,7 +2713,7 @@ int TQRegExpEngine::getEscape()
     }
 }
 
-#ifndef QT_NO_REGEXP_INTERVAL
+#ifndef TQT_NO_REGEXP_INTERVAL
 int TQRegExpEngine::getRep( int def )
 {
     if ( yyCh >= '0' && yyCh <= '9' ) {
@@ -2733,7 +2733,7 @@ int TQRegExpEngine::getRep( int def )
 }
 #endif
 
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
 void TQRegExpEngine::skipChars( int n )
 {
     if ( n > 0 ) {
@@ -2764,7 +2764,7 @@ void TQRegExpEngine::startTokenizer( const TQChar *rx, int len )
 
 int TQRegExpEngine::getToken()
 {
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
     ushort pendingCh = 0;
     bool charPending;
     bool rangePending;
@@ -2773,7 +2773,7 @@ int TQRegExpEngine::getToken()
     int prevCh = yyCh;
 
     yyPos0 = yyPos - 1;
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
     yyCharClass->clear();
 #endif
     yyMinRep = 0;
@@ -2791,7 +2791,7 @@ int TQRegExpEngine::getToken()
 	    prevCh = getChar();
 	    yyCh = getChar();
 	    switch ( prevCh ) {
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
 	    case '!':
 		return Tok_NegLookahead;
 	    case '=':
@@ -2817,7 +2817,7 @@ int TQRegExpEngine::getToken()
 	yyMaxRep = InftyRep;
 	return Tok_Quantifier;
     case '.':
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
 	yyCharClass->setNegative( TRUE );
 #endif
 	return Tok_CharClass;
@@ -2826,7 +2826,7 @@ int TQRegExpEngine::getToken()
 	yyMaxRep = 1;
 	return Tok_Quantifier;
     case '[':
-#ifndef QT_NO_REGEXP_CCLASS
+#ifndef TQT_NO_REGEXP_CCLASS
 	if ( yyCh == '^' ) {
 	    yyCharClass->setNegative( TRUE );
 	    yyCh = getChar();
@@ -2893,7 +2893,7 @@ int TQRegExpEngine::getToken()
     case '^':
 	return Tok_Caret;
     case '{':
-#ifndef QT_NO_REGEXP_INTERVAL
+#ifndef TQT_NO_REGEXP_INTERVAL
 	yyMinRep = getRep( 0 );
 	yyMaxRep = yyMinRep;
 	if ( yyCh == ',' ) {
@@ -2925,13 +2925,13 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len )
     valid = TRUE;
     startTokenizer( pattern, len );
     yyTok = getToken();
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     yyMayCapture = TRUE;
 #else
     yyMayCapture = FALSE;
 #endif
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     int atom = startAtom( FALSE );
 #endif
     CharClass anything;
@@ -2942,10 +2942,10 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len )
 
     Box middleBox( this );
     parseExpression( &middleBox );
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     finishAtom( atom );
 #endif
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     middleBox.setupHeuristics();
 #endif
     box.cat( middleBox );
@@ -2954,7 +2954,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len )
     yyCharClass = 0;
 
     officialncap = ncap;
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
     if ( nbrefs > ncap )
 	ncap = nbrefs;
 #endif
@@ -2963,7 +2963,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len )
       We use one TQMemArray for all the big data used a lot in
       matchHere() and friends.
     */
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     mmSlideTabSize = TQMAX( minl + 1, 16 );
 #else
     mmSlideTabSize = 0;
@@ -2990,7 +2990,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len )
     if ( !yyError.isEmpty() )
 	return -1;
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     State *sinit = s[InitialState];
     caretAnchored = ( sinit->anchors != 0 );
     if ( caretAnchored ) {
@@ -2998,7 +2998,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len )
 	TQMap::ConstIterator a;
 	for ( a = anchors.begin(); a != anchors.end(); ++a ) {
 	    if (
-#ifndef QT_NO_REGEXP_ANCHOR_ALT
+#ifndef TQT_NO_REGEXP_ANCHOR_ALT
 		 (*a & Anchor_Alternation) != 0 ||
 #endif
 		 (*a & Anchor_Caret) == 0 ) {
@@ -3013,7 +3013,7 @@ int TQRegExpEngine::parse( const TQChar *pattern, int len )
 
 void TQRegExpEngine::parseAtom( Box *box )
 {
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
     TQRegExpEngine *eng = 0;
     bool neg;
     int len;
@@ -3022,7 +3022,7 @@ void TQRegExpEngine::parseAtom( Box *box )
     if ( (yyTok & Tok_Char) != 0 ) {
 	box->set( TQChar(yyTok ^ Tok_Char) );
     } else {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	trivial = FALSE;
 #endif
 	switch ( yyTok ) {
@@ -3032,7 +3032,7 @@ void TQRegExpEngine::parseAtom( Box *box )
 	case Tok_Caret:
 	    box->catAnchor( Anchor_Caret );
 	    break;
-#ifndef QT_NO_REGEXP_LOOKAHEAD
+#ifndef TQT_NO_REGEXP_LOOKAHEAD
 	case Tok_PosLookahead:
 	case Tok_NegLookahead:
 	    neg = ( yyTok == Tok_NegLookahead );
@@ -3048,7 +3048,7 @@ void TQRegExpEngine::parseAtom( Box *box )
 		error( RXERR_LOOKAHEAD );
 	    break;
 #endif
-#ifndef QT_NO_REGEXP_ESCAPE
+#ifndef TQT_NO_REGEXP_ESCAPE
 	case Tok_Word:
 	    box->catAnchor( Anchor_Word );
 	    break;
@@ -3070,7 +3070,7 @@ void TQRegExpEngine::parseAtom( Box *box )
 	    error( RXERR_REPETITION );
 	    break;
 	default:
-#ifndef QT_NO_REGEXP_BACKREF
+#ifndef TQT_NO_REGEXP_BACKREF
 	    if ( (yyTok & Tok_BackRef) != 0 )
 		box->set( yyTok ^ Tok_BackRef );
 	    else
@@ -3083,13 +3083,13 @@ void TQRegExpEngine::parseAtom( Box *box )
 
 void TQRegExpEngine::parseFactor( Box *box )
 {
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     int atom = startAtom( yyMayCapture && yyTok == Tok_LeftParen );
 #else
     static const int atom = 0;
 #endif
 
-#ifndef QT_NO_REGEXP_INTERVAL
+#ifndef TQT_NO_REGEXP_INTERVAL
 #define YYREDO() \
 	yyIn = in, yyPos0 = pos0, yyPos = pos, yyLen = len, yyCh = ch, \
 	*yyCharClass = charClass, yyMinRep = 0, yyMaxRep = 0, yyTok = tok
@@ -3107,17 +3107,17 @@ void TQRegExpEngine::parseFactor( Box *box )
 #endif
 
     parseAtom( box );
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     finishAtom( atom );
 #endif
 
     if ( yyTok == Tok_Quantifier ) {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	trivial = FALSE;
 #endif
 	if ( yyMaxRep == InftyRep ) {
 	    box->plus( atom );
-#ifndef QT_NO_REGEXP_INTERVAL
+#ifndef TQT_NO_REGEXP_INTERVAL
 	} else if ( yyMaxRep == 0 ) {
 	    box->clear();
 #endif
@@ -3125,7 +3125,7 @@ void TQRegExpEngine::parseFactor( Box *box )
 	if ( yyMinRep == 0 )
 	    box->opt();
 
-#ifndef QT_NO_REGEXP_INTERVAL
+#ifndef TQT_NO_REGEXP_INTERVAL
 	yyMayCapture = FALSE;
 	int alpha = ( yyMinRep == 0 ) ? 0 : yyMinRep - 1;
 	int beta = ( yyMaxRep == InftyRep ) ? 0 : yyMaxRep - ( alpha + 1 );
@@ -3152,7 +3152,7 @@ void TQRegExpEngine::parseFactor( Box *box )
 	*box = rightBox;
 #endif
 	yyTok = getToken();
-#ifndef QT_NO_REGEXP_INTERVAL
+#ifndef TQT_NO_REGEXP_INTERVAL
 	yyMayCapture = mayCapture;
 #endif
     }
@@ -3161,7 +3161,7 @@ void TQRegExpEngine::parseFactor( Box *box )
 
 void TQRegExpEngine::parseTerm( Box *box )
 {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
     if ( yyTok != Tok_Eos && yyTok != Tok_RightParen && yyTok != Tok_Bar )
 	parseFactor( box );
 #endif
@@ -3176,7 +3176,7 @@ void TQRegExpEngine::parseExpression( Box *box )
 {
     parseTerm( box );
     while ( yyTok == Tok_Bar ) {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 	trivial = FALSE;
 #endif
 	Box rightBox( this );
@@ -3196,12 +3196,12 @@ struct TQRegExpPrivate
 {
     TQString pattern; // regular-expression or wildcard pattern
     TQString rxpattern; // regular-expression pattern
-#ifndef QT_NO_REGEXP_WILDCARD
+#ifndef TQT_NO_REGEXP_WILDCARD
     bool wc : 1; // wildcard mode?
 #endif
     bool min : 1; // minimal matching? (instead of maximal)
     bool cs : 1; // case sensitive?
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     TQString t; // last string passed to TQRegExp::search() or searchRev()
     TQStringList capturedCache; // what TQRegExp::capturedTexts() returned last
 #endif
@@ -3210,12 +3210,12 @@ struct TQRegExpPrivate
     TQRegExpPrivate() { captured.fill( -1, 2 ); }
 };
 
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 static TQSingleCleanupHandler > cleanup_cache;
 #  ifndef TQT_THREAD_SUPPORT
 static TQCache *engineCache = 0;
 #  endif // TQT_THREAD_SUPPORT
-#endif // QT_NO_REGEXP_OPTIM
+#endif // TQT_NO_REGEXP_OPTIM
 
 static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern,
 			  bool caseSensitive, bool deref )
@@ -3229,7 +3229,7 @@ static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern,
 #endif // TQT_THREAD_SUPPORT
 
     if ( !deref ) {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 #  ifdef TQT_THREAD_SUPPORT
         if ( currentThread )
 #  endif
@@ -3244,13 +3244,13 @@ static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern,
                     }
                 }
             }
-#endif // QT_NO_REGEXP_OPTIM
+#endif // TQT_NO_REGEXP_OPTIM
 	eng = new TQRegExpEngine( pattern, caseSensitive );
 	return;
     }
 
     if ( eng->deref() ) {
-#ifndef QT_NO_REGEXP_OPTIM
+#ifndef TQT_NO_REGEXP_OPTIM
 #  ifdef TQT_THREAD_SUPPORT
         if ( currentThread )
 #  endif
@@ -3270,7 +3270,7 @@ static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern,
             }
 #else
 	Q_UNUSED( pattern );
-#endif // QT_NO_REGEXP_OPTIM
+#endif // TQT_NO_REGEXP_OPTIM
 	delete eng;
 	eng = 0;
     }
@@ -3301,7 +3301,7 @@ TQRegExp::TQRegExp()
     : eng( 0 )
 {
     priv = new TQRegExpPrivate;
-#ifndef QT_NO_REGEXP_WILDCARD
+#ifndef TQT_NO_REGEXP_WILDCARD
     priv->wc = FALSE;
 #endif
     priv->min = FALSE;
@@ -3322,7 +3322,7 @@ TQRegExp::TQRegExp( const TQString& pattern, bool caseSensitive, bool wildcard )
 {
     priv = new TQRegExpPrivate;
     priv->pattern = pattern;
-#ifndef QT_NO_REGEXP_WILDCARD
+#ifndef TQT_NO_REGEXP_WILDCARD
     priv->wc = wildcard;
 #endif
     priv->min = FALSE;
@@ -3364,12 +3364,12 @@ TQRegExp& TQRegExp::operator=( const TQRegExp& rx )
     eng = otherEng;
     priv->pattern = rx.priv->pattern;
     priv->rxpattern = rx.priv->rxpattern;
-#ifndef QT_NO_REGEXP_WILDCARD
+#ifndef TQT_NO_REGEXP_WILDCARD
     priv->wc = rx.priv->wc;
 #endif
     priv->min = rx.priv->min;
     priv->cs = rx.priv->cs;
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     priv->t = rx.priv->t;
     priv->capturedCache = rx.priv->capturedCache;
 #endif
@@ -3388,7 +3388,7 @@ TQRegExp& TQRegExp::operator=( const TQRegExp& rx )
 bool TQRegExp::operator==( const TQRegExp& rx ) const
 {
     return priv->pattern == rx.priv->pattern &&
-#ifndef QT_NO_REGEXP_WILDCARD
+#ifndef TQT_NO_REGEXP_WILDCARD
 	   priv->wc == rx.priv->wc &&
 #endif
 	   priv->min == rx.priv->min &&
@@ -3500,7 +3500,7 @@ void TQRegExp::setCaseSensitive( bool sensitive )
     }
 }
 
-#ifndef QT_NO_REGEXP_WILDCARD
+#ifndef TQT_NO_REGEXP_WILDCARD
 /*!
     Returns TRUE if wildcard mode is enabled; otherwise returns FALSE.
     The default is FALSE.
@@ -3735,7 +3735,7 @@ int TQRegExp::matchedLength() const
     return priv->captured[1];
 }
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 /*!
   Returns the number of captures contained in the regular expression.
  */
@@ -3947,7 +3947,7 @@ TQString TQRegExp::escape( const TQString& str )
 void TQRegExp::prepareEngine() const
 {
     if ( eng == 0 ) {
-#ifndef QT_NO_REGEXP_WILDCARD
+#ifndef TQT_NO_REGEXP_WILDCARD
 	if ( priv->wc )
 	    priv->rxpattern = wc2rx( priv->pattern );
 	else
@@ -3965,7 +3965,7 @@ void TQRegExp::prepareEngine() const
 void TQRegExp::prepareEngineForMatch( const TQString& str ) const
 {
     prepareEngine();
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
     priv->t = str;
     priv->capturedCache.clear();
 #else
@@ -3993,4 +3993,4 @@ int TQRegExp::caretIndex( int offset, CaretMode caretMode )
     }
 }
 
-#endif // QT_NO_REGEXP
+#endif // TQT_NO_REGEXP
diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp
index 929f7960b..fa44ff054 100644
--- a/src/tools/qsettings.cpp
+++ b/src/tools/qsettings.cpp
@@ -55,7 +55,7 @@ static inline int qt_open( const char *pathname, int flags, mode_t mode )
 
 #include "ntqsettings.h"
 
-#ifndef QT_NO_SETTINGS
+#ifndef TQT_NO_SETTINGS
 
 #include "ntqdir.h"
 #include "ntqfile.h"
diff --git a/src/tools/qsettings_p.h b/src/tools/qsettings_p.h
index 73c92ff3b..7ea1ac8de 100644
--- a/src/tools/qsettings_p.h
+++ b/src/tools/qsettings_p.h
@@ -59,7 +59,7 @@
 #include "ntqvaluestack.h"
 #endif // QT_H
 
-#ifndef QT_NO_SETTINGS
+#ifndef TQT_NO_SETTINGS
 class TQSettingsSysPrivate;
 
 // TQSettingsGroup is a map of key/value pairs
@@ -144,5 +144,5 @@ public:
 #endif
 
 };
-#endif //QT_NO_SETTINGS
+#endif //TQT_NO_SETTINGS
 #endif // TQSETTINGS_P_H
diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp
index 6afe0687a..421ef009f 100644
--- a/src/tools/qstring.cpp
+++ b/src/tools/qstring.cpp
@@ -41,8 +41,8 @@
 
 // Don't define it while compiling this module, or USERS of TQt will
 // not be able to link.
-#ifdef QT_NO_CAST_ASCII
-#undef QT_NO_CAST_ASCII
+#ifdef TQT_NO_CAST_ASCII
+#undef TQT_NO_CAST_ASCII
 #endif
 
 // WARNING
@@ -53,7 +53,7 @@
 #include "ntqstring.h"
 #include "ntqregexp.h"
 #include "ntqdatastream.h"
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 #include "ntqtextcodec.h"
 #endif
 #include "ntqlocale.h"
@@ -74,7 +74,7 @@
 #if defined(Q_OS_LINUX)
 #include 
 #endif
-#if !defined( QT_NO_COMPONENT ) && !defined( QT_LITE_COMPONENT )
+#if !defined( TQT_NO_COMPONENT ) && !defined( QT_LITE_COMPONENT )
 #include "ntqcleanuphandler.h"
 #endif
 
@@ -575,7 +575,7 @@ bool TQChar::isSymbol() const
 */
 int TQChar::digitValue() const
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     register int pos = TQUnicodeTables::decimal_info[row()];
     if( !pos )
 	return -1;
@@ -641,7 +641,7 @@ TQChar TQChar::mirroredChar() const
     return ::mirroredChar( *this );
 }
 
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
 // ### REMOVE ME 4.0
 static TQString shared_decomp;
 #endif
@@ -653,7 +653,7 @@ static TQString shared_decomp;
 */
 const TQString &TQChar::decomposition() const
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     register int pos = TQUnicodeTables::decomposition_info[row()];
     if(!pos) return TQString::null;
 
@@ -680,7 +680,7 @@ const TQString &TQChar::decomposition() const
 */
 TQChar::Decomposition TQChar::decompositionTag() const
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     register int pos = TQUnicodeTables::decomposition_info[row()];
     if(!pos) return TQChar::Single;
 
@@ -938,7 +938,7 @@ TQChar TQChar::upper() const
     FALSE.
 */
 
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
 
 // small class used internally in TQString::Compose()
 class TQLigature
@@ -1119,7 +1119,7 @@ void TQStringData::setDirty() {
 */
 void TQString::compose()
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     unsigned int index=0, len;
     unsigned int cindex = 0;
 
@@ -1557,7 +1557,7 @@ TQString::TQString( int size, bool /*dummy*/ )
 
 TQString::TQString( const TQByteArray& ba )
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( TQTextCodec::codecForCStrings() ) {
 	d = 0;
 	*this = fromAscii( ba.data(), ba.size() );
@@ -1607,7 +1607,7 @@ TQString::TQString( const TQChar* unicode, uint length )
 
     This is a cast constructor, but it is perfectly safe: converting a
     Latin-1 \c{const char *} to TQString preserves all the information. You
-    can disable this constructor by defining \c QT_NO_CAST_ASCII when
+    can disable this constructor by defining \c TQT_NO_CAST_ASCII when
     you compile your applications. You can also make TQString objects
     by using setLatin1(), fromLatin1(), fromLocal8Bit(), and
     fromUtf8(). Or whatever encoding is appropriate for the 8-bit data
@@ -1618,7 +1618,7 @@ TQString::TQString( const TQChar* unicode, uint length )
 
 TQString::TQString( const char *str )
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( TQTextCodec::codecForCStrings() ) {
 	d = 0;
 	*this = fromAscii( str );
@@ -1639,7 +1639,7 @@ TQString::TQString( const char *str )
 
 TQString::TQString( const std::string &str )
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( TQTextCodec::codecForCStrings() ) {
 	d = 0;
 	*this = fromAscii( str.c_str() );
@@ -2604,7 +2604,7 @@ TQString TQString::multiArg( int numArgs, const TQString& a1, const TQString& a2
     \sa arg()
 */
 
-#ifndef QT_NO_SPRINTF
+#ifndef TQT_NO_SPRINTF
 TQString &TQString::sprintf(const char *cformat, ...)
 {
     va_list ap;
@@ -3509,7 +3509,7 @@ TQString TQString::section( const TQString &sep, int start, int end, int flags )
     return ret;
 }
 
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 class section_chunk {
 public:
     section_chunk(int l, TQString s) { length = l; string = s; }
@@ -4107,11 +4107,11 @@ TQString &TQString::insert( uint index, const TQString &s )
     a reference to the string.
 */
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 TQString &TQString::insertHelper( uint index, const char *s, uint len )
 {
     if ( s ) {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 	if ( TQTextCodec::codecForCStrings() )
 	    return insert( index, fromAscii( s, len ) );
 #endif
@@ -4399,7 +4399,7 @@ TQString &TQString::replace( TQChar c1, TQChar c2 )
     return *this;
 }
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 
 /*! \overload
 
@@ -4657,7 +4657,7 @@ TQString &TQString::replace( const TQString & before, const TQString & after )
     return replace( before, after, TRUE );
 }
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 /*! \overload
 
   Replaces every occurrence of the regexp \a rx in the string with
@@ -4816,7 +4816,7 @@ TQString &TQString::replace( const TQRegExp &rx, const TQString &after )
 }
 #endif
 
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 /*!
     Finds the first match of the regular expression \a rx, starting
     from position \a index. If \a index is -1, the search starts at
@@ -4894,7 +4894,7 @@ int TQString::contains( const TQRegExp &rx ) const
     return count;
 }
 
-#endif //QT_NO_REGEXP
+#endif //TQT_NO_REGEXP
 
 /*!
     Returns the string converted to a \c long using base \a
@@ -5798,11 +5798,11 @@ TQString& TQString::operator+=( const TQString &str )
     return *this;
 }
 
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 TQString &TQString::operatorPlusEqHelper( const char *s, uint len2 )
 {
     if ( s ) {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 	if ( TQTextCodec::codecForCStrings() )
 	    return operator+=( fromAscii( s, len2 ) );
 #endif
@@ -5828,7 +5828,7 @@ TQString &TQString::operatorPlusEqHelper( const char *s, uint len2 )
 
   Appends \a str to the string and returns a reference to the string.
 */
-#ifndef QT_NO_CAST_ASCII
+#ifndef TQT_NO_CAST_ASCII
 TQString& TQString::operator+=( const char *str )
 {
     // ### TQt 4: make this function inline
@@ -5856,7 +5856,7 @@ TQString &TQString::operator+=( TQChar c )
 
 TQString &TQString::operator+=( char c )
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( TQTextCodec::codecForCStrings() )
 	return operator+=( fromAscii( &c, 1 ) );
 #endif
@@ -5929,7 +5929,7 @@ const char* TQString::latin1() const
 */
 const char* TQString::ascii() const
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( TQTextCodec::codecForCStrings() ) {
 	if ( !d->ascii || d->islatin1 ) {
 	    if (d->security_unpaged) {
@@ -5956,7 +5956,7 @@ const char* TQString::ascii() const
 	}
 	return d->ascii;
     }
-#endif // QT_NO_TEXTCODEC
+#endif // TQT_NO_TEXTCODEC
     return latin1();
 }
 
@@ -6167,7 +6167,7 @@ TQString TQString::fromUtf8( const char* utf8, int len )
 
     This is the same as the TQString(const char*) constructor, but you
     can make that constructor invisible if you compile with the define
-    \c QT_NO_CAST_ASCII, in which case you can explicitly create a
+    \c TQT_NO_CAST_ASCII, in which case you can explicitly create a
     TQString from 8-bit ASCII text using this function.
 
     \code
@@ -6177,7 +6177,7 @@ TQString TQString::fromUtf8( const char* utf8, int len )
  */
 TQString TQString::fromAscii( const char* ascii, int len )
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( TQTextCodec::codecForCStrings() ) {
 	if ( !ascii )
 	    return TQString::null;
@@ -6235,7 +6235,7 @@ TQString TQString::fromLatin1( const char* chars, int len )
 
 TQCString TQString::local8Bit() const
 {
-#ifdef QT_NO_TEXTCODEC
+#ifdef TQT_NO_TEXTCODEC
     return latin1();
 #else
 #ifdef Q_WS_X11
@@ -6277,7 +6277,7 @@ TQCString TQString::local8Bit() const
 */
 TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
 {
-#ifdef QT_NO_TEXTCODEC
+#ifdef TQT_NO_TEXTCODEC
     return fromLatin1( local8Bit, len );
 #else
 
@@ -6305,7 +6305,7 @@ TQString TQString::fromLocal8Bit( const char* local8Bit, int len )
 #ifdef Q_WS_QWS
     return fromUtf8(local8Bit,len);
 #endif
-#endif // QT_NO_TEXTCODEC
+#endif // TQT_NO_TEXTCODEC
 }
 
 /*!
@@ -6584,12 +6584,12 @@ TQString& TQString::setUnicodeCodes( const ushort* unicode_as_ushorts, uint len
 
 TQString &TQString::setAscii( const char *str, int len )
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( TQTextCodec::codecForCStrings() ) {
 	*this = TQString::fromAscii( str, len );
 	return *this;
     }
-#endif // QT_NO_TEXTCODEC
+#endif // TQT_NO_TEXTCODEC
     return setLatin1( str, len );
 }
 
@@ -6755,7 +6755,7 @@ int TQString::localeAwareCompare( const TQString& s ) const
     }
 #elif defined(Q_WS_MACX)
     int delta = 0;
-#if !defined(QT_NO_TEXTCODEC)
+#if !defined(TQT_NO_TEXTCODEC)
     TQTextCodec *codec = TQTextCodec::codecForLocale();
     if (codec)
         delta = strcoll(codec->fromUnicode(*this), codec->fromUnicode(s));
@@ -7107,7 +7107,7 @@ bool operator>=( const char *s1, const TQString &s2 )
 /*****************************************************************************
   TQString stream functions
  *****************************************************************************/
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQString
 
@@ -7212,7 +7212,7 @@ TQDataStream &operator>>( TQDataStream &s, TQString &str )
     }
     return s;
 }
-#endif // QT_NO_DATASTREAM
+#endif // TQT_NO_DATASTREAM
 
 /*****************************************************************************
   TQConstString member functions
@@ -7439,7 +7439,7 @@ TQCString qt_winTQString2MB( const TQString& s, int uclen )
 				0, 0, 0, &used_def));
 		// and try again...
 	} else {
-#ifndef QT_NO_DEBUG
+#ifndef TQT_NO_DEBUG
 	    // Fail.
 	    tqWarning("WideCharToMultiByte cannot convert multibyte text (error %d): %s (UTF8)",
 		r, s.utf8().data());
diff --git a/src/tools/qstringlist.cpp b/src/tools/qstringlist.cpp
index 3f77cc52d..71427d4e7 100644
--- a/src/tools/qstringlist.cpp
+++ b/src/tools/qstringlist.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqstringlist.h"
 
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 #include "ntqregexp.h"
 #include "ntqstrlist.h"
 #include "ntqdatastream.h"
@@ -244,7 +244,7 @@ TQStringList TQStringList::split( const TQString &sep, const TQString &str,
     return lst;
 }
 
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 /*!
     Splits the string \a str into strings wherever the regular
     expression \a sep occurs, and returns the list of those strings.
@@ -323,7 +323,7 @@ TQStringList TQStringList::grep( const TQString &str, bool cs ) const
     return res;
 }
 
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 /*!
     \overload
 
@@ -373,7 +373,7 @@ TQStringList& TQStringList::gres( const TQString &before, const TQString &after,
     return *this;
 }
 
-#ifndef QT_NO_REGEXP_CAPTURE
+#ifndef TQT_NO_REGEXP_CAPTURE
 /*!
     \overload
 
@@ -435,7 +435,7 @@ TQString TQStringList::join( const TQString &sep ) const
     return res;
 }
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 Q_EXPORT TQDataStream &operator>>( TQDataStream & s, TQStringList& l )
 {
     return s >> (TQValueList&)l;
@@ -464,4 +464,4 @@ TQStringList TQStringList::fromStrList(const TQStrList& ascii)
 */
 
 
-#endif //QT_NO_STRINGLIST
+#endif //TQT_NO_STRINGLIST
diff --git a/src/tools/qtextstream.cpp b/src/tools/qtextstream.cpp
index 213581b82..36a74c4e7 100644
--- a/src/tools/qtextstream.cpp
+++ b/src/tools/qtextstream.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqtextstream.h"
 
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
 #include "ntqtextcodec.h"
 #include "ntqregexp.h"
 #include "ntqbuffer.h"
@@ -222,7 +222,7 @@ const int TQTextStream::floatfield  = ( TQTextStream::scientific |
 
 class TQTextStreamPrivate {
 public:
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     TQTextStreamPrivate()
 	: decoder( 0 ), encoder( 0 ), sourceType( NotSet ) { }
     ~TQTextStreamPrivate() {
@@ -705,7 +705,7 @@ uint TQTextStream::ts_getbuf( TQChar* buf, uint len )
 	}
     }
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( mapper ) {
 	bool shortRead = FALSE;
 	if ( !d->decoder )
@@ -893,7 +893,7 @@ uint TQTextStream::ts_getline( TQChar* buf )
 	    return rnum;
     }
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( mapper ) {
 	if ( !d->decoder )
 	    d->decoder = mapper->makeDecoder();
@@ -964,7 +964,7 @@ uint TQTextStream::ts_getline( TQChar* buf )
 */
 void TQTextStream::ts_putc( TQChar c )
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( mapper ) {
 	if ( !d->encoder )
 	    d->encoder = mapper->makeEncoder();
@@ -1078,7 +1078,7 @@ TQTextStream &TQTextStream::writeBlock( const char* p, uint len )
 	dev->writeBlock( (char*)u, len * sizeof(TQChar) );
 	delete [] u;
     }
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     else if (mapper) {
         if (!d->encoder)
             d->encoder = mapper->makeEncoder();
@@ -1097,7 +1097,7 @@ TQTextStream &TQTextStream::writeBlock( const char* p, uint len )
 
 TQTextStream &TQTextStream::writeBlock( const TQChar* p, uint len )
 {
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
     if ( mapper ) {
 	if ( !d->encoder )
 	    d->encoder = mapper->makeEncoder();
@@ -2533,7 +2533,7 @@ void TQTextStream::setEncoding( Encoding e )
 	networkOrder = TQChar::networkOrdered();
 	break;
     case UnicodeUTF8:
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 	mapper = TQTextCodec::codecForMib( 106 );
 	latin1 = FALSE;
 	doUnicodeHeader = TRUE;
@@ -2568,7 +2568,7 @@ void TQTextStream::setEncoding( Encoding e )
 	break;
     case Locale:
 	latin1 = TRUE; // fallback to Latin-1
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 	mapper = TQTextCodec::codecForLocale();
 	// optimized Latin-1 processing
 #if defined(Q_OS_WIN32)
@@ -2590,7 +2590,7 @@ void TQTextStream::setEncoding( Encoding e )
 }
 
 
-#ifndef QT_NO_TEXTCODEC
+#ifndef TQT_NO_TEXTCODEC
 /*!
     Sets the codec for this stream to \a codec. Will not try to
     autodetect Unicode.
@@ -2633,4 +2633,4 @@ TQTextCodec *TQTextStream::codec()
 
 #endif
 
-#endif // QT_NO_TEXTSTREAM
+#endif // TQT_NO_TEXTSTREAM
diff --git a/src/tools/qucom.cpp b/src/tools/qucom.cpp
index 905c1feb2..28d41387f 100644
--- a/src/tools/qucom.cpp
+++ b/src/tools/qucom.cpp
@@ -226,7 +226,7 @@ bool TQUType_idisp::convertFrom( TQUObject *o, TQUType *t )
 
 bool TQUType_idisp::convertTo( TQUObject *o, TQUType *t )
 {
-#ifndef QT_NO_COMPONENT
+#ifndef TQT_NO_COMPONENT
     if ( isEqual( t, &static_QUType_iface ) ) {
 	o->payload.iface = (TQUnknownInterface*)o->payload.idisp;
 	o->type = &static_QUType_iface;
diff --git a/src/tools/qunicodetables.cpp b/src/tools/qunicodetables.cpp
index 8e9b5c1d3..d4d7fc2a1 100644
--- a/src/tools/qunicodetables.cpp
+++ b/src/tools/qunicodetables.cpp
@@ -234,7 +234,7 @@ for $row ( 0..255 ) {
 }
 
 print "// START OF GENERATED DATA\n\n";
-print "#ifndef QT_NO_UNICODETABLES\n\n";
+print "#ifndef TQT_NO_UNICODETABLES\n\n";
 
 # Print pages...
 #
@@ -579,7 +579,7 @@ __END__
 
 // START OF GENERATED DATA
 
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
 
 const TQ_UINT8 TQUnicodeTables::unicode_info[] = {
     1, 2, 3, 4, 5, 6, 7, 8,
@@ -11403,7 +11403,7 @@ const TQ_INT8 TQUnicodeTables::decimal_info[] = {
 
 #endif
 
-#ifdef QT_NO_UNICODETABLES
+#ifdef TQT_NO_UNICODETABLES
 
 const TQ_UINT8 TQUnicodeTables::latin1_line_break_info[] = {
     19, 19, 19, 19, 19, 19, 19, 19,
@@ -12936,7 +12936,7 @@ const TQ_UINT8 TQUnicodeTables::line_break_info[] = {
 
 
 
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
 const TQ_UINT16 TQUnicodeTables::symmetricPairs[] = {
     0x0028, 0x0029, 0x003C, 0x003E, 0x005B, 0x005D, 0x007B, 0x007D,
     0x00AB, 0x00BB, 0x2039, 0x203A, 0x2045, 0x2046, 0x207D, 0x207E,
diff --git a/src/tools/qunicodetables_p.h b/src/tools/qunicodetables_p.h
index 7cc4cc6ec..4adbc1f67 100644
--- a/src/tools/qunicodetables_p.h
+++ b/src/tools/qunicodetables_p.h
@@ -55,14 +55,14 @@
 #include "ntqstring.h"
 #endif // QT_H
 
-#ifdef QT_NO_UNICODETABLES
+#ifdef TQT_NO_UNICODETABLES
 # include 
 #endif
 
 class TQUnicodeTables {
 public:
     static const TQ_UINT8 unicode_info[];
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     static const TQ_UINT16 decomposition_map[];
     static const TQ_UINT16 decomposition_info[];
     static const TQ_UINT16 ligature_map[];
@@ -97,19 +97,19 @@ public:
 
 inline TQChar::Category category( const TQChar &c )
 {
-#ifdef QT_NO_UNICODETABLES
+#ifdef TQT_NO_UNICODETABLES
     if ( c.unicode() > 0xff ) return TQChar::Letter_Uppercase; //########
     return (TQChar::Category)TQUnicodeTables::unicode_info[c.unicode()];
 #else
     register int uc = ((int)TQUnicodeTables::unicode_info[c.row()]) << 8;
     uc += c.cell();
     return (TQChar::Category)TQUnicodeTables::unicode_info[uc];
-#endif // QT_NO_UNICODETABLES
+#endif // TQT_NO_UNICODETABLES
 }
 
 inline TQChar lower( const TQChar &c )
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     int row = c.row();
     int cell = c.cell();
     register int ci = TQUnicodeTables::case_info[row];
@@ -128,7 +128,7 @@ inline TQChar lower( const TQChar &c )
 
 inline TQChar upper( const TQChar &c )
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     int row = c.row();
     int cell = c.cell();
     register int ci = TQUnicodeTables::case_info[row];
@@ -147,7 +147,7 @@ inline TQChar upper( const TQChar &c )
 
 inline TQChar::Direction direction( const TQChar &c )
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     register int pos = TQUnicodeTables::direction_info[c.row()];
     return (TQChar::Direction) (TQUnicodeTables::direction_info[(pos<<8)+c.cell()] & 0x1f);
 #else
@@ -158,7 +158,7 @@ inline TQChar::Direction direction( const TQChar &c )
 
 inline bool mirrored( const TQChar &c )
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     register int pos = TQUnicodeTables::direction_info[c.row()];
     return TQUnicodeTables::direction_info[(pos<<8)+c.cell()] > 128;
 #else
@@ -170,7 +170,7 @@ inline bool mirrored( const TQChar &c )
 
 inline TQChar mirroredChar( const TQChar &ch )
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     if(!::mirrored( ch ))
 	return ch;
 
@@ -186,7 +186,7 @@ inline TQChar mirroredChar( const TQChar &ch )
 
 inline TQChar::Joining joining( const TQChar &ch )
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     register int pos = TQUnicodeTables::direction_info[ch.row()];
     return (TQChar::Joining) ((TQUnicodeTables::direction_info[(pos<<8)+ch.cell()] >> 5) &0x3);
 #else
@@ -203,7 +203,7 @@ inline bool isMark( const TQChar &ch )
 
 inline unsigned char combiningClass( const TQChar &ch )
 {
-#ifndef QT_NO_UNICODETABLES
+#ifndef TQT_NO_UNICODETABLES
     const int pos = TQUnicodeTables::combining_info[ch.row()];
     return TQUnicodeTables::combining_info[(pos<<8) + ch.cell()];
 #else
@@ -221,7 +221,7 @@ inline bool isSpace( const TQChar &ch )
 
 inline int lineBreakClass( const TQChar &ch )
 {
-#ifdef QT_NO_UNICODETABLES
+#ifdef TQT_NO_UNICODETABLES
     return ch.row() ? TQUnicodeTables::LineBreak_AL
 	: TQUnicodeTables::latin1_line_break_info[ch.cell()];
 #else
diff --git a/src/tools/quuid.cpp b/src/tools/quuid.cpp
index 11468a7ec..15e3b3c6e 100644
--- a/src/tools/quuid.cpp
+++ b/src/tools/quuid.cpp
@@ -90,7 +90,7 @@
 
     Creates a copy of the TQUuid \a orig.
 */
-#ifndef QT_NO_QUUID_STRING
+#ifndef TQT_NO_QUUID_STRING
 /*!
     Creates a TQUuid object from the string \a text. The function can
     only convert a string in the format
@@ -172,7 +172,7 @@ TQUuid::TQUuid( const char *text )
     Returns TRUE if this TQUuid and the \a other TQUuid are different;
     otherwise returns FALSE.
 */
-#ifndef QT_NO_QUUID_STRING
+#ifndef TQT_NO_QUUID_STRING
 /*!
     \fn TQUuid::operator TQString() const
 
@@ -202,7 +202,7 @@ TQString TQUuid::toString() const
 }
 #endif
 
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 /*!
     \relates TQUuid
     Writes the uuid \a id to the datastream \a s.
diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h
index 1ca1032c8..cb568071d 100644
--- a/src/widgets/ntqaction.h
+++ b/src/widgets/ntqaction.h
@@ -48,7 +48,7 @@
 #include "ntqkeysequence.h"
 #endif // QT_H
 
-#ifndef QT_NO_ACTION
+#ifndef TQT_NO_ACTION
 
 class TQActionPrivate;
 class TQActionGroupPrivate;
@@ -68,14 +68,14 @@ class Q_EXPORT TQAction : public TQObject
     TQ_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip )
     TQ_PROPERTY( TQString statusTip READ statusTip WRITE setStatusTip )
     TQ_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis )
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQ_PROPERTY( TQKeySequence accel READ accel WRITE setAccel )
 #endif
     TQ_PROPERTY( bool visible READ isVisible WRITE setVisible )
 
 public:
     TQAction( TQObject* parent, const char* name = 0 );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQAction( const TQString& menuText, TQKeySequence accel,
 	     TQObject* parent, const char* name = 0 );
     TQAction( const TQIconSet& icon, const TQString& menuText, TQKeySequence accel,
@@ -101,7 +101,7 @@ public:
     TQString statusTip() const;
     virtual void setWhatsThis( const TQString& );
     TQString whatsThis() const;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     virtual void setAccel( const TQKeySequence& key );
     TQKeySequence accel() const;
 #endif
diff --git a/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h
index 9c47e60e2..ee6b341c6 100644
--- a/src/widgets/ntqbutton.h
+++ b/src/widgets/ntqbutton.h
@@ -46,7 +46,7 @@
 #include "ntqkeysequence.h"
 #endif // QT_H
 
-#ifndef QT_NO_BUTTON
+#ifndef TQT_NO_BUTTON
 
 
 class TQButtonGroup;
@@ -78,7 +78,7 @@ public:
     const TQPixmap *pixmap() const;
     virtual void setPixmap( const TQPixmap & );
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQKeySequence		accel()	const;
     virtual void	setAccel( const TQKeySequence& );
 #endif
@@ -229,6 +229,6 @@ inline TQButton::ToggleType TQButton::toggleType() const
 }
 
 
-#endif // QT_NO_BUTTON
+#endif // TQT_NO_BUTTON
 
 #endif // TQBUTTON_H
diff --git a/src/widgets/ntqbuttongroup.h b/src/widgets/ntqbuttongroup.h
index 92e2860af..0903ae913 100644
--- a/src/widgets/ntqbuttongroup.h
+++ b/src/widgets/ntqbuttongroup.h
@@ -45,7 +45,7 @@
 #include "ntqgroupbox.h"
 #endif // QT_H
 
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
 
 
 class TQButton;
@@ -116,6 +116,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_BUTTONGROUP
+#endif // TQT_NO_BUTTONGROUP
 
 #endif // TQBUTTONGROUP_H
diff --git a/src/widgets/ntqcheckbox.h b/src/widgets/ntqcheckbox.h
index a62a0d1bb..4c91197e7 100644
--- a/src/widgets/ntqcheckbox.h
+++ b/src/widgets/ntqcheckbox.h
@@ -45,7 +45,7 @@
 #include "ntqbutton.h"
 #endif // QT_H
 
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 
 class Q_EXPORT TQCheckBox : public TQButton
 {
@@ -91,6 +91,6 @@ inline void TQCheckBox::setChecked( bool check )
 { setOn( check ); }
 
 
-#endif // QT_NO_CHECKBOX
+#endif // TQT_NO_CHECKBOX
 
 #endif // TQCHECKBOX_H
diff --git a/src/widgets/ntqcombobox.h b/src/widgets/ntqcombobox.h
index c6b27ce93..faca22c2f 100644
--- a/src/widgets/ntqcombobox.h
+++ b/src/widgets/ntqcombobox.h
@@ -45,7 +45,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 
 
 class TQStrList;
@@ -176,7 +176,7 @@ protected:
     void	keyPressEvent( TQKeyEvent *e );
     void	focusInEvent( TQFocusEvent *e );
     void	focusOutEvent( TQFocusEvent *e );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void	wheelEvent( TQWheelEvent *e );
 #endif
     void	styleChange( TQStyle& );
@@ -201,6 +201,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_COMBOBOX
+#endif // TQT_NO_COMBOBOX
 
 #endif // TQCOMBOBOX_H
diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/ntqdatetimeedit.h
index 8078d826d..b96ff38dc 100644
--- a/src/widgets/ntqdatetimeedit.h
+++ b/src/widgets/ntqdatetimeedit.h
@@ -47,7 +47,7 @@
 #include "ntqdatetime.h"
 #endif // QT_H
 
-#ifndef QT_NO_DATETIMEEDIT
+#ifndef TQT_NO_DATETIMEEDIT
 
 class Q_EXPORT TQDateTimeEditBase : public TQWidget
 {
diff --git a/src/widgets/ntqdial.h b/src/widgets/ntqdial.h
index c28bedfa0..bb1f17377 100644
--- a/src/widgets/ntqdial.h
+++ b/src/widgets/ntqdial.h
@@ -47,7 +47,7 @@
 #include "ntqrangecontrol.h"
 #endif // QT_H
 
-#ifndef QT_NO_DIAL
+#ifndef TQT_NO_DIAL
 
 class TQDialPrivate;
 
@@ -119,7 +119,7 @@ protected:
     void mousePressEvent( TQMouseEvent * );
     void mouseReleaseEvent( TQMouseEvent * );
     void mouseMoveEvent( TQMouseEvent * );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void wheelEvent( TQWheelEvent * );
 #endif
     void focusInEvent( TQFocusEvent * );
@@ -148,6 +148,6 @@ private: // Disabled copy constructor and operator=
 
 };
 
-#endif  // QT_NO_DIAL
+#endif  // TQT_NO_DIAL
 
 #endif
diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h
index 7a5a5910b..39ad32a59 100644
--- a/src/widgets/ntqdockarea.h
+++ b/src/widgets/ntqdockarea.h
@@ -51,7 +51,7 @@
 #include "ntqtextstream.h"
 #endif // QT_H
 
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 
 class TQSplitter;
 class TQBoxLayout;
@@ -179,7 +179,7 @@ private:	// Disabled copy constructor and operator=
 
 };
 
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
 Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQDockArea & );
 Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & );
 #endif
@@ -188,4 +188,4 @@ Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQDockArea & );
 #include "ntqwinexport.h"
 #endif
 
-#endif //QT_NO_MAINWINDOW
+#endif //TQT_NO_MAINWINDOW
diff --git a/src/widgets/ntqdockwindow.h b/src/widgets/ntqdockwindow.h
index fa9d66bc3..6f5d69fd4 100644
--- a/src/widgets/ntqdockwindow.h
+++ b/src/widgets/ntqdockwindow.h
@@ -45,7 +45,7 @@
 #include "ntqframe.h"
 #endif // QT_H
 
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 
 class TQDockWindowHandle;
 class TQDockWindowTitleBar;
@@ -143,7 +143,7 @@ public:
 
     bool eventFilter( TQObject *o, TQEvent *e );
 
-#ifdef QT_NO_WIDGET_TOPEXTRA
+#ifdef TQT_NO_WIDGET_TOPEXTRA
     TQString caption() const;
 #endif
 
diff --git a/src/widgets/ntqframe.h b/src/widgets/ntqframe.h
index 8c66f0b17..74710e0c7 100644
--- a/src/widgets/ntqframe.h
+++ b/src/widgets/ntqframe.h
@@ -45,7 +45,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#ifndef QT_NO_FRAME
+#ifndef TQT_NO_FRAME
 
 class Q_EXPORT TQFrame : public TQWidget
 {
@@ -166,6 +166,6 @@ inline int TQFrame::frameWidth() const
 { return fwidth; }
 
 
-#endif // QT_NO_FRAME
+#endif // TQT_NO_FRAME
 
 #endif // TQFRAME_H
diff --git a/src/widgets/ntqgrid.h b/src/widgets/ntqgrid.h
index ff5bab2ba..7479b9548 100644
--- a/src/widgets/ntqgrid.h
+++ b/src/widgets/ntqgrid.h
@@ -41,7 +41,7 @@
 #include "ntqframe.h"
 #endif // QT_H
 
-#ifndef QT_NO_GRID
+#ifndef TQT_NO_GRID
 
 class TQGridLayout;
 
@@ -72,6 +72,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_GRID
+#endif // TQT_NO_GRID
 
 #endif // TQGRID_H
diff --git a/src/widgets/ntqgridview.h b/src/widgets/ntqgridview.h
index 72b0982f2..e08adfa5e 100644
--- a/src/widgets/ntqgridview.h
+++ b/src/widgets/ntqgridview.h
@@ -45,7 +45,7 @@
 #include "ntqscrollview.h"
 #endif // QT_H
 
-#ifndef QT_NO_GRIDVIEW
+#ifndef TQT_NO_GRIDVIEW
 
 class TQGridViewPrivate;
 
@@ -133,7 +133,7 @@ inline TQSize TQGridView::gridSize() const
 
 
 
-#endif // QT_NO_GRIDVIEW
+#endif // TQT_NO_GRIDVIEW
 
 
 #endif // TQTABLEVIEW_H
diff --git a/src/widgets/ntqgroupbox.h b/src/widgets/ntqgroupbox.h
index 49b7aa722..42c674b4b 100644
--- a/src/widgets/ntqgroupbox.h
+++ b/src/widgets/ntqgroupbox.h
@@ -45,7 +45,7 @@
 #include "ntqframe.h"
 #endif // QT_H
 
-#ifndef QT_NO_GROUPBOX
+#ifndef TQT_NO_GROUPBOX
 
 
 class TQAccel;
@@ -62,7 +62,7 @@ class Q_EXPORT TQGroupBox : public TQFrame
     TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation DESIGNABLE false )
     TQ_PROPERTY( int columns READ columns WRITE setColumns DESIGNABLE false )
     TQ_PROPERTY( bool flat READ isFlat WRITE setFlat )
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     TQ_PROPERTY( bool checkable READ isCheckable WRITE setCheckable )
     TQ_PROPERTY( bool checked READ isChecked WRITE setChecked )
 #endif
@@ -101,13 +101,13 @@ public:
     bool isFlat() const;
     void setFlat( bool b );
     bool isCheckable() const;
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     void setCheckable( bool b );
 #endif
     bool isChecked() const;
     void setEnabled(bool on);
 
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 public slots:
     void setChecked( bool b );
 
@@ -132,13 +132,13 @@ private:
     void calculateFrame();
     void insertWid( TQWidget* );
     void setTextSpacer();
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     void updateCheckBoxGeometry();
 #endif
     TQString str;
     int align;
     int lenvisible;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQAccel * accel;
 #endif
     TQGroupBoxPrivate * d;
@@ -160,6 +160,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_GROUPBOX
+#endif // TQT_NO_GROUPBOX
 
 #endif // TQGROUPBOX_H
diff --git a/src/widgets/ntqhbox.h b/src/widgets/ntqhbox.h
index 57fd2ba99..b2fd75946 100644
--- a/src/widgets/ntqhbox.h
+++ b/src/widgets/ntqhbox.h
@@ -42,7 +42,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#ifndef QT_NO_HBOX
+#ifndef TQT_NO_HBOX
 
 #include "ntqframe.h"
 
@@ -71,6 +71,6 @@ private:
 #endif
 };
 
-#endif // QT_NO_HBOX
+#endif // TQT_NO_HBOX
 
 #endif // TQHBOX_H
diff --git a/src/widgets/ntqhbuttongroup.h b/src/widgets/ntqhbuttongroup.h
index c5f59ffdb..acc4b0fc5 100644
--- a/src/widgets/ntqhbuttongroup.h
+++ b/src/widgets/ntqhbuttongroup.h
@@ -45,7 +45,7 @@
 #include "ntqbuttongroup.h"
 #endif // QT_H
 
-#ifndef QT_NO_HBUTTONGROUP
+#ifndef TQT_NO_HBUTTONGROUP
 
 class Q_EXPORT TQHButtonGroup : public TQButtonGroup
 {
@@ -63,6 +63,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_HBUTTONGROUP
+#endif // TQT_NO_HBUTTONGROUP
 
 #endif // TQHBUTTONGROUP_H
diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h
index a6d9ce339..65df516ad 100644
--- a/src/widgets/ntqheader.h
+++ b/src/widgets/ntqheader.h
@@ -47,7 +47,7 @@
 #include "ntqiconset.h" // conversion TQPixmap->TQIconset
 #endif // QT_H
 
-#ifndef QT_NO_HEADER
+#ifndef TQT_NO_HEADER
 
 class TQShowEvent;
 class TQHeaderData;
@@ -214,6 +214,6 @@ inline bool TQHeader::tracking() const { return trackingIsOn; }
 
 extern Q_EXPORT bool tqt_qheader_label_return_null_strings; // needed for professional edition
 
-#endif // QT_NO_HEADER
+#endif // TQT_NO_HEADER
 
 #endif // TQHEADER_H
diff --git a/src/widgets/ntqhgroupbox.h b/src/widgets/ntqhgroupbox.h
index 73d33e28f..a6f818930 100644
--- a/src/widgets/ntqhgroupbox.h
+++ b/src/widgets/ntqhgroupbox.h
@@ -45,7 +45,7 @@
 #include "ntqgroupbox.h"
 #endif // QT_H
 
-#ifndef QT_NO_HGROUPBOX
+#ifndef TQT_NO_HGROUPBOX
 
 class Q_EXPORT TQHGroupBox : public TQGroupBox
 {
@@ -62,6 +62,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_HGROUPBOX
+#endif // TQT_NO_HGROUPBOX
 
 #endif // TQHGROUPBOX_H
diff --git a/src/widgets/ntqiconview.h b/src/widgets/ntqiconview.h
index 0de837750..e9c5d9490 100644
--- a/src/widgets/ntqiconview.h
+++ b/src/widgets/ntqiconview.h
@@ -53,7 +53,7 @@
 #include "ntqpicture.h"
 #endif // QT_H
 
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
 
 class TQIconView;
 class TQPainter;
@@ -70,7 +70,7 @@ class TQIconViewItemLineEdit;
 class TQStringList;
 class TQIconDragPrivate;
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 class Q_EXPORT TQIconDragItem
 {
@@ -129,7 +129,7 @@ public:
     TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text );
     TQIconViewItem( TQIconView *parent, const TQString &text, const TQPixmap &icon );
     TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPixmap &icon );
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     TQIconViewItem( TQIconView *parent, const TQString &text, const TQPicture &picture );
     TQIconViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &text, const TQPicture &picture );
 #endif
@@ -141,7 +141,7 @@ public:
 
     virtual TQString text() const;
     virtual TQPixmap *pixmap() const;
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     virtual TQPicture *picture() const;
 #endif
     virtual TQString key() const;
@@ -187,7 +187,7 @@ public:
 
     virtual bool acceptDrop( const TQMimeSource *mime ) const;
 
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
     void rename();
 #endif
 
@@ -195,7 +195,7 @@ public:
 
     virtual void setText( const TQString &text );
     virtual void setPixmap( const TQPixmap &icon );
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     virtual void setPicture( const TQPicture &icon );
 #endif
     virtual void setText( const TQString &text, bool recalc, bool redraw = TRUE );
@@ -206,13 +206,13 @@ public:
     static int RTTI;
 
 protected:
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
     virtual void removeRenameBox();
 #endif
     virtual void calcRect( const TQString &text_ = TQString::null );
     virtual void paintItem( TQPainter *p, const TQColorGroup &cg );
     virtual void paintFocus( TQPainter *p, const TQColorGroup &cg );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     virtual void dropped( TQDropEvent *e, const TQValueList &lst );
 #endif
     virtual void dragEntered();
@@ -225,11 +225,11 @@ protected:
 
 private:
     void init( TQIconViewItem *after = 0
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
 	       , TQPicture *pic = 0
 #endif
 	       );
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
     void renameItem();
     void cancelRenameItem();
 #endif
@@ -239,7 +239,7 @@ private:
     TQString itemText, itemKey;
     TQString tmpText;
     TQPixmap *itemIcon;
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     TQPicture *itemPic;
 #endif
     TQIconViewItem *prev, *next;
@@ -252,7 +252,7 @@ private:
     uint dirty : 1;
     uint wordWrapDirty : 1;
     TQRect itemRect, itemTextRect, itemIconRect;
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
     TQIconViewItemLineEdit *renameBox;
 #endif
     TQRect oldRect;
@@ -414,7 +414,7 @@ signals:
     void mouseButtonClicked( int button, TQIconViewItem* item, const TQPoint& pos );
     void contextMenuRequested( TQIconViewItem* item, const TQPoint &pos );
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dropped( TQDropEvent *e, const TQValueList &lst );
 #endif
     void moved();
@@ -439,7 +439,7 @@ protected:
     void contentsMouseDoubleClickEvent( TQMouseEvent *e );
     void contentsContextMenuEvent( TQContextMenuEvent *e );
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void contentsDragEnterEvent( TQDragEnterEvent *e );
     void contentsDragMoveEvent( TQDragMoveEvent *e );
     void contentsDragLeaveEvent( TQDragLeaveEvent *e );
@@ -454,7 +454,7 @@ protected:
     void enterEvent( TQEvent *e );
 
     virtual void drawRubber( TQPainter *p );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     virtual TQDragObject *dragObject();
     virtual void startDrag();
 #endif
@@ -472,7 +472,7 @@ protected:
 private:
     void contentsMousePressEventEx( TQMouseEvent *e );
     virtual void drawDragShapes( const TQPoint &pnt );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     virtual void initDragEnter( TQDropEvent *e );
 #endif
     void drawContents( TQPainter* );
@@ -505,6 +505,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_ICONVIEW
+#endif // TQT_NO_ICONVIEW
 
 #endif // TQICONVIEW_H
diff --git a/src/widgets/ntqlabel.h b/src/widgets/ntqlabel.h
index b1d439fcd..e9c348e4e 100644
--- a/src/widgets/ntqlabel.h
+++ b/src/widgets/ntqlabel.h
@@ -45,7 +45,7 @@
 #include "ntqframe.h"
 #endif // QT_H
 
-#ifndef QT_NO_LABEL
+#ifndef TQT_NO_LABEL
 
 class TQSimpleRichText;
 class TQLabelPrivate;
@@ -71,10 +71,10 @@ public:
 
     TQString	 text()		const	{ return ltext; }
     TQPixmap     *pixmap()	const	{ return lpixmap; }
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     TQPicture    *picture()	const	{ return lpicture; }
 #endif
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     TQMovie      *movie()		const;
 #endif
 
@@ -88,13 +88,13 @@ public:
 
     bool 	 autoResize() const	{ return autoresize; }
     virtual void setAutoResize( bool );
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
     bool 	hasScaledContents() const;
     void 	setScaledContents( bool );
 #endif
     TQSize	 sizeHint() const;
     TQSize	 minimumSizeHint() const;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     virtual void setBuddy( TQWidget * );
     TQWidget     *buddy() const;
 #endif
@@ -105,10 +105,10 @@ public:
 public slots:
     virtual void setText( const TQString &);
     virtual void setPixmap( const TQPixmap & );
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     virtual void setPicture( const TQPicture & );
 #endif
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     virtual void setMovie( const TQMovie & );
 #endif
     virtual void setNum( int );
@@ -121,11 +121,11 @@ protected:
     void	 resizeEvent( TQResizeEvent* );
 
 private slots:
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     void	 acceleratorSlot();
     void	 buddyDied();
 #endif
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     void	 movieUpdated(const TQRect&);
     void	 movieResized(const TQSize&);
 #endif
@@ -137,13 +137,13 @@ private:
     TQSize	sizeForWidth( int w ) const;
     TQString	ltext;
     TQPixmap    *lpixmap;
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     TQPicture   *lpicture;
 #endif
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     TQMovie *	lmovie;
 #endif
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQWidget *	lbuddy;
 #endif
     ushort	align;
@@ -151,10 +151,10 @@ private:
     uint	autoresize:1;
     uint	scaledcontents :1;
     TextFormat textformat;
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     TQSimpleRichText* doc;
 #endif
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQAccel *	accel;
 #endif
     TQLabelPrivate* d;
@@ -169,6 +169,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_LABEL
+#endif // TQT_NO_LABEL
 
 #endif // TQLABEL_H
diff --git a/src/widgets/ntqlcdnumber.h b/src/widgets/ntqlcdnumber.h
index f76aa224c..140131290 100644
--- a/src/widgets/ntqlcdnumber.h
+++ b/src/widgets/ntqlcdnumber.h
@@ -46,7 +46,7 @@
 #include "ntqbitarray.h"
 #endif // QT_H
 
-#ifndef QT_NO_LCDNUMBER
+#ifndef TQT_NO_LCDNUMBER
 
 
 class TQLCDNumberPrivate;
@@ -141,6 +141,6 @@ inline int TQLCDNumber::numDigits() const
 { return ndigits; }
 
 
-#endif // QT_NO_LCDNUMBER
+#endif // TQT_NO_LCDNUMBER
 
 #endif // TQLCDNUMBER_H
diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h
index 28d00b183..18979f8f6 100644
--- a/src/widgets/ntqlineedit.h
+++ b/src/widgets/ntqlineedit.h
@@ -51,7 +51,7 @@ class TQPopupMenu;
 #include "ntqstring.h"
 #endif // QT_H
 
-#ifndef QT_NO_LINEEDIT
+#ifndef TQT_NO_LINEEDIT
 
 class TQTextParagraph;
 class TQTextCursor;
@@ -165,7 +165,7 @@ public slots:
     virtual void setSelection( int, int );
     virtual void setCursorPosition( int );
     virtual void setAlignment( int flag );
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     virtual void cut();
     virtual void copy() const;
     virtual void paste();
@@ -192,7 +192,7 @@ protected:
     void focusOutEvent( TQFocusEvent * );
     void resizeEvent( TQResizeEvent * );
     void drawContents( TQPainter * );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent *e );
     void dragLeaveEvent( TQDragLeaveEvent *e );
@@ -227,6 +227,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_LINEEDIT
+#endif // TQT_NO_LINEEDIT
 
 #endif // TQLINEEDIT_H
diff --git a/src/widgets/ntqlistbox.h b/src/widgets/ntqlistbox.h
index 7584e4f81..6a44866b7 100644
--- a/src/widgets/ntqlistbox.h
+++ b/src/widgets/ntqlistbox.h
@@ -46,7 +46,7 @@
 #include "ntqpixmap.h"
 #endif // QT_H
 
-#ifndef QT_NO_LISTBOX
+#ifndef TQT_NO_LISTBOX
 
 
 class TQListBoxPrivate;
@@ -430,6 +430,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_LISTBOX
+#endif // TQT_NO_LISTBOX
 
 #endif // TQLISTBOX_H
diff --git a/src/widgets/ntqlistview.h b/src/widgets/ntqlistview.h
index de41e07f3..250389a56 100644
--- a/src/widgets/ntqlistview.h
+++ b/src/widgets/ntqlistview.h
@@ -45,7 +45,7 @@
 #include "ntqscrollview.h"
 #endif // QT_H
 
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
 
 
 class TQPixmap;
@@ -187,7 +187,7 @@ protected:
     virtual void activate();
 
     bool activatedPos( TQPoint & );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     virtual void dropped( TQDropEvent *e );
 #endif
     virtual void dragEntered();
@@ -393,7 +393,7 @@ signals:
 
     void expanded( TQListViewItem *item );
     void collapsed( TQListViewItem *item );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dropped( TQDropEvent *e );
 #endif
     void itemRenamed( TQListViewItem *item, int col, const TQString & );
@@ -405,7 +405,7 @@ protected:
     void contentsMouseMoveEvent( TQMouseEvent * e );
     void contentsMouseDoubleClickEvent( TQMouseEvent * e );
     void contentsContextMenuEvent( TQContextMenuEvent * e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void contentsDragEnterEvent( TQDragEnterEvent *e );
     void contentsDragMoveEvent( TQDragMoveEvent *e );
     void contentsDragLeaveEvent( TQDragLeaveEvent *e );
@@ -601,6 +601,6 @@ private:
     bool isChecked( const TQListViewItem* ) const;
 };
 
-#endif // QT_NO_LISTVIEW
+#endif // TQT_NO_LISTVIEW
 
 #endif // TQLISTVIEW_H
diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h
index 03a9eee6d..1104608a4 100644
--- a/src/widgets/ntqmainwindow.h
+++ b/src/widgets/ntqmainwindow.h
@@ -48,7 +48,7 @@
 #include "ntqtextstream.h"
 #endif // QT_H
 
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 
 class TQMenuBar;
 class TQStatusBar;
@@ -70,11 +70,11 @@ public:
     TQMainWindow( TQWidget* parent=0, const char* name=0, WFlags f = WType_TopLevel );
     ~TQMainWindow();
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     TQMenuBar * menuBar() const;
 #endif
     TQStatusBar * statusBar() const;
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTipGroup * toolTipGroup() const;
 #endif
 
@@ -118,7 +118,7 @@ public:
 
     // compatibility stuff
     bool hasDockWindow( TQDockWindow *dw );
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     void addToolBar( TQDockWindow *, Dock = DockTop, bool newLine = FALSE );
     void addToolBar( TQDockWindow *, const TQString &label,
 		     Dock = DockTop, bool newLine = FALSE );
@@ -163,7 +163,7 @@ signals:
     void usesTextLabelChanged( bool );
     void dockWindowPositionChanged( TQDockWindow * );
 
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     // compatibility stuff
     void toolBarPositionChanged( TQToolBar * );
 #endif
@@ -188,11 +188,11 @@ private:
     void triggerLayout( bool deleteLayout = TRUE);
     bool dockMainWindow( TQObject *dock );
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     virtual void setMenuBar( TQMenuBar * );
 #endif
     virtual void setStatusBar( TQStatusBar * );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     virtual void setToolTipGroup( TQToolTipGroup * );
 #endif
 
@@ -208,7 +208,7 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
 inline void TQMainWindow::addToolBar( TQDockWindow *w, ToolBarDock dock, bool newLine )
 {
     addDockWindow( w, dock, newLine );
@@ -251,11 +251,11 @@ inline void TQMainWindow::setToolBarsMovable( bool b )
 }
 #endif
 
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
 Q_EXPORT TQTextStream &operator<<( TQTextStream &, const TQMainWindow & );
 Q_EXPORT TQTextStream &operator>>( TQTextStream &, TQMainWindow & );
 #endif
 
-#endif // QT_NO_MAINWINDOW
+#endif // TQT_NO_MAINWINDOW
 
 #endif // TQMAINWINDOW_H
diff --git a/src/widgets/ntqmenubar.h b/src/widgets/ntqmenubar.h
index 87e316fe3..03b7cc1d2 100644
--- a/src/widgets/ntqmenubar.h
+++ b/src/widgets/ntqmenubar.h
@@ -47,7 +47,7 @@
 #include "ntqmenudata.h"
 #endif // QT_H
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
 
 class TQPopupMenu;
 
@@ -116,7 +116,7 @@ protected:
 private slots:
     void	subActivated( int itemId );
     void	subHighlighted( int itemId );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     void	accelActivated( int itemId );
     void	accelDestroyed();
 #endif
@@ -142,7 +142,7 @@ private:
 
     int		calculateRects( int max_width = -1 );
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     void	setupAccelerators();
     TQAccel     *autoaccel;
 #endif
@@ -200,6 +200,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_MENUBAR
+#endif // TQT_NO_MENUBAR
 
 #endif // TQMENUBAR_H
diff --git a/src/widgets/ntqmenudata.h b/src/widgets/ntqmenudata.h
index c7afc95ee..620c0daf9 100644
--- a/src/widgets/ntqmenudata.h
+++ b/src/widgets/ntqmenudata.h
@@ -50,7 +50,7 @@
 #include "ntqfont.h"
 #endif // QT_H
 
-#ifndef QT_NO_MENUDATA
+#ifndef TQT_NO_MENUDATA
 
 class TQPopupMenu;
 class TQMenuDataData;
@@ -74,7 +74,7 @@ public:
     TQPopupMenu *popup()		const	{ return popup_menu; }
     TQWidget *widget()		const	{ return widget_item; }
     TQCustomMenuItem *custom()	const;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQKeySequence key()		const	{ return accel_key; }
 #endif
     TQSignal    *signal()	const	{ return signal_data; }
@@ -99,7 +99,7 @@ public:
     void	setPixmap( TQPixmap* pixmap )    { pixmap_data = pixmap; }
     void	setPopup( TQPopupMenu* popup )   { popup_menu = popup; }
     void	setWidget( TQWidget* widget )    { widget_item = widget; }
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     void	setKey( TQKeySequence key )      { accel_key = key; }
 #endif
     void	setSignal( TQSignal* signal )    { signal_data = signal; }
@@ -112,7 +112,7 @@ private:
     TQPixmap    *pixmap_data;			// item pixmap
     TQPopupMenu *popup_menu;			// item popup menu
     TQWidget    *widget_item;			// widget menu item
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQKeySequence	accel_key;		// accelerator key (state|ascii)
 #endif
     TQSignal    *signal_data;			// connection
@@ -209,7 +209,7 @@ public:
     void	removeItemAt( int index );
     void	clear();
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQKeySequence accel( int id )	const;
     void	setAccel( const TQKeySequence& key, int id );
 #endif
@@ -295,6 +295,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_MENUDATA
+#endif // TQT_NO_MENUDATA
 
 #endif // TQMENUDATA_H
diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/ntqmultilineedit.h
index ad073e376..a40e8df92 100644
--- a/src/widgets/ntqmultilineedit.h
+++ b/src/widgets/ntqmultilineedit.h
@@ -45,7 +45,7 @@
 #include "ntqtextedit.h"
 #endif // QT_H
 
-#ifndef QT_NO_MULTILINEEDIT
+#ifndef TQT_NO_MULTILINEEDIT
 
 class TQMultiLineEditCommand;
 class TQValidator;
@@ -136,6 +136,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_MULTILINEEDIT
+#endif // TQT_NO_MULTILINEEDIT
 
 #endif // TQMULTILINED_H
diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/ntqpopupmenu.h
index a028d82fe..6fb1e1b4d 100644
--- a/src/widgets/ntqpopupmenu.h
+++ b/src/widgets/ntqpopupmenu.h
@@ -46,7 +46,7 @@
 #include "ntqmenudata.h"
 #endif // QT_H
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 class TQPopupMenuPrivate;
 
 class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData
@@ -121,7 +121,7 @@ protected:
 private slots:
     void	subActivated( int itemId );
     void	subHighlighted( int itemId );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     void	accelActivated( int itemId );
     void	accelDestroyed();
 #endif
@@ -156,12 +156,12 @@ private:
     TQSize	updateSize(bool force_recalc=FALSE, bool do_resize=TRUE);
     void	updateRow( int row );
     TQRect       screenRect(const TQPoint& pos);
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     void	updateAccel( TQWidget * );
     void	enableAccel( bool );
 #endif
     TQPopupMenuPrivate  *d;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQAccel     *autoaccel;
 #endif
 
@@ -199,6 +199,6 @@ public:
 };
 
 
-#endif // QT_NO_POPUPMENU
+#endif // TQT_NO_POPUPMENU
 
 #endif // TQPOPUPMENU_H
diff --git a/src/widgets/ntqprogressbar.h b/src/widgets/ntqprogressbar.h
index 4ca7b9e84..4515b0989 100644
--- a/src/widgets/ntqprogressbar.h
+++ b/src/widgets/ntqprogressbar.h
@@ -45,7 +45,7 @@
 #include "ntqframe.h"
 #endif // QT_H
 
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
 
 
 class TQProgressBarPrivate;
@@ -154,6 +154,6 @@ inline bool TQProgressBar::percentageVisible() const
     return percentage_visible;
 }
 
-#endif // QT_NO_PROGRESSBAR
+#endif // TQT_NO_PROGRESSBAR
 
 #endif // TQPROGRESSBAR_H
diff --git a/src/widgets/ntqpushbutton.h b/src/widgets/ntqpushbutton.h
index a09457828..fc52aac39 100644
--- a/src/widgets/ntqpushbutton.h
+++ b/src/widgets/ntqpushbutton.h
@@ -46,7 +46,7 @@
 #include "ntqiconset.h"
 #endif // QT_H
 
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 class TQPushButtonPrivate;
 class TQPopupMenu;
 
@@ -66,7 +66,7 @@ class Q_EXPORT TQPushButton : public TQButton
 public:
     TQPushButton( TQWidget *parent, const char* name=0 );
     TQPushButton( const TQString &text, TQWidget *parent, const char* name=0 );
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
     TQPushButton( const TQIconSet& icon, const TQString &text, TQWidget *parent, const char* name=0 );
 #endif
     ~TQPushButton();
@@ -97,11 +97,11 @@ public:
     }
     bool	isMenuButton() const { return hasMenuArrow; }
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     void setPopup( TQPopupMenu* popup );
     TQPopupMenu* popup() const;
 #endif
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
     void setIconSet( const TQIconSet& );
     TQIconSet* iconSet() const;
 #endif
@@ -119,7 +119,7 @@ protected:
     void	resizeEvent( TQResizeEvent * );
     void	updateMask();
 private slots:
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     void popupPressed();
 #endif
 private:
@@ -144,6 +144,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_PUSHBUTTON
+#endif // TQT_NO_PUSHBUTTON
 
 #endif // TQPUSHBUTTON_H
diff --git a/src/widgets/ntqradiobutton.h b/src/widgets/ntqradiobutton.h
index 3ff6d61eb..b660eadb7 100644
--- a/src/widgets/ntqradiobutton.h
+++ b/src/widgets/ntqradiobutton.h
@@ -45,7 +45,7 @@
 #include "ntqbutton.h"
 #endif // QT_H
 
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
 
 class Q_EXPORT TQRadioButton : public TQButton
 {
@@ -86,6 +86,6 @@ private:	// Disabled copy constructor and operator=
 inline bool TQRadioButton::isChecked() const
 { return isOn(); }
 
-#endif // QT_NO_RADIOBUTTON
+#endif // TQT_NO_RADIOBUTTON
 
 #endif // TQRADIOBUTTON_H
diff --git a/src/widgets/ntqrangecontrol.h b/src/widgets/ntqrangecontrol.h
index 7cc2cc3bf..63f101664 100644
--- a/src/widgets/ntqrangecontrol.h
+++ b/src/widgets/ntqrangecontrol.h
@@ -46,7 +46,7 @@
 #include "ntqframe.h"
 #endif // QT_H
 
-#ifndef QT_NO_RANGECONTROL
+#ifndef TQT_NO_RANGECONTROL
 
 
 class TQRangeControlPrivate;
@@ -122,9 +122,9 @@ inline int TQRangeControl::pageStep() const
 { return page; }
 
 
-#endif // QT_NO_RANGECONTROL
+#endif // TQT_NO_RANGECONTROL
 
-#ifndef QT_NO_SPINWIDGET
+#ifndef TQT_NO_SPINWIDGET
 
 class TQSpinWidgetPrivate;
 class Q_EXPORT TQSpinWidget : public TQWidget
@@ -165,7 +165,7 @@ protected:
     void resizeEvent( TQResizeEvent* ev );
     void mouseReleaseEvent( TQMouseEvent *e );
     void mouseMoveEvent( TQMouseEvent *e );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void wheelEvent( TQWheelEvent * );
 #endif
     void styleChange( TQStyle& );
@@ -189,6 +189,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_SPINWIDGET
+#endif // TQT_NO_SPINWIDGET
 
 #endif // TQRANGECONTROL_H
diff --git a/src/widgets/ntqscrollbar.h b/src/widgets/ntqscrollbar.h
index aff492470..dffd09930 100644
--- a/src/widgets/ntqscrollbar.h
+++ b/src/widgets/ntqscrollbar.h
@@ -48,7 +48,7 @@ class TQTimer;
 #include "ntqrangecontrol.h"
 #endif // QT_H
 
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
 
 class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl
 {
@@ -107,7 +107,7 @@ signals:
     void	prevPage();
 
 protected:
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void 	wheelEvent( TQWheelEvent * );
 #endif
     void	keyPressEvent( TQKeyEvent * );
@@ -192,6 +192,6 @@ inline void TQScrollBar::setSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy
 }
 
 
-#endif // QT_NO_SCROLLBAR
+#endif // TQT_NO_SCROLLBAR
 
 #endif // TQSCROLLBAR_H
diff --git a/src/widgets/ntqscrollview.h b/src/widgets/ntqscrollview.h
index 24a1322bd..abad327eb 100644
--- a/src/widgets/ntqscrollview.h
+++ b/src/widgets/ntqscrollview.h
@@ -45,7 +45,7 @@
 #include "ntqscrollbar.h"
 #endif // QT_H
 
-#ifndef QT_NO_SCROLLVIEW
+#ifndef TQT_NO_SCROLLVIEW
 
 class TQScrollViewData;
 
@@ -62,7 +62,7 @@ class Q_EXPORT TQScrollView : public TQFrame
     TQ_PROPERTY( int contentsHeight READ contentsHeight )
     TQ_PROPERTY( int contentsX READ contentsX )
     TQ_PROPERTY( int contentsY READ contentsY )
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     TQ_PROPERTY( bool dragAutoScroll READ dragAutoScroll WRITE setDragAutoScroll )
 #endif
 
@@ -142,7 +142,7 @@ public:
     bool	isHorizontalSliderPressed();
     bool	isVerticalSliderPressed();
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     virtual void setDragAutoScroll( bool b );
     bool	 dragAutoScroll() const;
 #endif
@@ -176,13 +176,13 @@ protected:
     virtual void contentsMouseReleaseEvent( TQMouseEvent* );
     virtual void contentsMouseDoubleClickEvent( TQMouseEvent* );
     virtual void contentsMouseMoveEvent( TQMouseEvent* );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     virtual void contentsDragEnterEvent( TQDragEnterEvent * );
     virtual void contentsDragMoveEvent( TQDragMoveEvent * );
     virtual void contentsDragLeaveEvent( TQDragLeaveEvent * );
     virtual void contentsDropEvent( TQDropEvent * );
 #endif
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     virtual void contentsWheelEvent( TQWheelEvent * );
 #endif
     virtual void contentsContextMenuEvent( TQContextMenuEvent * );
@@ -194,13 +194,13 @@ protected:
     virtual void viewportMouseReleaseEvent( TQMouseEvent* );
     virtual void viewportMouseDoubleClickEvent( TQMouseEvent* );
     virtual void viewportMouseMoveEvent( TQMouseEvent* );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     virtual void viewportDragEnterEvent( TQDragEnterEvent * );
     virtual void viewportDragMoveEvent( TQDragMoveEvent * );
     virtual void viewportDragLeaveEvent( TQDragLeaveEvent * );
     virtual void viewportDropEvent( TQDropEvent * );
 #endif
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     virtual void viewportWheelEvent( TQWheelEvent * );
 #endif
     virtual void viewportContextMenuEvent( TQContextMenuEvent * );
@@ -223,7 +223,7 @@ protected:
     void  mouseReleaseEvent( TQMouseEvent * );
     void  mouseDoubleClickEvent( TQMouseEvent * );
     void  mouseMoveEvent( TQMouseEvent * );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void  wheelEvent( TQWheelEvent * );
 #endif
     void contextMenuEvent( TQContextMenuEvent * );
@@ -246,7 +246,7 @@ private slots:
     void hbarIsReleased();
     void vbarIsPressed();
     void vbarIsReleased();
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void doDragAutoScroll();
     void startDragAutoScroll();
     void stopDragAutoScroll();
@@ -264,6 +264,6 @@ public:
 
 };
 
-#endif // QT_NO_SCROLLVIEW
+#endif // TQT_NO_SCROLLVIEW
 
 #endif // TQSCROLLVIEW_H
diff --git a/src/widgets/ntqslider.h b/src/widgets/ntqslider.h
index f54179499..c5e922f95 100644
--- a/src/widgets/ntqslider.h
+++ b/src/widgets/ntqslider.h
@@ -46,7 +46,7 @@
 #include "ntqrangecontrol.h"
 #endif // QT_H
 
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 
 struct TQSliderPrivate;
 
@@ -128,7 +128,7 @@ protected:
     void	mousePressEvent( TQMouseEvent * );
     void	mouseReleaseEvent( TQMouseEvent * );
     void	mouseMoveEvent( TQMouseEvent * );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void	wheelEvent( TQWheelEvent * );
 #endif
     void	focusInEvent( TQFocusEvent *e );
@@ -194,6 +194,6 @@ inline void TQSlider::setSizePolicy( TQSizePolicy::SizeType hor, TQSizePolicy::S
     TQWidget::setSizePolicy( hor, ver, hfw ); 
 }
 
-#endif // QT_NO_SLIDER
+#endif // TQT_NO_SLIDER
 
 #endif // TQSLIDER_H
diff --git a/src/widgets/ntqspinbox.h b/src/widgets/ntqspinbox.h
index 11271bbc0..0657b3b57 100644
--- a/src/widgets/ntqspinbox.h
+++ b/src/widgets/ntqspinbox.h
@@ -46,7 +46,7 @@
 #include "ntqrangecontrol.h"
 #endif // QT_H
 
-#ifndef QT_NO_SPINBOX
+#ifndef TQT_NO_SPINBOX
 
 class TQLineEdit;
 class TQValidator;
@@ -135,7 +135,7 @@ protected:
 
     bool		eventFilter( TQObject* obj, TQEvent* ev );
     void		resizeEvent( TQResizeEvent* ev );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void		wheelEvent( TQWheelEvent * );
 #endif
     void		leaveEvent( TQEvent* );
@@ -167,6 +167,6 @@ private:	// Disabled copy constructor and operator=
 
 };
 
-#endif // QT_NO_SPINBOX
+#endif // TQT_NO_SPINBOX
 
 #endif // TQSPINBOX_H
diff --git a/src/widgets/ntqsplashscreen.h b/src/widgets/ntqsplashscreen.h
index a369ffc5e..131ab1aa1 100644
--- a/src/widgets/ntqsplashscreen.h
+++ b/src/widgets/ntqsplashscreen.h
@@ -44,7 +44,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#ifndef QT_NO_SPLASHSCREEN
+#ifndef TQT_NO_SPLASHSCREEN
 class TQSplashScreenPrivate;
 
 class Q_EXPORT TQSplashScreen : public TQWidget
@@ -76,5 +76,5 @@ private:
 
     TQSplashScreenPrivate *d;
 };
-#endif //QT_NO_SPLASHSCREEN
+#endif //TQT_NO_SPLASHSCREEN
 #endif
diff --git a/src/widgets/ntqsplitter.h b/src/widgets/ntqsplitter.h
index 138cdbfd9..cc8c431c7 100644
--- a/src/widgets/ntqsplitter.h
+++ b/src/widgets/ntqsplitter.h
@@ -46,7 +46,7 @@
 #include "ntqvaluelist.h"
 #endif // QT_H
 
-#ifndef QT_NO_SPLITTER
+#ifndef TQT_NO_SPLITTER
 
 #define QT_QSPLITTER_DEFAULT 2
 
@@ -185,7 +185,7 @@ private:
 #endif
 };
 
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
 Q_EXPORT TQTextStream& operator<<( TQTextStream&, const TQSplitter& );
 Q_EXPORT TQTextStream& operator>>( TQTextStream&, TQSplitter& );
 #endif
@@ -220,6 +220,6 @@ public: // private:
     TQSplitter *s;
 };
 
-#endif // QT_NO_SPLITTER
+#endif // TQT_NO_SPLITTER
 
 #endif // TQSPLITTER_H
diff --git a/src/widgets/ntqstatusbar.h b/src/widgets/ntqstatusbar.h
index 894d1347f..91fe500b4 100644
--- a/src/widgets/ntqstatusbar.h
+++ b/src/widgets/ntqstatusbar.h
@@ -45,7 +45,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
 
 
 class TQStatusBarPrivate;
@@ -91,6 +91,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_STATUSBAR
+#endif // TQT_NO_STATUSBAR
 
 #endif // TQSTATUSBAR_H
diff --git a/src/widgets/ntqtabbar.h b/src/widgets/ntqtabbar.h
index 1fd1b742b..8aa5bb023 100644
--- a/src/widgets/ntqtabbar.h
+++ b/src/widgets/ntqtabbar.h
@@ -44,7 +44,7 @@
 #include "ntqptrlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
 
 class TQTabBar;
 class TQIconSet;
@@ -191,6 +191,6 @@ public:
 };
 
 
-#endif // QT_NO_TABBAR
+#endif // TQT_NO_TABBAR
 
 #endif // TQTABBAR_H
diff --git a/src/widgets/ntqtabwidget.h b/src/widgets/ntqtabwidget.h
index 0a58cf6a3..f60739bd4 100644
--- a/src/widgets/ntqtabwidget.h
+++ b/src/widgets/ntqtabwidget.h
@@ -46,7 +46,7 @@
 #include "ntqiconset.h"
 #endif // QT_H
 
-#ifndef QT_NO_TABWIDGET
+#ifndef TQT_NO_TABWIDGET
 
 class TQTabBar;
 class TQTabWidgetData;
@@ -157,6 +157,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_TABWIDGET
+#endif // TQT_NO_TABWIDGET
 
 #endif // TQTABWIDGET_H
diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/ntqtextbrowser.h
index 834f72417..c852fa3a6 100644
--- a/src/widgets/ntqtextbrowser.h
+++ b/src/widgets/ntqtextbrowser.h
@@ -48,7 +48,7 @@
 #include "ntqtextedit.h"
 #endif // QT_H
 
-#ifndef QT_NO_TEXTBROWSER
+#ifndef TQT_NO_TEXTBROWSER
 
 class TQTextBrowserData;
 
@@ -102,6 +102,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_TEXTBROWSER
+#endif // TQT_NO_TEXTBROWSER
 
 #endif // TQTEXTBROWSER_H
diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h
index a001dadce..6e9a3861f 100644
--- a/src/widgets/ntqtextedit.h
+++ b/src/widgets/ntqtextedit.h
@@ -49,7 +49,7 @@
 #include "ntqptrlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
 // uncomment below to enable optimization mode - also uncomment the
 // optimDoAutoScroll() private slot since moc ignores #ifdefs..
 #define QT_TEXTEDIT_OPTIMIZATION
@@ -247,7 +247,7 @@ public:
     int paragraphLength( int para ) const;
 
     TQStyleSheet* styleSheet() const;
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     TQMimeSourceFactory* mimeSourceFactory() const;
 #endif
     TQBrush paper() const;
@@ -310,7 +310,7 @@ public:
 
 public slots:
     void setEnabled( bool );
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     virtual void setMimeSourceFactory( TQMimeSourceFactory* factory );
 #endif
     virtual void setStyleSheet( TQStyleSheet* styleSheet );
@@ -344,7 +344,7 @@ public slots:
     virtual void redo();
     virtual void cut();
     virtual void paste();
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     virtual void pasteSubType( const TQCString &subtype );
 #endif
     virtual void clear();
@@ -431,13 +431,13 @@ protected:
     void contentsMouseMoveEvent( TQMouseEvent *e );
     void contentsMouseReleaseEvent( TQMouseEvent *e );
     void contentsMouseDoubleClickEvent( TQMouseEvent *e );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void contentsWheelEvent( TQWheelEvent *e );
 #endif
     void imStartEvent( TQIMEvent * );
     void imComposeEvent( TQIMEvent * );
     void imEndEvent( TQIMEvent * );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void contentsDragEnterEvent( TQDragEnterEvent *e );
     void contentsDragMoveEvent( TQDragMoveEvent *e );
     void contentsDragLeaveEvent( TQDragLeaveEvent *e );
@@ -505,11 +505,11 @@ private:
     void makeParagVisible( TQTextParagraph *p );
     void normalCopy();
     void copyToClipboard();
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     TQCString pickSpecial(TQMimeSource* ms, bool always_ask, const TQPoint&);
     TQTextDrag *dragObject( TQWidget *parent = 0 ) const;
 #endif
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
     void pasteSpecial(const TQPoint&);
 #endif
     void setFontInternal( const TQFont &f );
@@ -557,7 +557,7 @@ private slots:
 #endif // QT_TEXTEDIT_OPTIMIZATION
 
 private:
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     void pasteSubType( const TQCString &subtype, TQMimeSource *m );
 #endif
 
@@ -612,5 +612,5 @@ inline void TQTextEdit::setCurrentFont( const TQFont &f )
     TQTextEdit::setFontInternal( f );
 }
 
-#endif //QT_NO_TEXTEDIT
+#endif //TQT_NO_TEXTEDIT
 #endif //TQTEXTVIEW_H
diff --git a/src/widgets/ntqtextview.h b/src/widgets/ntqtextview.h
index 342ed0db1..4d2431811 100644
--- a/src/widgets/ntqtextview.h
+++ b/src/widgets/ntqtextview.h
@@ -45,7 +45,7 @@
 #include "ntqtextedit.h"
 #endif // QT_H
 
-#ifndef QT_NO_TEXTVIEW
+#ifndef TQT_NO_TEXTVIEW
 
 class Q_EXPORT TQTextView : public TQTextEdit
 {
@@ -70,5 +70,5 @@ private:
 #endif
 };
 
-#endif //QT_NO_TEXTVIEW
+#endif //TQT_NO_TEXTVIEW
 #endif //TQTEXTVIEW_H
diff --git a/src/widgets/ntqtoolbar.h b/src/widgets/ntqtoolbar.h
index 2036cc718..87163aef8 100644
--- a/src/widgets/ntqtoolbar.h
+++ b/src/widgets/ntqtoolbar.h
@@ -45,7 +45,7 @@
 #include "ntqdockwindow.h"
 #endif // QT_H
 
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
 
 class TQMainWindow;
 class TQButton;
@@ -112,6 +112,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_TOOLBAR
+#endif // TQT_NO_TOOLBAR
 
 #endif // TQTOOLBAR_H
diff --git a/src/widgets/ntqtoolbox.h b/src/widgets/ntqtoolbox.h
index acd200cca..5b0030b20 100644
--- a/src/widgets/ntqtoolbox.h
+++ b/src/widgets/ntqtoolbox.h
@@ -46,7 +46,7 @@
 #include 
 #endif // QT_H
 
-#ifndef QT_NO_TOOLBOX
+#ifndef TQT_NO_TOOLBOX
 
 class TQToolBoxPrivate;
 class TQWidgetList;
@@ -122,5 +122,5 @@ inline int TQToolBox::addItem( TQWidget *item, const TQIconSet &iconSet,
 inline int TQToolBox::insertItem( int index, TQWidget *item, const TQString &label )
 { return insertItem( index, item, TQIconSet(), label ); }
 
-#endif // QT_NO_TOOLBOX
+#endif // TQT_NO_TOOLBOX
 #endif
diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h
index 45733ea1c..84909de56 100644
--- a/src/widgets/ntqtoolbutton.h
+++ b/src/widgets/ntqtoolbutton.h
@@ -48,7 +48,7 @@
 #include "ntqiconset.h"
 #endif // QT_H
 
-#ifndef QT_NO_TOOLBUTTON
+#ifndef TQT_NO_TOOLBUTTON
 
 class TQToolButtonPrivate;
 class TQToolBar;
@@ -82,7 +82,7 @@ public:
 	Under = BelowIcon // obsolete
     };
     TQToolButton( TQWidget * parent, const char* name=0 );
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     TQToolButton( const TQIconSet& s, const TQString &textLabel,
 		 const TQString& grouptext,
 		 TQObject * receiver, const char* slot,
@@ -109,7 +109,7 @@ public:
     bool usesTextLabel() const { return utl; }
     TQString textLabel() const { return tl; }
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     void setPopup( TQPopupMenu* popup );
     TQPopupMenu* popup() const;
 
@@ -155,7 +155,7 @@ protected:
 
     bool eventFilter( TQObject *o, TQEvent *e );
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
     void paletteChange( const TQPalette & );
 #endif
 
@@ -187,6 +187,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_TOOLBUTTON
+#endif // TQT_NO_TOOLBUTTON
 
 #endif // TQTOOLBUTTON_H
diff --git a/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h
index 873634df0..2bd4af521 100644
--- a/src/widgets/ntqtooltip.h
+++ b/src/widgets/ntqtooltip.h
@@ -43,7 +43,7 @@
 #include "ntqwidget.h"
 #endif // QT_H
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 
 #if __GNUC__  - 0 > 3
 #pragma GCC system_header
@@ -145,6 +145,6 @@ private:
 };
 
 
-#endif // QT_NO_TOOLTIP
+#endif // TQT_NO_TOOLTIP
 
 #endif // TQTOOLTIP_H
diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h
index ade5fd7b9..a66f99a63 100644
--- a/src/widgets/ntqvalidator.h
+++ b/src/widgets/ntqvalidator.h
@@ -47,7 +47,7 @@
 #include "ntqregexp.h" // TQString->TQRegExp conversion
 #endif // QT_H
 
-#ifndef QT_NO_VALIDATOR
+#ifndef TQT_NO_VALIDATOR
 
 
 class Q_EXPORT TQValidator : public TQObject
@@ -100,7 +100,7 @@ private:
     int b, t;
 };
 
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 
 class Q_EXPORT TQDoubleValidator : public TQValidator
 {
@@ -161,9 +161,9 @@ private:
 
     TQRegExp r;
 };
-#endif // QT_NO_REGEXP
+#endif // TQT_NO_REGEXP
 
 
-#endif // QT_NO_VALIDATOR
+#endif // TQT_NO_VALIDATOR
 
 #endif // TQVALIDATOR_H
diff --git a/src/widgets/ntqvbox.h b/src/widgets/ntqvbox.h
index f5def6138..8328ebd71 100644
--- a/src/widgets/ntqvbox.h
+++ b/src/widgets/ntqvbox.h
@@ -45,7 +45,7 @@
 #include "ntqhbox.h"
 #endif // QT_H
 
-#ifndef QT_NO_VBOX
+#ifndef TQT_NO_VBOX
 
 class Q_EXPORT TQVBox : public TQHBox
 {
@@ -60,6 +60,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_VBOX
+#endif // TQT_NO_VBOX
 
 #endif // TQVBOX_H
diff --git a/src/widgets/ntqvbuttongroup.h b/src/widgets/ntqvbuttongroup.h
index 332e555fc..cfccba708 100644
--- a/src/widgets/ntqvbuttongroup.h
+++ b/src/widgets/ntqvbuttongroup.h
@@ -45,7 +45,7 @@
 #include "ntqbuttongroup.h"
 #endif // QT_H
 
-#ifndef QT_NO_VBUTTONGROUP
+#ifndef TQT_NO_VBUTTONGROUP
 
 class Q_EXPORT TQVButtonGroup : public TQButtonGroup
 {
@@ -64,6 +64,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_VBUTTONGROUP
+#endif // TQT_NO_VBUTTONGROUP
 
 #endif // TQVBUTTONGROUP_H
diff --git a/src/widgets/ntqvgroupbox.h b/src/widgets/ntqvgroupbox.h
index afa8ae093..27cb9216a 100644
--- a/src/widgets/ntqvgroupbox.h
+++ b/src/widgets/ntqvgroupbox.h
@@ -45,7 +45,7 @@
 #include "ntqgroupbox.h"
 #endif // QT_H
 
-#ifndef QT_NO_VGROUPBOX
+#ifndef TQT_NO_VGROUPBOX
 
 class Q_EXPORT TQVGroupBox : public TQGroupBox
 {
@@ -63,6 +63,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_VGROUPBOX
+#endif // TQT_NO_VGROUPBOX
 
 #endif // TQVGROUPBOX_H
diff --git a/src/widgets/ntqwhatsthis.h b/src/widgets/ntqwhatsthis.h
index e4cda6c1d..22ecafa7d 100644
--- a/src/widgets/ntqwhatsthis.h
+++ b/src/widgets/ntqwhatsthis.h
@@ -43,7 +43,7 @@
 #include "ntqobject.h"
 #endif // QT_H
 
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 
 #include "ntqcursor.h"
 
@@ -76,6 +76,6 @@ public:
     static void display( const TQString& text, const TQPoint& pos = TQCursor::pos(), TQWidget* w = 0 );
 };
 
-#endif // QT_NO_WHATSTHIS
+#endif // TQT_NO_WHATSTHIS
 
 #endif // TQWHATSTHIS_H
diff --git a/src/widgets/ntqwidgetplugin.h b/src/widgets/ntqwidgetplugin.h
index 6769ada70..51cf6cd1e 100644
--- a/src/widgets/ntqwidgetplugin.h
+++ b/src/widgets/ntqwidgetplugin.h
@@ -46,7 +46,7 @@
 #include "ntqstringlist.h"
 #include "ntqiconset.h"
 #endif // QT_H
-#ifndef QT_NO_WIDGETPLUGIN
+#ifndef TQT_NO_WIDGETPLUGIN
 
 #ifdef Q_WS_WIN
 #ifdef QT_PLUGIN
@@ -116,5 +116,5 @@ public:
 };
 
 #endif // QT_CONTAINER_CUSTOM_WIDGETS
-#endif // QT_NO_WIDGETPLUGIN
+#endif // TQT_NO_WIDGETPLUGIN
 #endif // TQWIDGETPLUGIN_H
diff --git a/src/widgets/ntqwidgetstack.h b/src/widgets/ntqwidgetstack.h
index 1362ca106..2844042db 100644
--- a/src/widgets/ntqwidgetstack.h
+++ b/src/widgets/ntqwidgetstack.h
@@ -47,7 +47,7 @@
 #include "ntqptrdict.h"
 #endif // QT_H
 
-#ifndef QT_NO_WIDGETSTACK
+#ifndef TQT_NO_WIDGETSTACK
 
 
 class TQWidgetStackPrivate;
@@ -107,6 +107,6 @@ private:	// Disabled copy constructor and operator=
 #endif
 };
 
-#endif // QT_NO_WIDGETSTACK
+#endif // TQT_NO_WIDGETSTACK
 
 #endif // TQWIDGETSTACK_H
diff --git a/src/widgets/qaction.cpp b/src/widgets/qaction.cpp
index 242de2dd8..62661018e 100644
--- a/src/widgets/qaction.cpp
+++ b/src/widgets/qaction.cpp
@@ -38,7 +38,7 @@
 
 #include "ntqaction.h"
 
-#ifndef QT_NO_ACTION
+#ifndef TQT_NO_ACTION
 
 #include "ntqtoolbar.h"
 #include "ntqptrlist.h"
@@ -134,7 +134,7 @@ public:
     TQString tooltip;
     TQString statustip;
     TQString whatsthis;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQKeySequence key;
     TQAccel* accel;
     int accelid;
@@ -145,7 +145,7 @@ public:
     uint on : 1;
     uint forceDisabled : 1;
     uint forceInvisible : 1;
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTipGroup tipGroup;
 #endif
     TQActionGroupPrivate* d_group;
@@ -178,19 +178,19 @@ public:
 
 TQActionPrivate::TQActionPrivate(TQAction *act)
     : iconset( 0 ),
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
       key( 0 ), accel( 0 ), accelid( 0 ),
 #endif
       enabled( TRUE ), visible( TRUE ), toggleaction( FALSE ), on( FALSE ),
       forceDisabled( FALSE ), forceInvisible( FALSE ),
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
       tipGroup( 0 ),
 #endif
       d_group( 0 ), action(act)
 {
     menuitems.setAutoDelete( TRUE );
     comboitems.setAutoDelete( TRUE );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     tipGroup.setDelay( FALSE );
 #endif
 }
@@ -241,7 +241,7 @@ TQActionPrivate::~TQActionPrivate()
 	delete siblings;
     }
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     delete accel;
 #endif
     delete iconset;
@@ -275,7 +275,7 @@ void TQActionPrivate::update( uint upd )
     for ( TQPtrListIterator it( menuitems); it.current(); ++it ) {
 	MenuItem* mi = it.current();
 	TQString t = menuText();
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	if ( key )
 	    t += '\t' + TQAccel::keyToString( key );
 #endif
@@ -322,18 +322,18 @@ void TQActionPrivate::update( uint upd )
 	    btn->setToggleButton( toggleaction );
 	    if ( !text.isEmpty() )
 		btn->setTextLabel( text, FALSE );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	    TQToolTip::remove( btn );
 	    TQToolTip::add( btn, toolTip(), &tipGroup, statusTip() );
 #endif
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	    TQWhatsThis::remove( btn );
 	    if ( !whatsthis.isEmpty() )
 		TQWhatsThis::add( btn, whatsthis );
 #endif
 	}
     }
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( accel ) {
 	accel->setEnabled( enabled && visible );
 	if ( !whatsthis.isEmpty() )
@@ -365,7 +365,7 @@ TQString TQActionPrivate::menuText() const
 TQString TQActionPrivate::toolTip() const
 {
     if ( tooltip.isNull() ) {
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	if ( accel )
 	    return text + " (" + TQAccel::keyToString( accel->key( accelid )) + ")";
 #endif
@@ -431,7 +431,7 @@ TQAction::TQAction( TQObject* parent, const char* name, bool toggle )
 }
 
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 /*!
     This constructor creates an action with the following properties:
@@ -748,7 +748,7 @@ TQString TQAction::whatsThis() const
 }
 
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 /*!
     \property TQAction::accel
     \brief the action's accelerator key
@@ -1008,7 +1008,7 @@ void TQAction::toolButtonToggled( bool on )
 */
 bool TQAction::addTo( TQWidget* w )
 {
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     if ( ::tqt_cast(w) ) {
 	if ( !qstrcmp( name(), "qt_separator_action" ) ) {
 	    ((TQToolBar*)w)->addSeparator();
@@ -1024,7 +1024,7 @@ bool TQAction::addTo( TQWidget* w )
 	    connect( btn, SIGNAL( clicked() ), this, SIGNAL( activated() ) );
 	    connect( btn, SIGNAL( toggled(bool) ), this, SLOT( toolButtonToggled(bool) ) );
 	    connect( btn, SIGNAL( destroyed() ), this, SLOT( objectDestroyed() ) );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	    connect( &(d->tipGroup), SIGNAL(showTip(const TQString&)), this, SLOT(showStatusText(const TQString&)) );
 	    connect( &(d->tipGroup), SIGNAL(removeTip()), this, SLOT(clearStatusText()) );
 #endif
@@ -1104,7 +1104,7 @@ void TQAction::addedTo( int index, TQPopupMenu *menu )
 */
 void TQAction::showStatusText( const TQString& text )
 {
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
     // find out whether we are clearing the status bar by the popup that actually set the text
     static TQPopupMenu *lastmenu = 0;
     TQObject *s = (TQObject*)sender();
@@ -1188,7 +1188,7 @@ void TQAction::clearStatusText()
 */
 bool TQAction::removeFrom( TQWidget* w )
 {
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     if ( ::tqt_cast(w) ) {
 	TQPtrListIterator it( d->toolbuttons);
 	TQToolButton* btn;
@@ -1313,12 +1313,12 @@ void TQActionGroupPrivate::update( const TQActionGroup* that )
 	combobox->setEnabled( that->isEnabled() );
 	combobox->setShown( that->isVisible() );
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	TQToolTip::remove( combobox );
 	if ( !!that->toolTip() )
 	    TQToolTip::add( combobox, that->toolTip() );
 #endif
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	TQWhatsThis::remove( combobox );
 	if ( !!that->whatsThis() )
 	    TQWhatsThis::add( combobox, that->whatsThis() );
@@ -1335,12 +1335,12 @@ void TQActionGroupPrivate::update( const TQActionGroup* that )
 	if ( !that->iconSet().isNull() )
 	    button->setIconSet( that->iconSet() );
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	TQToolTip::remove( mb.current() );
 	if ( !!that->toolTip() )
 	    TQToolTip::add( button, that->toolTip() );
 #endif
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	TQWhatsThis::remove( button );
 	if ( !!that->whatsThis() )
 	    TQWhatsThis::add( button, that->whatsThis() );
@@ -1370,7 +1370,7 @@ void TQActionGroupPrivate::update( const TQActionGroup* that )
 	else
 	    parent->changeItem( id, that->menuText() );
 	parent->setItemEnabled( id, that->isEnabled() );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	parent->setAccel( that->accel(), id );
 #endif
     }
@@ -1654,7 +1654,7 @@ void TQActionGroup::addSeparator()
 */
 bool TQActionGroup::addTo( TQWidget* w )
 {
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     if ( ::tqt_cast(w) ) {
 	if ( d->dropdown ) {
 	    if ( !d->exclusive ) {
@@ -1677,13 +1677,13 @@ bool TQActionGroup::addTo( TQWidget* w )
 		    btn->setTextLabel( text() );
 		else if ( !!defAction->text() )
 		    btn->setTextLabel( defAction->text() );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 		if ( !!toolTip() )
 		    TQToolTip::add( btn, toolTip() );
 		else if ( !!defAction->toolTip() )
 		    TQToolTip::add( btn, defAction->toolTip() );
 #endif
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 		if ( !!whatsThis() )
 		    TQWhatsThis::add( btn, whatsThis() );
 		else if ( !!defAction->whatsThis() )
@@ -1709,11 +1709,11 @@ bool TQActionGroup::addTo( TQWidget* w )
 		addedTo( box, w );
 		connect( box, SIGNAL(destroyed()), SLOT(objectDestroyed()) );
 		d->comboboxes.append( box );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 		if ( !!toolTip() )
 		    TQToolTip::add( box, toolTip() );
 #endif
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 		if ( !!whatsThis() )
 		    TQWhatsThis::add( box, whatsThis() );
 #endif
@@ -1791,7 +1791,7 @@ bool TQActionGroup::removeFrom( TQWidget* w )
 	it.current()->removeFrom( w );
     }
 
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     if ( ::tqt_cast(w) ) {
 	TQPtrListIterator cb( d->comboboxes );
 	while( cb.current() ) {
diff --git a/src/widgets/qbutton.cpp b/src/widgets/qbutton.cpp
index eb2a196a6..e5d172f32 100644
--- a/src/widgets/qbutton.cpp
+++ b/src/widgets/qbutton.cpp
@@ -40,7 +40,7 @@
 
 #undef TQT_NO_COMPAT
 #include "ntqbutton.h"
-#ifndef QT_NO_BUTTON
+#ifndef TQT_NO_BUTTON
 #include "ntqbuttongroup.h"
 #include "ntqbitmap.h"
 #include "ntqpainter.h"
@@ -64,18 +64,18 @@ class TQButtonData
 {
 public:
     TQButtonData() {
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
 	group = 0;
 #endif
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	a = 0;
 #endif
     }
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
     TQButtonGroup *group;
 #endif
     TQTimer timer;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQAccel *a;
 #endif
 };
@@ -102,7 +102,7 @@ void TQButton::ensureData()
 
 TQButtonGroup *TQButton::group() const
 {
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
     return d ? d->group : 0;
 #else
     return 0;
@@ -112,7 +112,7 @@ TQButtonGroup *TQButton::group() const
 
 void TQButton::setGroup( TQButtonGroup* g )
 {
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
     ensureData();
     d->group = g;
 #endif
@@ -390,7 +390,7 @@ TQButton::TQButton( TQWidget *parent, const char *name, WFlags f )
     animation  = FALSE;				// no pending animateClick
     repeat     = FALSE;				// not in autorepeat mode
     d	       = 0;
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
     if ( ::tqt_cast(parent) ) {
 	setGroup((TQButtonGroup*)parent);
 	group()->insert( this );		// insert into button group
@@ -404,7 +404,7 @@ TQButton::TQButton( TQWidget *parent, const char *name, WFlags f )
  */
 TQButton::~TQButton()
 {
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
     if ( group() )
 	group()->remove( this );
 #endif
@@ -477,7 +477,7 @@ void TQButton::setText( const TQString &text )
     if ( btext == text )
 	return;
     btext = text;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     setAccel( TQAccel::shortcutKey( text ) );
 #endif
 
@@ -516,7 +516,7 @@ void TQButton::setPixmap( const TQPixmap &pixmap )
 	bpixmap->setMask( *((TQBitmap *)bpixmap) );
     if ( !btext.isNull() ) {
 	btext = TQString::null;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	setAccel( TQKeySequence() );
 #endif
     }
@@ -530,7 +530,7 @@ void TQButton::setPixmap( const TQPixmap &pixmap )
 }
 
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 TQKeySequence TQButton::accel() const
 {
     if ( d && d->a )
@@ -704,7 +704,7 @@ void TQButton::keyPressEvent( TQKeyEvent *e )
     case Key_Enter:
     case Key_Return:
 	{
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    TQPushButton *pb = (TQPushButton*)tqt_cast( "TQPushButton" );
 	    if ( pb && ( pb->autoDefault() || pb->isDefault() ) )
 		emit clicked();
@@ -716,7 +716,7 @@ void TQButton::keyPressEvent( TQKeyEvent *e )
     case Key_Space:
 	if ( !e->isAutoRepeat() ) {
 	    setDown( TRUE );
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 	    if ( ::tqt_cast(this) )
 		emit pressed();
 	    else
@@ -726,7 +726,7 @@ void TQButton::keyPressEvent( TQKeyEvent *e )
 	break;
     case Key_Up:
     case Key_Left:
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
 	if ( group() ) {
 	    group()->moveFocus( e->key() );
 	} else
@@ -739,7 +739,7 @@ void TQButton::keyPressEvent( TQKeyEvent *e )
 	break;
     case Key_Right:
     case Key_Down:
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
 	if ( group() ) {
 	    group()->moveFocus( e->key() );
 	} else
@@ -996,7 +996,7 @@ void TQButton::setToggleType( ToggleType type )
 
 bool TQButton::isExclusiveToggle() const
 {
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
     return group() && ( group()->isExclusive() ||
 			( group()->isRadioButtonExclusive() &&
 			::tqt_cast(this) ) );
diff --git a/src/widgets/qbuttongroup.cpp b/src/widgets/qbuttongroup.cpp
index 595bd883b..9ffb5f197 100644
--- a/src/widgets/qbuttongroup.cpp
+++ b/src/widgets/qbuttongroup.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqbuttongroup.h"
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
 #include "ntqbutton.h"
 #include "ntqptrlist.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/qcheckbox.cpp b/src/widgets/qcheckbox.cpp
index 8a2ffd4e6..0d6fdfa48 100644
--- a/src/widgets/qcheckbox.cpp
+++ b/src/widgets/qcheckbox.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqcheckbox.h"
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
@@ -193,7 +193,7 @@ void TQCheckBox::drawButton( TQPainter *paint )
     TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_CheckBoxIndicator, this), this );
     const TQColorGroup &cg = colorGroup();
 
-#if !defined( QT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX )
+#if !defined( TQT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX )
 #   define  SAVE_CHECKBOX_PIXMAPS
 #endif
 #if defined(SAVE_CHECKBOX_PIXMAPS)
diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp
index 59f23b506..db1c4b491 100644
--- a/src/widgets/qcombobox.cpp
+++ b/src/widgets/qcombobox.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqcombobox.h"
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 #include "ntqpopupmenu.h"
 #include "ntqlistbox.h"
 #include "ntqpainter.h"
@@ -1503,7 +1503,7 @@ void TQComboBox::focusOutEvent( TQFocusEvent * e )
 
 /*!\reimp
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQComboBox::wheelEvent( TQWheelEvent *e )
 {
     if ( d->poppedUp ) {
@@ -1641,7 +1641,7 @@ void TQComboBox::popup()
 	lb->blockSignals( block );
 	lb->setVScrollBarMode(TQScrollView::Auto);
 
-#ifndef QT_NO_EFFECTS
+#ifndef TQT_NO_EFFECTS
 	if ( TQApplication::isEffectEnabled( UI_AnimateCombo ) ) {
 	    if ( lb->y() < mapToGlobal(TQPoint(0,0)).y() )
 		qScrollEffect( lb, TQEffects::UpScroll );
@@ -2335,4 +2335,4 @@ void TQComboBox::hide()
 	d->popup()->hide();
 }
 
-#endif // QT_NO_COMBOBOX
+#endif // TQT_NO_COMBOBOX
diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp
index ccee2adcf..a4e892f76 100644
--- a/src/widgets/qdatetimeedit.cpp
+++ b/src/widgets/qdatetimeedit.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdatetimeedit.h"
 
-#ifndef QT_NO_DATETIMEEDIT
+#ifndef TQT_NO_DATETIMEEDIT
 
 #include "../kernel/qinternal_p.h"
 #include "../kernel/qrichtext_p.h"
@@ -434,7 +434,7 @@ public:
     }
 
 protected:
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void wheelEvent( TQWheelEvent *e )
     {
 	TQDateTimeEditor *editor = (TQDateTimeEditor*)editWidget()->tqt_cast( "TQDateTimeEditor" );
diff --git a/src/widgets/qdial.cpp b/src/widgets/qdial.cpp
index 683a634f7..36fdbb9dc 100644
--- a/src/widgets/qdial.cpp
+++ b/src/widgets/qdial.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdial.h"
 
-#ifndef QT_NO_DIAL
+#ifndef TQT_NO_DIAL
 
 #include "ntqpainter.h"
 #include "ntqpointarray.h"
@@ -467,7 +467,7 @@ void TQDial::mouseMoveEvent( TQMouseEvent * e )
 /*!
   \reimp
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQDial::wheelEvent( TQWheelEvent *e )
 {
     setValue( value() - e->delta() / 120 );
diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp
index 4153fb597..c248d2e00 100644
--- a/src/widgets/qdialogbuttons.cpp
+++ b/src/widgets/qdialogbuttons.cpp
@@ -37,16 +37,16 @@
 **********************************************************************/
 
 #include "qdialogbuttons_p.h"
-#ifndef QT_NO_DIALOGBUTTONS
+#ifndef TQT_NO_DIALOGBUTTONS
 
 #include 
 #include 
 #include 
 #include 
 #include 
-#ifndef QT_NO_DIALOG
+#ifndef TQT_NO_DIALOG
 #include 
-#endif // QT_NO_DIALOG
+#endif // TQT_NO_DIALOG
 #include 
 #include 
 #include 
@@ -62,7 +62,7 @@ struct TQDialogButtonsPrivate
     bool questionMode;
 };
 
-#ifndef QT_NO_DIALOG
+#ifndef TQT_NO_DIALOG
 TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 buttons,
 			       Orientation orient, const char *name ) : TQWidget(parent, name)
 {
@@ -72,7 +72,7 @@ TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 b
 	TQObject::connect(this, SIGNAL(rejectClicked()), parent, SLOT(reject()));
     }
 }
-#endif // QT_NO_DIALOG
+#endif // TQT_NO_DIALOG
 
 TQDialogButtons::TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons, 
 			       Orientation orient, const char *name ) : TQWidget(parent, name)
@@ -183,12 +183,12 @@ TQDialogButtons::setDefaultButton(Button button)
 	return;
     }
     if(d->def != button) {
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 	if(d->buttons.contains(d->def))
 	    d->buttons[d->def]->setProperty("default", TQVariant(FALSE,0));
 #endif
 	d->def = button;
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 	if(d->buttons.contains(d->def))
 	    d->buttons[d->def]->setProperty("default", TQVariant(FALSE,0));
 #endif
@@ -205,7 +205,7 @@ void
 TQDialogButtons::setButtonText(Button button, const TQString &str)
 {
     d->text[button] = str;
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
     if(d->buttons.contains(button))
 	d->buttons[button]->setProperty("text", TQVariant(str));
 #endif
@@ -412,7 +412,7 @@ TQDialogButtons::layoutButtons()
 		if(w) {
 		    if(b == d->def) {
 			w->setFocus();
-#ifndef QT_NO_PROPERTIES
+#ifndef TQT_NO_PROPERTIES
 			w->setProperty("default", TQVariant(TRUE,0));
 #endif
 		    }
diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/qdialogbuttons_p.h
index 85507ec18..90e645b80 100644
--- a/src/widgets/qdialogbuttons_p.h
+++ b/src/widgets/qdialogbuttons_p.h
@@ -45,7 +45,7 @@
 #endif // QT_H
 #endif
 
-#ifndef QT_NO_DIALOGBUTTONS
+#ifndef TQT_NO_DIALOGBUTTONS
 struct TQDialogButtonsPrivate;
 
 class
@@ -54,10 +54,10 @@ TQDialogButtons : public TQWidget
     TQ_OBJECT
 public:
     enum Button { None=0, Accept=0x01, Reject=0x02, Help=0x04, Apply=0x08, All=0x10, Abort=0x20, Retry=0x40, Ignore=0x80 };
-#ifndef QT_NO_DIALOG
+#ifndef TQT_NO_DIALOG
     TQDialogButtons(TQDialog *parent, bool autoConnect = TRUE, TQ_UINT32 buttons = Accept | Reject,
 		   Orientation orient = Horizontal, const char *name = NULL);
-#endif // QT_NO_DIALOG
+#endif // TQT_NO_DIALOG
     TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons = Accept | Reject, 
 		   Orientation orient = Horizontal, const char *name = NULL);
     ~TQDialogButtons();
@@ -115,5 +115,5 @@ private:
     TQDialogButtonsPrivate *d;
     void init(TQ_UINT32, Orientation);
 };
-#endif //QT_NO_DIALOGBUTTONS
+#endif //TQT_NO_DIALOGBUTTONS
 #endif //TQDIALOGBUTTONS_P_H
diff --git a/src/widgets/qdockarea.cpp b/src/widgets/qdockarea.cpp
index e0764a32a..233279abc 100644
--- a/src/widgets/qdockarea.cpp
+++ b/src/widgets/qdockarea.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdockarea.h"
 
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 #include "ntqsplitter.h"
 #include "ntqlayout.h"
 #include "ntqptrvector.h"
@@ -1221,7 +1221,7 @@ bool TQDockArea::isLastDockWindow( TQDockWindow *dw )
     return FALSE;
 }
 
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
 
 /*!
     \relates TQDockArea
@@ -1319,4 +1319,4 @@ TQTextStream &operator>>( TQTextStream &ts, TQDockArea &dockArea )
 }
 #endif
 
-#endif //QT_NO_MAINWINDOW
+#endif //TQT_NO_MAINWINDOW
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index d4cd0b126..769005031 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdockwindow.h"
 
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 #include "ntqdesktopwidget.h"
 #include "ntqdockarea.h"
 #include "qwidgetresizehandler_p.h"
@@ -119,12 +119,12 @@ void TQDockWindowResizeHandle::setOrientation( TQt::Orientation o )
 {
     orient = o;
     if ( o == TQDockArea::Horizontal ) {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	setCursor( splitVCursor );
 #endif
 	setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
     } else {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	setCursor( splitHCursor );
 #endif
 	setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Expanding ) );
@@ -336,7 +336,7 @@ protected:
     void mouseDoubleClickEvent( TQMouseEvent *e );
     void keyPressEvent( TQKeyEvent *e );
     void keyReleaseEvent( TQKeyEvent *e );
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     void styleChange( TQStyle& );
 #endif
 
@@ -507,7 +507,7 @@ void TQDockWindowHandle::updateGui()
 {
     if ( !closeButton ) {
 	closeButton = new TQToolButton( this, "qt_close_button1" );
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	closeButton->setCursor( arrowCursor );
 #endif
 	closeButton->setPixmap( style().stylePixmap( TQStyle::SP_DockWindowCloseButton, closeButton ) );
@@ -534,7 +534,7 @@ void TQDockWindowHandle::updateGui()
     }
 }
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 void TQDockWindowHandle::styleChange( TQStyle& )
 {
     if ( closeButton )
@@ -2012,10 +2012,10 @@ void TQDockWindow::setCaption( const TQString &s )
     titleBar->setCaption( s );
     verHandle->update();
     horHandle->update();
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     TQFrame::setCaption( s );
 #endif
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQToolTip::remove( horHandle );
     TQToolTip::remove( verHandle );
     if ( !s.isEmpty() ) {
@@ -2098,7 +2098,7 @@ bool TQDockWindow::event( TQEvent *e )
     return TQFrame::event( e );
 }
 
-#ifdef QT_NO_WIDGET_TOPEXTRA
+#ifdef TQT_NO_WIDGET_TOPEXTRA
 TQString TQDockWindow::caption() const
 {
     return titleBar->caption();
@@ -2120,4 +2120,4 @@ void TQDockWindow::contextMenuEvent( TQContextMenuEvent *e )
 
 #include "qdockwindow.moc"
 
-#endif //QT_NO_MAINWINDOW
+#endif //TQT_NO_MAINWINDOW
diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp
index d431f21b3..40170dbea 100644
--- a/src/widgets/qeffects.cpp
+++ b/src/widgets/qeffects.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqapplication.h"
-#ifndef QT_NO_EFFECTS
+#ifndef TQT_NO_EFFECTS
 #include "ntqwidget.h"
 #include "qeffects_p.h"
 #include "ntqpixmap.h"
@@ -191,7 +191,7 @@ bool TQAlphaWidget::eventFilter( TQObject* o, TQEvent* e )
 	if ( o != widget )
 	    break;
     case TQEvent::MouseButtonPress:
-#ifndef QT_NO_SCROLLVIEW
+#ifndef TQT_NO_SCROLLVIEW
 	if ( ::tqt_cast(o) )
 	    break;
 #endif
@@ -443,7 +443,7 @@ bool TQRollEffect::eventFilter( TQObject* o, TQEvent* e )
 	scroll();
 	break;
     case TQEvent::MouseButtonPress:
-#ifndef QT_NO_SCROLLVIEW
+#ifndef TQT_NO_SCROLLVIEW
 	if ( ::tqt_cast(o) )
 	    break;
 #endif
@@ -672,4 +672,4 @@ void qFadeEffect( TQWidget* w, int time )
 
     q_blend->run( time );
 }
-#endif //QT_NO_EFFECTS
+#endif //TQT_NO_EFFECTS
diff --git a/src/widgets/qeffects_p.h b/src/widgets/qeffects_p.h
index aecfe423d..918dca0bd 100644
--- a/src/widgets/qeffects_p.h
+++ b/src/widgets/qeffects_p.h
@@ -59,7 +59,7 @@
 #include "ntqnamespace.h"
 #endif // QT_H
 
-#ifndef QT_NO_EFFECTS
+#ifndef TQT_NO_EFFECTS
 class TQWidget;
 
 struct TQEffects
@@ -76,6 +76,6 @@ struct TQEffects
 
 extern void Q_EXPORT qScrollEffect( TQWidget*, TQEffects::DirFlags dir = TQEffects::DownScroll, int time = -1 );
 extern void Q_EXPORT qFadeEffect( TQWidget*, int time = -1 );
-#endif // QT_NO_EFFECTS
+#endif // TQT_NO_EFFECTS
 
 #endif // TQEFFECTS_P_H
diff --git a/src/widgets/qframe.cpp b/src/widgets/qframe.cpp
index 2af74737c..e5ccda027 100644
--- a/src/widgets/qframe.cpp
+++ b/src/widgets/qframe.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqframe.h"
-#ifndef QT_NO_FRAME
+#ifndef TQT_NO_FRAME
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqframe.h"
@@ -568,13 +568,13 @@ void TQFrame::drawFrame( TQPainter *p )
     TQRect       r     = frameRect();
     int         type  = fstyle & MShape;
     int         cstyle = fstyle & MShadow;
-#ifdef QT_NO_DRAWUTIL
+#ifdef TQT_NO_DRAWUTIL
     p->setPen( black ); // ####
     p->drawRect( r ); //### a bit too simple
 #else
     const TQColorGroup & g = colorGroup();
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     TQStyleOption opt(lineWidth(),midLineWidth());
 
     TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -588,7 +588,7 @@ void TQFrame::drawFrame( TQPainter *p )
 	flags |= TQStyle::Style_HasFocus;
     if (hasMouse())
 	flags |= TQStyle::Style_MouseOver;
-#endif // QT_NO_STYLE
+#endif // TQT_NO_STYLE
 
     switch ( type ) {
 
@@ -613,28 +613,28 @@ void TQFrame::drawFrame( TQPainter *p )
 	break;
 
     case MenuBarPanel:
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 	style().drawPrimitive(TQStyle::PE_PanelMenuBar, p, r, g, flags, opt);
 	break;
-#endif // fall through to Panel if QT_NO_STYLE
+#endif // fall through to Panel if TQT_NO_STYLE
 
     case ToolBarPanel:
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 	style().drawPrimitive( TQStyle::PE_PanelDockWindow, p, rect(), g, flags, opt);
         break;
-#endif // fall through to Panel if QT_NO_STYLE
+#endif // fall through to Panel if TQT_NO_STYLE
 
     case StyledPanel:
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
         if ( cstyle == Plain )
             qDrawPlainRect( p, r, g.foreground(), lwidth );
         else
 	    style().drawPrimitive(TQStyle::PE_Panel, p, r, g, flags, opt);
         break;
-#endif // fall through to Panel if QT_NO_STYLE
+#endif // fall through to Panel if TQT_NO_STYLE
 
     case PopupPanel:
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     {
 	int vextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameVerticalExtra, this),
 	    hextra = style().pixelMetric(TQStyle::PM_PopupMenuFrameHorizontalExtra, this);
@@ -665,7 +665,7 @@ void TQFrame::drawFrame( TQPainter *p )
 	    style().drawPrimitive(TQStyle::PE_PanelPopup, p, r, g, flags, opt);
         break;
     }
-#endif // fall through to Panel if QT_NO_STYLE
+#endif // fall through to Panel if TQT_NO_STYLE
 
     case Panel:
         if ( cstyle == Plain )
@@ -701,7 +701,7 @@ void TQFrame::drawFrame( TQPainter *p )
                             lwidth, midLineWidth() );
         break;
     }
-#endif // QT_NO_DRAWUTIL
+#endif // TQT_NO_DRAWUTIL
 }
 
 
@@ -751,4 +751,4 @@ void  TQFrame::styleChange( TQStyle& old )
     TQWidget::styleChange( old );
 }
 
-#endif //QT_NO_FRAME
+#endif //TQT_NO_FRAME
diff --git a/src/widgets/qgrid.cpp b/src/widgets/qgrid.cpp
index 97ab089e0..7e4cc5895 100644
--- a/src/widgets/qgrid.cpp
+++ b/src/widgets/qgrid.cpp
@@ -36,7 +36,7 @@
 
 
 #include "ntqgrid.h"
-#ifndef QT_NO_GRID
+#ifndef TQT_NO_GRID
 #include "ntqlayout.h"
 #include "ntqapplication.h"
 
diff --git a/src/widgets/qgridview.cpp b/src/widgets/qgridview.cpp
index e854d3dfe..8776ba843 100644
--- a/src/widgets/qgridview.cpp
+++ b/src/widgets/qgridview.cpp
@@ -41,7 +41,7 @@
 
 #include "ntqgridview.h"
 
-#ifndef QT_NO_GRIDVIEW
+#ifndef TQT_NO_GRIDVIEW
 
 #include "ntqpainter.h"
 
@@ -366,4 +366,4 @@ void TQGridView::dimensionChange( int, int ) {}
 
 */
 
-#endif // QT_NO_GRIDVIEW
+#endif // TQT_NO_GRIDVIEW
diff --git a/src/widgets/qgroupbox.cpp b/src/widgets/qgroupbox.cpp
index 39f43a470..1a8a1d1bb 100644
--- a/src/widgets/qgroupbox.cpp
+++ b/src/widgets/qgroupbox.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqgroupbox.h"
-#ifndef QT_NO_GROUPBOX
+#ifndef TQT_NO_GROUPBOX
 #include "ntqlayout.h"
 #include "ntqpainter.h"
 #include "ntqbitmap.h"
@@ -188,7 +188,7 @@ void TQGroupBox::init()
 {
     align = AlignAuto;
     setFrameStyle( TQFrame::GroupBoxPanel | TQFrame::Sunken );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     accel = 0;
 #endif
     vbox = 0;
@@ -212,7 +212,7 @@ void TQGroupBox::setTextSpacer()
 	TQFontMetrics fm = fontMetrics();
 	int fh = fm.height();
 	if ( isCheckable() ) {
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	    fh = d->checkbox->sizeHint().height() + 2;
 	    w = d->checkbox->sizeHint().width() + 2*fm.width( "xx" );
 #endif
@@ -245,7 +245,7 @@ void TQGroupBox::setTitle( const TQString &title )
     if ( str == title )				// no change
 	return;
     str = title;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( accel )
 	delete accel;
     accel = 0;
@@ -256,7 +256,7 @@ void TQGroupBox::setTitle( const TQString &title )
 			    this, SLOT(fixFocus()) );
     }
 #endif
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     if ( d->checkbox ) {
 	d->checkbox->setText( str );
 	updateCheckBoxGeometry();
@@ -312,7 +312,7 @@ void TQGroupBox::setTitle( const TQString &title )
 void TQGroupBox::setAlignment( int alignment )
 {
     align = alignment;
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     updateCheckBoxGeometry();
 #endif
     update();
@@ -323,7 +323,7 @@ void TQGroupBox::setAlignment( int alignment )
 void TQGroupBox::resizeEvent( TQResizeEvent *e )
 {
     TQFrame::resizeEvent(e);
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     if ( align & AlignRight || align & AlignCenter ||
 	 ( TQApplication::reverseLayout() && !(align & AlignLeft) ) )
 	updateCheckBoxGeometry();
@@ -370,7 +370,7 @@ void TQGroupBox::paintEvent( TQPaintEvent *event )
 	style().drawItem( &paint, r, ShowPrefix | AlignHCenter | va, colorGroup(),
 			  isEnabled(), 0, str, -1, ownPalette() ? 0 : &pen );
 	paint.setClipRegion( event->region().subtract( r ) ); // clip everything but title
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     } else if ( d->checkbox ) {
 	TQRect cbClip = d->checkbox->geometry();
 	TQFontMetrics fm = paint.fontMetrics();
@@ -581,7 +581,7 @@ void TQGroupBox::setColumnLayout(int strips, Orientation direction)
 	while( (w=(TQWidget *)it.current()) != 0 ) {
 	    ++it;
 	    if ( w->isWidgetType()
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 		 && w != d->checkbox
 #endif
 		 )
@@ -605,7 +605,7 @@ void TQGroupBox::childEvent( TQChildEvent *c )
     if ( !c->inserted() || !c->child()->isWidgetType() )
 	return;
     TQWidget *w = (TQWidget*)c->child();
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     if ( d->checkbox ) {
 	if ( w == d->checkbox )
 	    return;
@@ -677,7 +677,7 @@ void TQGroupBox::fixFocus()
 	if ( p == this && ( w->focusPolicy() & TabFocus ) == TabFocus
 	     && w->isVisibleTo(this) ) {
 	    if ( w->hasFocus()
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
 		 || ( !best && ::tqt_cast(w)
 		 && ((TQRadioButton*)w)->isChecked() )
 #endif
@@ -725,7 +725,7 @@ void TQGroupBox::calculateFrame()
 	    return;
 	}
     } else if ( isCheckable() ) {
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	TQRect r = rect();
 	int va = style().styleHint(TQStyle::SH_GroupBox_TextLabelVerticalAlignment, this);
 	if( va & AlignVCenter )
@@ -756,7 +756,7 @@ void TQGroupBox::focusInEvent( TQFocusEvent * )
 void TQGroupBox::fontChange( const TQFont & oldFont )
 {
     TQWidget::fontChange( oldFont );
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     updateCheckBoxGeometry();
 #endif
     calculateFrame();
@@ -772,7 +772,7 @@ TQSize TQGroupBox::sizeHint() const
     TQFontMetrics fm( font() );
     int tw, th;
     if ( isCheckable() ) {
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	tw = d->checkbox->sizeHint().width() + 2*fm.width( "xx" );
 	th = d->checkbox->sizeHint().height() + fm.width( TQChar(' ') );
 #endif
@@ -833,7 +833,7 @@ void TQGroupBox::setFlat( bool b )
     checkbox, and isCheckable() controls whether the checkbox is
     checked or not.
 */
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 void TQGroupBox::setCheckable( bool b )
 {
     if ( (d->checkbox != 0) == b )
@@ -862,11 +862,11 @@ void TQGroupBox::setCheckable( bool b )
     setTextSpacer();
     update();
 }
-#endif //QT_NO_CHECKBOX
+#endif //TQT_NO_CHECKBOX
 
 bool TQGroupBox::isCheckable() const
 {
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     return ( d->checkbox != 0 );
 #else
     return FALSE;
@@ -876,7 +876,7 @@ bool TQGroupBox::isCheckable() const
 
 bool TQGroupBox::isChecked() const
 {
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     return d->checkbox && d->checkbox->isChecked();
 #else
     return FALSE;
@@ -901,7 +901,7 @@ bool TQGroupBox::isChecked() const
     are enabled. If the checkbox is unchecked the children are
     disabled.
 */
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 void TQGroupBox::setChecked( bool b )
 {
     if ( d->checkbox )
@@ -922,7 +922,7 @@ void TQGroupBox::setChildrenEnabled( bool b )
     while( (o = it.current()) ) {
 	++it;
 	if ( o->isWidgetType()
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 	     && o != d->checkbox
 #endif
 	     ) {
@@ -947,7 +947,7 @@ void TQGroupBox::setEnabled(bool on)
     if ( !d->checkbox || !on )
 	return;
 
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
     // we are being enabled - disable children
     if ( !d->checkbox->isChecked() )
 	setChildrenEnabled( FALSE );
@@ -957,7 +957,7 @@ void TQGroupBox::setEnabled(bool on)
 /*
   recalculates and sets the checkbox setGeometry
 */
-#ifndef QT_NO_CHECKBOX
+#ifndef TQT_NO_CHECKBOX
 void TQGroupBox::updateCheckBoxGeometry()
 {
     if ( d->checkbox ) {
@@ -984,7 +984,7 @@ void TQGroupBox::updateCheckBoxGeometry()
 	d->checkbox->setGeometry( cbRect );
     }
 }
-#endif //QT_NO_CHECKBOX
+#endif //TQT_NO_CHECKBOX
 
 
-#endif //QT_NO_GROUPBOX
+#endif //TQT_NO_GROUPBOX
diff --git a/src/widgets/qhbox.cpp b/src/widgets/qhbox.cpp
index 89465fd4f..117164cfc 100644
--- a/src/widgets/qhbox.cpp
+++ b/src/widgets/qhbox.cpp
@@ -35,7 +35,7 @@
 **********************************************************************/
 
 #include "ntqhbox.h"
-#ifndef QT_NO_HBOX
+#ifndef TQT_NO_HBOX
 #include "ntqlayout.h"
 #include "ntqapplication.h"
 #include "ntqobjectlist.h"
diff --git a/src/widgets/qhbuttongroup.cpp b/src/widgets/qhbuttongroup.cpp
index 2a72f76e3..62027f691 100644
--- a/src/widgets/qhbuttongroup.cpp
+++ b/src/widgets/qhbuttongroup.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqhbuttongroup.h"
-#ifndef QT_NO_HBUTTONGROUP
+#ifndef TQT_NO_HBUTTONGROUP
 
 /*!
     \class TQHButtonGroup ntqhbuttongroup.h
diff --git a/src/widgets/qheader.cpp b/src/widgets/qheader.cpp
index 29c0306bb..f764b653f 100644
--- a/src/widgets/qheader.cpp
+++ b/src/widgets/qheader.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqheader.h"
-#ifndef QT_NO_HEADER
+#ifndef TQT_NO_HEADER
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
@@ -735,7 +735,7 @@ void TQHeader::mouseReleaseEvent( TQMouseEvent *e )
 	handleColumnResize( handleIdx, c - d->pressDelta, TRUE );
     } break;
     case Moving: {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	unsetCursor();
 #endif
 	int section = d->i2s[handleIdx];
@@ -784,7 +784,7 @@ void TQHeader::mouseMoveEvent( TQMouseEvent *e )
 
     switch( state ) {
     case Idle:
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	if ( handleAt(c) < 0 )
 	    unsetCursor();
 	else if ( orient == Horizontal )
@@ -799,7 +799,7 @@ void TQHeader::mouseMoveEvent( TQMouseEvent *e )
 	if ( TQABS( c - clickPos ) > 4 && d->move ) {
 	    state = Moving;
 	    moveToIdx = -1;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    if ( orient == Horizontal )
 		setCursor( sizeHorCursor );
 	    else
@@ -2046,4 +2046,4 @@ void TQHeader::fontChange( const TQFont &oldFont )
     TQWidget::fontChange( oldFont );
 }
 
-#endif // QT_NO_HEADER
+#endif // TQT_NO_HEADER
diff --git a/src/widgets/qhgroupbox.cpp b/src/widgets/qhgroupbox.cpp
index 79324ee58..1a37a9583 100644
--- a/src/widgets/qhgroupbox.cpp
+++ b/src/widgets/qhgroupbox.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqhgroupbox.h"
-#ifndef QT_NO_HGROUPBOX
+#ifndef TQT_NO_HGROUPBOX
 
 /*!
     \class TQHGroupBox ntqhgroupbox.h
diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp
index b7305d038..6e801ccb0 100644
--- a/src/widgets/qiconview.cpp
+++ b/src/widgets/qiconview.cpp
@@ -46,7 +46,7 @@
 
 #include "ntqiconview.h"
 
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
 
 #include "ntqfontmetrics.h"
 #include "ntqpainter.h"
@@ -164,7 +164,7 @@ static TQPixmap *get_qiv_buffer_pixmap( const TQSize &s )
     return qiv_buffer_pixmap;
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 class Q_EXPORT TQIconDragData
 {
@@ -223,7 +223,7 @@ public:
     TQIconView::Arrangement arrangement;
     TQIconView::ResizeMode resizeMode;
     TQSize oldSize;
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     TQValueList iconDragData;
 #endif
     int numDragItems, cachedW, cachedH;
@@ -231,7 +231,7 @@ public:
     TQPoint dragStart;
     TQString currInputString;
     TQIconView::ItemTextPos itemTextPos;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     TQCursor oldCursor;
 #endif
     int cachedContentsX, cachedContentsY;
@@ -313,7 +313,7 @@ static int cmpIconViewItems( const void *n1, const void *n2 )
 #endif
 
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 class TQIconViewToolTip : public TQToolTip
 {
 public:
@@ -366,7 +366,7 @@ public:
     TQIconViewPrivate::ItemContainer *container1, *container2;
 };
 
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
 
 class TQIconViewItemLineEdit : public TQTextEdit
 {
@@ -437,7 +437,7 @@ void TQIconViewItemLineEdit::focusOutEvent( TQFocusEvent *e )
 }
 #endif
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 
 /*!
@@ -897,7 +897,7 @@ TQIconViewItem::TQIconViewItem( TQIconView *parent, TQIconViewItem *after,
     parent using \a text as the text and \a picture as the icon.
 */
 
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
 TQIconViewItem::TQIconViewItem( TQIconView *parent, const TQString &text,
 			      const TQPicture &picture )
     : view( parent ), itemText( text ), itemIcon( 0 )
@@ -925,7 +925,7 @@ TQIconViewItem::TQIconViewItem( TQIconView *parent, TQIconViewItem *after,
 */
 
 void TQIconViewItem::init( TQIconViewItem *after
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
 			  , TQPicture *pic
 #endif
 			  )
@@ -940,10 +940,10 @@ void TQIconViewItem::init( TQIconViewItem *after
     visible = TRUE;
     selected = FALSE;
     selectable = TRUE;
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
     renameBox = 0;
 #endif
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     itemPic = pic;
 #endif
     if ( view ) {
@@ -963,7 +963,7 @@ void TQIconViewItem::init( TQIconViewItem *after
 
 TQIconViewItem::~TQIconViewItem()
 {
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
     removeRenameBox();
 #endif
     if ( view && !view->d->clearing )
@@ -971,7 +971,7 @@ TQIconViewItem::~TQIconViewItem()
     view = 0;
     if ( itemIcon && itemIcon->serialNumber() != unknown_icon->serialNumber() )
 	delete itemIcon;
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     delete itemPic;
 #endif
     delete d;
@@ -1109,7 +1109,7 @@ void TQIconViewItem::setPixmap( const TQPixmap &icon )
     \sa picture()
 */
 
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
 void TQIconViewItem::setPicture( const TQPicture &icon )
 {
     // clear assigned pixmap if any
@@ -1304,7 +1304,7 @@ TQPixmap *TQIconViewItem::pixmap() const
     \sa setPicture()
 */
 
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
 TQPicture *TQIconViewItem::picture() const
 {
     return itemPic;
@@ -1723,7 +1723,7 @@ bool TQIconViewItem::acceptDrop( const TQMimeSource * ) const
     return FALSE;
 }
 
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
 /*!
     Starts in-place renaming of an icon, if allowed.
 
@@ -1780,7 +1780,7 @@ int TQIconViewItem::compare( TQIconViewItem *i ) const
     return key().localeAwareCompare( i->key() );
 }
 
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
 /*!
   This private function is called when the user pressed Return during
   in-place renaming.
@@ -1864,7 +1864,7 @@ void TQIconViewItem::calcRect( const TQString &text_ )
     int pw = 0;
     int ph = 0;
 
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     if ( picture() ) {
 	TQRect br = picture()->boundingRect();
 	pw = br.width() + 2;
@@ -1970,7 +1970,7 @@ void TQIconViewItem::paintItem( TQPainter *p, const TQColorGroup &cg )
 
     calcTmpText();
 
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     if ( picture() ) {
 	TQPicture *pic = picture();
 	if ( isSelected() ) {
@@ -2104,7 +2104,7 @@ void TQIconViewItem::paintFocus( TQPainter *, const TQColorGroup & )
     reimplement this function.
 */
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void TQIconViewItem::dropped( TQDropEvent *, const TQValueList & )
 {
 }
@@ -2752,7 +2752,7 @@ TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f )
     d->adjustTimer = new TQTimer( this, "iconview adjust timer" );
     d->isIconDrag = FALSE;
     d->inMenuMode = FALSE;
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     d->iconDragData.clear();
 #endif
     d->numDragItems = 0;
@@ -2766,7 +2766,7 @@ TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f )
     d->rearrangeEnabled = TRUE;
     d->itemTextPos = Bottom;
     d->reorderItemsWhenInsert = TRUE;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     d->oldCursor = arrowCursor;
 #endif
     d->resortItemsWhenInsert = FALSE;
@@ -2809,7 +2809,7 @@ TQIconView::TQIconView( TQWidget *parent, const char *name, WFlags f )
     viewport()->setFocusProxy( this );
     viewport()->setFocusPolicy( TQWidget::WheelFocus );
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     d->toolTip = new TQIconViewToolTip( viewport(), this );
 #endif
     d->showTips = TRUE;
@@ -2897,7 +2897,7 @@ TQIconView::~TQIconView()
     d->backBuffer = 0;
     delete d->fm;
     d->fm = 0;
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     delete d->toolTip;
     d->toolTip = 0;
 #endif
@@ -4487,7 +4487,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e )
     if ( item )
 	d->selectAnchor = item;
 
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
     if ( d->renamingItem )
 	d->renamingItem->renameItem();
 #endif
@@ -4508,7 +4508,7 @@ void TQIconView::contentsMousePressEventEx( TQMouseEvent *e )
 
 	if ( !item->renameEnabled() ) {
 	    d->mousePressed = TRUE;
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
 	} else {
 	    ensureItemVisible( item );
 	    setCurrentItem( item );
@@ -4724,7 +4724,7 @@ void TQIconView::contentsMouseMoveEvent( TQMouseEvent *e )
 	if ( ( d->dragStartPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) {
 	    d->mousePressed = FALSE;
 	    d->cleared = FALSE;
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 	    startDrag();
 #endif
 	    if ( d->tmpCurrentItem )
@@ -4768,7 +4768,7 @@ void TQIconView::contentsMouseDoubleClickEvent( TQMouseEvent *e )
     \reimp
 */
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void TQIconView::contentsDragEnterEvent( TQDragEnterEvent *e )
 {
     d->dragging = TRUE;
@@ -5039,7 +5039,7 @@ void TQIconView::keyPressEvent( TQKeyEvent *e )
     case Key_Escape:
 	e->ignore();
 	break;
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
     case Key_F2: {
 	if ( d->currentItem->renameEnabled() ) {
 	    d->currentItem->renameItem();
@@ -5575,7 +5575,7 @@ void TQIconView::drawRubber( TQPainter *p )
     \sa TQIconDrag
 */
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 TQDragObject *TQIconView::dragObject()
 {
     if ( !d->currentItem )
@@ -5750,7 +5750,7 @@ void TQIconView::emitRenamed( TQIconViewItem *item )
 
 void TQIconView::drawDragShapes( const TQPoint &pos )
 {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( pos == TQPoint( -1, -1 ) )
 	return;
 
@@ -5802,7 +5802,7 @@ void TQIconView::drawDragShapes( const TQPoint &pos )
     drag data (e.g. shapes of icons which are dragged), etc.
 */
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void TQIconView::initDragEnter( TQDropEvent *e )
 {
     if ( TQIconDrag::canDecode( e ) ) {
@@ -6641,7 +6641,7 @@ void TQIconView::windowActivationChange( bool oldActive )
 
 bool TQIconView::isRenaming() const
 {
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
     return d->renamingItem && d->renamingItem->renameBox;
 #else
     return FALSE;
@@ -6668,4 +6668,4 @@ int TQIconView::visibleHeightSB() const
     return TQMAX( 0, visibleHeight() - offset );
 }
 
-#endif // QT_NO_ICONVIEW
+#endif // TQT_NO_ICONVIEW
diff --git a/src/widgets/qlabel.cpp b/src/widgets/qlabel.cpp
index 314bfe219..ff647ab28 100644
--- a/src/widgets/qlabel.cpp
+++ b/src/widgets/qlabel.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqlabel.h"
-#ifndef QT_NO_LABEL
+#ifndef TQT_NO_LABEL
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqaccel.h"
@@ -196,7 +196,7 @@ TQLabel::TQLabel( TQWidget *buddy,  const TQString &text,
     : TQFrame( parent, name, f | WMouseNoMask )
 {
     init();
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     setBuddy( buddy );
 #endif
     setText( text );
@@ -216,15 +216,15 @@ TQLabel::~TQLabel()
 void TQLabel::init()
 {
     lpixmap = 0;
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     lmovie = 0;
 #endif
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     lbuddy = 0;
     accel = 0;
 #endif
     lpixmap = 0;
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     lpicture = 0;
 #endif
     align = AlignAuto | AlignVCenter | ExpandTabs;
@@ -232,7 +232,7 @@ void TQLabel::init()
     autoresize = FALSE;
     scaledcontents = FALSE;
     textformat = TQt::AutoText;
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     doc = 0;
 #endif
 
@@ -273,18 +273,18 @@ void TQLabel::setText( const TQString &text )
     if ( ltext == text )
 	return;
     TQSize osh = sizeHint();
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     bool hadRichtext = doc != 0;
 #endif
     clearContents();
     ltext = text;
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     bool useRichText = (textformat == RichText ||
       ( ( textformat == AutoText ) && TQStyleSheet::mightBeRichText(ltext) ) );
 #else
     bool useRichText = TRUE;
 #endif
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     // ### Setting accelerators for rich text labels will not work.
     // Eg. >Hello will return ALT+G which is clearly
     // not intended.
@@ -298,7 +298,7 @@ void TQLabel::setText( const TQString &text )
 	}
     }
 #endif
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     if ( useRichText ) {
 	if ( !hadRichtext )
 	    align |= WordBreak;
@@ -351,7 +351,7 @@ void TQLabel::setPixmap( const TQPixmap &pixmap )
     updateLabel( osh );
 }
 
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
 /*!
     Sets the label contents to \a picture. Any previous content is
     cleared.
@@ -369,7 +369,7 @@ void TQLabel::setPicture( const TQPicture &picture )
 
     updateLabel( osh );
 }
-#endif // QT_NO_PICTURE
+#endif // TQT_NO_PICTURE
 
 /*!
     Sets the label contents to plain text containing the textual
@@ -440,14 +440,14 @@ void TQLabel::setAlignment( int alignment )
     if ( alignment == align )
 	return;
     TQSize osh = sizeHint();
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( lbuddy )
 	align = alignment | ShowPrefix;
     else
 #endif
 	align = alignment;
 
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     TQString t = ltext;
     if ( !t.isNull() ) {
 	ltext = TQString::null;
@@ -531,12 +531,12 @@ TQSize TQLabel::sizeForWidth( int w ) const
 {
     TQRect br;
     TQPixmap *pix = pixmap();
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     TQPicture *pic = picture();
 #else
     const int pic = 0;
 #endif
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     TQMovie *mov = movie();
 #else
     const int mov = 0;
@@ -560,15 +560,15 @@ TQSize TQLabel::sizeForWidth( int w ) const
 
     if ( pix )
 	br = pix->rect();
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     else if ( pic )
 	br = pic->boundingRect();
 #endif
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     else if ( mov )
 	br = mov->framePixmap().rect();
 #endif
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     else if ( doc ) {
 	int oldW = doc->width();
 	if ( align & WordBreak ) {
@@ -608,7 +608,7 @@ TQSize TQLabel::sizeForWidth( int w ) const
 int TQLabel::heightForWidth( int w ) const
 {
     if (
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 	doc ||
 #endif
 	(align & WordBreak) )
@@ -642,7 +642,7 @@ TQSize TQLabel::minimumSizeHint() const
     TQSize sz( -1, -1 );
 
     if (
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 	 !doc &&
 #endif
 	 (align & WordBreak) == 0 ) {
@@ -669,7 +669,7 @@ void TQLabel::resizeEvent( TQResizeEvent* e )
 {
     TQFrame::resizeEvent( e );
 
-#ifdef QT_NO_RICHTEXT
+#ifdef TQT_NO_RICHTEXT
     static const bool doc = FALSE;
 #endif
 
@@ -731,12 +731,12 @@ void TQLabel::drawContents( TQPainter *p )
     TQRect cr = contentsRect();
 
     TQPixmap *pix = pixmap();
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     TQPicture *pic = picture();
 #else
     const int pic = 0;
 #endif
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     TQMovie *mov = movie();
 #else
     const int mov = 0;
@@ -759,7 +759,7 @@ void TQLabel::drawContents( TQPainter *p )
 	}
     }
 
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     if ( mov ) {
 	// ### should add movie to qDrawItem
 	TQRect r = style().itemRect( p, cr, align, isEnabled(), &(mov->framePixmap()),
@@ -769,7 +769,7 @@ void TQLabel::drawContents( TQPainter *p )
     }
     else
 #endif
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     if ( doc ) {
 	doc->setWidth(p, cr.width() );
 	int rh = doc->height();
@@ -796,7 +796,7 @@ void TQLabel::drawContents( TQPainter *p )
 	doc->draw(p, cr.x(), cr.y()+yo, cr, cg, 0);
     } else
 #endif
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     if ( pic ) {
 	TQRect br = pic->boundingRect();
 	int rw = br.width();
@@ -804,7 +804,7 @@ void TQLabel::drawContents( TQPainter *p )
 	if ( scaledcontents ) {
 	    p->save();
 	    p->translate( cr.x(), cr.y() );
-#ifndef QT_NO_TRANSFORMATIONS
+#ifndef TQT_NO_TRANSFORMATIONS
 	    p->scale( (double)cr.width()/rw, (double)cr.height()/rh );
 #endif
 	    p->drawPicture( -br.x(), -br.y(), *pic );
@@ -825,7 +825,7 @@ void TQLabel::drawContents( TQPainter *p )
     } else
 #endif
     {
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
 	if ( scaledcontents && pix ) {
 	    if ( !d->img )
 		d->img = new TQImage( lpixmap->convertToImage() );
@@ -876,7 +876,7 @@ void TQLabel::updateLabel( TQSize oldSizeHint )
 
   Internal slot, used to set focus for accelerator labels.
 */
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 void TQLabel::acceleratorSlot()
 {
     if ( !lbuddy )
@@ -900,7 +900,7 @@ void TQLabel::acceleratorSlot()
 
   Internal slot, used to clean up if the buddy widget dies.
 */
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 void TQLabel::buddyDied() // I can't remember if I cried.
 {
     lbuddy = 0;
@@ -955,7 +955,7 @@ void TQLabel::setBuddy( TQWidget *buddy )
 
     if ( !lbuddy )
 	return;
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     if ( !( textformat == RichText || (textformat == AutoText &&
 				       TQStyleSheet::mightBeRichText(ltext) ) ) )
 #endif
@@ -983,10 +983,10 @@ TQWidget * TQLabel::buddy() const
 {
     return lbuddy;
 }
-#endif //QT_NO_ACCEL
+#endif //TQT_NO_ACCEL
 
 
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
 void TQLabel::movieUpdated(const TQRect& rect)
 {
     TQMovie *mov = movie();
@@ -1034,7 +1034,7 @@ void TQLabel::setMovie( const TQMovie& movie )
 	updateLabel( osh );	// resize/update signals will come soon enough
 }
 
-#endif // QT_NO_MOVIE
+#endif // TQT_NO_MOVIE
 
 /*!
   \internal
@@ -1044,14 +1044,14 @@ void TQLabel::setMovie( const TQMovie& movie )
 
 void TQLabel::clearContents()
 {
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     delete doc;
     doc = 0;
 #endif
 
     delete lpixmap;
     lpixmap = 0;
-#ifndef QT_NO_PICTURE
+#ifndef TQT_NO_PICTURE
     delete lpicture;
     lpicture = 0;
 #endif
@@ -1061,11 +1061,11 @@ void TQLabel::clearContents()
     d->pix = 0;
 
     ltext = TQString::null;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( accel )
 	accel->clear();
 #endif
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
     if ( lmovie ) {
 	lmovie->disconnectResize(this, SLOT(movieResized(const TQSize&)));
 	lmovie->disconnectUpdate(this, SLOT(movieUpdated(const TQRect&)));
@@ -1076,7 +1076,7 @@ void TQLabel::clearContents()
 }
 
 
-#ifndef QT_NO_MOVIE
+#ifndef TQT_NO_MOVIE
 
 /*!
     Returns a pointer to the label's movie, or 0 if no movie has been
@@ -1090,7 +1090,7 @@ TQMovie* TQLabel::movie() const
     return lmovie;
 }
 
-#endif  // QT_NO_MOVIE
+#endif  // TQT_NO_MOVIE
 
 /*!
     \property TQLabel::backgroundMode
@@ -1137,7 +1137,7 @@ void TQLabel::setTextFormat( TQt::TextFormat format )
 void TQLabel::fontChange( const TQFont & )
 {
     if ( !ltext.isEmpty() ) {
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 	if ( doc )
 	    doc->setDefaultFont( font() );
 #endif
@@ -1145,7 +1145,7 @@ void TQLabel::fontChange( const TQFont & )
     }
 }
 
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
 /*!
     \property TQLabel::scaledContents
     \brief whether the label will scale its contents to fill all
@@ -1177,7 +1177,7 @@ void TQLabel::setScaledContents( bool enable )
     update( contentsRect() );
 }
 
-#endif // QT_NO_IMAGE_SMOOTHSCALE
+#endif // TQT_NO_IMAGE_SMOOTHSCALE
 
 /*!
     Sets the font used on the TQLabel to font \a f.
@@ -1188,4 +1188,4 @@ void TQLabel::setFont( const TQFont &f )
     TQFrame::setFont( f );
 }
 
-#endif // QT_NO_LABEL
+#endif // TQT_NO_LABEL
diff --git a/src/widgets/qlcdnumber.cpp b/src/widgets/qlcdnumber.cpp
index c284da3ea..57d396871 100644
--- a/src/widgets/qlcdnumber.cpp
+++ b/src/widgets/qlcdnumber.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqlcdnumber.h"
-#ifndef QT_NO_LCDNUMBER
+#ifndef TQT_NO_LCDNUMBER
 #include "ntqbitarray.h"
 #include "ntqpainter.h"
 
@@ -1167,4 +1167,4 @@ TQSize TQLCDNumber::sizeHint() const
     return TQSize( 10 + 9 * (numDigits() + (smallDecimalPoint() ? 0 : 1)), 23 );
 }
 
-#endif // QT_NO_LCDNUMBER
+#endif // TQT_NO_LCDNUMBER
diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp
index 196e097ce..b23486831 100644
--- a/src/widgets/qlineedit.cpp
+++ b/src/widgets/qlineedit.cpp
@@ -39,10 +39,10 @@
 **********************************************************************/
 
 #include "ntqlineedit.h"
-#ifndef QT_NO_LINEEDIT
+#ifndef TQT_NO_LINEEDIT
 
 // Keep this position to avoid patch rejection
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 #include "ntqinputcontext.h"
 #endif
 
@@ -70,7 +70,7 @@
 #include "ntqaccessible.h"
 #endif
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 #include "ntqkeysequence.h"
 #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
 #else
@@ -95,7 +95,7 @@ struct TQLineEditPrivate : public TQt
 	  hscroll(0), validator(0), maskData(0),
 	  undoState(0), selstart(0), selend(0),
 	  imstart(0), imend(0), imselstart(0), imselend(0)
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 	,dndTimer(0)
 #endif
 	{}
@@ -245,7 +245,7 @@ struct TQLineEditPrivate : public TQt
     inline bool hasSelectedText() const { return !text.isEmpty() && selend > selstart; }
     inline void deselect() { selDirty |= (selend > selstart); selstart = selend = 0; }
     void removeSelectedText();
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     void copy( bool clipboard = TRUE ) const;
 #endif
     inline bool inSelection( int x ) const
@@ -278,7 +278,7 @@ struct TQLineEditPrivate : public TQt
     TQRect cursorRect() const;
     void updateMicroFocusHint();
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     // drag and drop
     TQPoint dndPos;
     int dndTimer;
@@ -1115,7 +1115,7 @@ void TQLineEdit::setDragEnabled( bool b )
 */
 bool TQLineEdit::hasAcceptableInput() const
 {
-#ifndef QT_NO_VALIDATOR
+#ifndef TQT_NO_VALIDATOR
     TQString text = d->text;
     int cursor = d->cursor;
     if ( d->validator && d->validator->validate( text, cursor ) != TQValidator::Acceptable )
@@ -1319,14 +1319,14 @@ bool TQLineEdit::isReadOnly() const
 void TQLineEdit::setReadOnly( bool enable )
 {
     d->readOnly = enable;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     setCursor( enable ? arrowCursor : ibeamCursor );
 #endif
     update();
 }
 
 
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 /*!
     Copies the selected text to the clipboard and deletes it, if there
     is any, and if echoMode() is \c Normal.
@@ -1385,7 +1385,7 @@ void TQLineEditPrivate::copy( bool clipboard ) const
     }
 }
 
-#endif // !QT_NO_CLIPBOARD
+#endif // !TQT_NO_CLIPBOARD
 
 /*!\reimp
 */
@@ -1451,7 +1451,7 @@ bool TQLineEdit::event( TQEvent * e )
 	if ( timerId == d->cursorTimer ) {
 	    if(!hasSelectedText() || style().styleHint( TQStyle::SH_BlinkCursorWhenTextSelected ))
 		d->setCursorVisible( !d->cursorVisible );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 	} else if ( timerId == d->dndTimer ) {
 	    if( !d->drag() )
                 return TRUE;
@@ -1479,7 +1479,7 @@ void TQLineEdit::mousePressEvent( TQMouseEvent* e )
     }
     bool mark = e->state() & ShiftButton;
     int cursor = d->xToPos( e->pos().x() );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !mark && d->dragEnabled && d->echoMode == Normal &&
 	 e->button() == LeftButton && d->inSelection( e->pos().x() ) ) {
 	d->cursor = cursor;
@@ -1501,10 +1501,10 @@ void TQLineEdit::mouseMoveEvent( TQMouseEvent * e )
 {
     if ( sendMouseEventToInputContext( e ) )
 	return;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( ( e->state() & MouseButtonMask ) == 0 ) {
 	if ( !d->readOnly && d->dragEnabled
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	     && !TQWhatsThis::inWhatsThisMode()
 #endif
 	    )
@@ -1513,7 +1513,7 @@ void TQLineEdit::mouseMoveEvent( TQMouseEvent * e )
 #endif
 
     if ( e->state() & LeftButton ) {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 	if ( d->dndTimer ) {
 	    if ( ( d->dndPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() )
 		d->drag();
@@ -1531,7 +1531,7 @@ void TQLineEdit::mouseReleaseEvent( TQMouseEvent* e )
 {
     if ( sendMouseEventToInputContext( e ) )
 	return;
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( e->button() == LeftButton ) {
 	if ( d->dndTimer ) {
 	    killTimer( d->dndTimer );
@@ -1541,7 +1541,7 @@ void TQLineEdit::mouseReleaseEvent( TQMouseEvent* e )
 	}
     }
 #endif
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     if (TQApplication::clipboard()->supportsSelection() ) {
 	if ( e->button() == LeftButton ) {
 	    d->copy( FALSE );
@@ -1601,7 +1601,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
 	if ( hasAcceptableInput() ) {
 	    emit returnPressed();
 	}
-#ifndef QT_NO_VALIDATOR
+#ifndef TQT_NO_VALIDATOR
 	else if ( v && v->validate( d->text, d->cursor ) != TQValidator::Acceptable ) {
 	    TQString vstr = d->text;
 	    v->fixup( vstr );
@@ -1654,7 +1654,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
 	case Key_B:
 	    cursorForward( e->state() & ShiftButton, -1 );
 	    break;
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 	case Key_C:
 	    copy();
 	    break;
@@ -1690,7 +1690,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
 		clear();
 	    break;
 #endif
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 	case Key_V:
 	    if ( !d->readOnly )
 		paste();
@@ -1799,7 +1799,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
 	    if ( !d->readOnly )
 		undo();
 	    break;
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 	case Key_F16: // Copy key on Sun keyboards
 	    copy();
 	    break;
@@ -1836,7 +1836,7 @@ void TQLineEdit::keyPressEvent( TQKeyEvent * e )
  */
 bool TQLineEdit::sendMouseEventToInputContext( TQMouseEvent *e )
 {
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     if ( d->composeMode() ) {
 	int cursor = d->xToPosInternal( e->pos().x(), TQTextItem::OnCharacters );
 	int mousePos = cursor - d->imstart;
@@ -2119,7 +2119,7 @@ void TQLineEdit::drawContents( TQPainter *p )
 }
 
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 /*!\reimp
 */
 void TQLineEdit::dragMoveEvent( TQDragMoveEvent *e )
@@ -2203,13 +2203,13 @@ bool TQLineEditPrivate::drag()
 	removeSelectedText();
 	finishChange( priorState );
     }
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     q->setCursor( readOnly ? arrowCursor : ibeamCursor );
 #endif
     return TRUE;
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelectAll };
 
@@ -2217,8 +2217,8 @@ enum { IdUndo, IdRedo, IdSep1, IdCut, IdCopy, IdPaste, IdClear, IdSep2, IdSelect
 */
 void TQLineEdit::contextMenuEvent( TQContextMenuEvent * e )
 {
-#ifndef QT_NO_POPUPMENU
-#ifndef QT_NO_IM
+#ifndef TQT_NO_POPUPMENU
+#ifndef TQT_NO_IM
     if ( d->composeMode() )
 	return;
 #endif
@@ -2238,7 +2238,7 @@ void TQLineEdit::contextMenuEvent( TQContextMenuEvent * e )
 	case IdSelectAll: selectAll(); break;
 	case IdUndo: undo(); break;
 	case IdRedo: redo(); break;
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 	case IdCut: cut(); break;
 	case IdCopy: copy(); break;
 	case IdPaste: paste(); break;
@@ -2247,7 +2247,7 @@ void TQLineEdit::contextMenuEvent( TQContextMenuEvent * e )
 	    ; // nothing selected or lineedit destroyed. Be careful.
 	}
     }
-#endif //QT_NO_POPUPMENU
+#endif //TQT_NO_POPUPMENU
 }
 
 /*!
@@ -2260,7 +2260,7 @@ void TQLineEdit::contextMenuEvent( TQContextMenuEvent * e )
 
 TQPopupMenu *TQLineEdit::createPopupMenu()
 {
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     TQPopupMenu *popup = new TQPopupMenu( this, "qt_edit_menu" );
     int id = d->menuId = popup->insertItem( tr( "&Undo" ) + ACCEL_KEY( Z ) );
     popup->insertItem( tr( "&Redo" ) + ACCEL_KEY( Y ) );
@@ -2276,7 +2276,7 @@ TQPopupMenu *TQLineEdit::createPopupMenu()
 #endif
 	);
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     TQInputContext *qic = getInputContext();
     if ( qic )
 	qic->addMenusTo( popup );
@@ -2284,7 +2284,7 @@ TQPopupMenu *TQLineEdit::createPopupMenu()
     
     popup->setItemEnabled( id - IdUndo, d->isUndoAvailable() );
     popup->setItemEnabled( id - IdRedo, d->isRedoAvailable() );
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     popup->setItemEnabled( id - IdCut, !d->readOnly && d->hasSelectedText() );
     popup->setItemEnabled( id - IdCopy, d->hasSelectedText() );
     popup->setItemEnabled( id - IdPaste, !d->readOnly && !TQApplication::clipboard()->text().isEmpty() );
@@ -2375,7 +2375,7 @@ void TQLineEdit::clipboardChanged()
 
 void TQLineEditPrivate::init( const TQString& txt )
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     q->setCursor( readOnly ? arrowCursor : ibeamCursor );
 #endif
     q->setFocusPolicy( TQWidget::StrongFocus );
@@ -2513,7 +2513,7 @@ void TQLineEditPrivate::finishChange( int validateFromState, bool setModified )
 	// do validation
 	bool wasValidInput = validInput;
 	validInput = TRUE;
-#ifndef QT_NO_VALIDATOR
+#ifndef TQT_NO_VALIDATOR
 	if ( validator && validateFromState >= 0 ) {
 	    TQString textCopy = text;
 	    int cursorCopy = cursor;
@@ -2956,4 +2956,4 @@ int TQLineEditPrivate::findInMask( int pos, bool forward, bool findSeparator, TQ
 }
 
 
-#endif // QT_NO_LINEEDIT
+#endif // TQT_NO_LINEEDIT
diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp
index 2e5e059fe..5ccedf405 100644
--- a/src/widgets/qlistbox.cpp
+++ b/src/widgets/qlistbox.cpp
@@ -45,7 +45,7 @@
 #endif
 
 #include "ntqlistbox.h"
-#ifndef QT_NO_LISTBOX
+#ifndef TQT_NO_LISTBOX
 #include "ntqmemarray.h"
 #include "ntqfontmetrics.h"
 #include "ntqpainter.h"
@@ -4690,4 +4690,4 @@ int TQListBoxItem::rtti() const
     return RTTI;
 }
 
-#endif // QT_NO_LISTBOX
+#endif // TQT_NO_LISTBOX
diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp
index c4a974369..22c04e03c 100644
--- a/src/widgets/qlistview.cpp
+++ b/src/widgets/qlistview.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqlistview.h"
-#ifndef QT_NO_LISTVIEW
+#ifndef TQT_NO_LISTVIEW
 #include "ntqtimer.h"
 #include "ntqheader.h"
 #include "ntqpainter.h"
@@ -260,7 +260,7 @@ struct TQListViewPrivate
     TQListView::ResizeMode resizeMode;
 };
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 class TQListViewToolTip : public TQToolTip
 {
 public:
@@ -1125,7 +1125,7 @@ bool TQListViewItem::acceptDrop( const TQMimeSource * ) const
     return FALSE;
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 /*!
     This function is called when something was dropped on the item. \a e
@@ -2089,7 +2089,7 @@ void TQListViewItem::paintCell( TQPainter * p, const TQColorGroup & cg,
 		ci->truncated = TRUE;
 		ci->tmpText = qEllipsisText( t, fm, width - pw, align );
 	    } else if ( mlenabled && fm.width( t ) + pw > width ) {
-#ifndef QT_NO_STRINGLIST
+#ifndef TQT_NO_STRINGLIST
 		TQStringList list = TQStringList::split( TQChar('\n'), t, TRUE );
 		for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
 		    TQString z = *it;
@@ -2678,7 +2678,7 @@ void TQListView::init()
     d->useDoubleBuffer = FALSE;
     d->startDragItem = 0;
     d->toolTips = TRUE;
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     d->toolTip = new TQListViewToolTip( viewport(), this );
 #endif
     d->updateHeader = FALSE;
@@ -2835,7 +2835,7 @@ TQListView::~TQListView()
     d->drawables = 0;
     delete d->vci;
     d->vci = 0;
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     delete d->toolTip;
     d->toolTip = 0;
 #endif
@@ -4694,7 +4694,7 @@ void TQListView::contentsMouseMoveEvent( TQMouseEvent * e )
 	}
 	if ( ( d->dragStartPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) {
 	    d->buttonDown = FALSE;
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 	    startDrag();
 #endif
 	}
@@ -7216,7 +7216,7 @@ void TQListView::openFocusItem()
 
 static const int autoopenTime = 750;
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 /*! \reimp */
 
@@ -7329,7 +7329,7 @@ void TQListView::startDrag()
     drag->drag();
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 /*!
     \property TQListView::defaultRenameAction
@@ -8203,4 +8203,4 @@ void TQListView::adjustColumn( int col )
     }
 }
 
-#endif // QT_NO_LISTVIEW
+#endif // TQT_NO_LISTVIEW
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index f2069485d..f196a1d36 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqmainwindow.h"
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 
 #include "ntqtimer.h"
 #include "ntqlayout.h"
@@ -88,7 +88,7 @@ public:
     {
     }
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     TQMenuBar * mb;
 #else
     TQWidget * mb;
@@ -285,7 +285,7 @@ TQLayoutIterator TQMainWindowLayout::iterator()
   TQHideToolTip and TQHideDock - minimized dock
 */
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 class TQHideToolTip : public TQToolTip
 {
 public:
@@ -310,13 +310,13 @@ public:
 	pressed = FALSE;
 	setMouseTracking( TRUE );
 	win = parent;
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	tip = new TQHideToolTip( this );
 #endif
     }
     ~TQHideDock()
     {
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	delete tip;
 #endif
     }
@@ -471,13 +471,13 @@ private:
     TQMainWindow *win;
     int pressedHandle;
     bool pressed;
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQHideToolTip *tip;
     friend class TQHideToolTip;
 #endif
 };
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 void TQHideToolTip::maybeTip( const TQPoint &pos )
 {
     if ( !parentWidget() )
@@ -921,7 +921,7 @@ TQMainWindow::~TQMainWindow()
     delete d;
 }
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
 /*!
     Sets this main window to use the menu bar \a newMenuBar.
 
@@ -970,7 +970,7 @@ TQMenuBar * TQMainWindow::menuBar() const
     ((TQMainWindow *)this)->triggerLayout();
     return b;
 }
-#endif // QT_NO_MENUBAR
+#endif // TQT_NO_MENUBAR
 
 /*!
     Sets this main window to use the status bar \a newStatusBar.
@@ -993,7 +993,7 @@ void TQMainWindow::setStatusBar( TQStatusBar * newStatusBar )
     if ( d->sb )
 	delete d->sb;
     d->sb = newStatusBar;
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     // ### this code can cause unnecessary creation of a tool tip group
     connect( toolTipGroup(), SIGNAL(showTip(const TQString&)),
 	     d->sb, SLOT(message(const TQString&)) );
@@ -1034,7 +1034,7 @@ TQStatusBar * TQMainWindow::statusBar() const
 }
 
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 /*!
     Sets this main window to use the tool tip group \a
     newToolTipGroup.
@@ -1275,7 +1275,7 @@ void TQMainWindow::addDockWindow( TQDockWindow * dockWindow, const TQString &lab
 			      Dock edge, bool newLine )
 {
     addDockWindow( dockWindow, edge, newLine );
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     TQToolBar *tb = ::tqt_cast(dockWindow);
     if ( tb )
 	tb->setLabel( label );
@@ -1426,7 +1426,7 @@ void TQMainWindow::removeDockWindow( TQDockWindow * dockWindow )
 
 void TQMainWindow::setUpLayout()
 {
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     if ( !d->mb ) {
 	// slightly evil hack here.  reconsider this
 	TQObjectList * l
@@ -1456,7 +1456,7 @@ void TQMainWindow::setUpLayout()
 	    delete item;
     }
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     if ( d->mb && d->mb->isVisibleTo( this ) ) {
 	d->tll->setMenuBar( d->mb );
 	if (style().styleHint(TQStyle::SH_MainWindow_SpaceBelowMenuBar, this))
@@ -1851,7 +1851,7 @@ void TQMainWindow::triggerLayout( bool deleteLayout )
 */
 void TQMainWindow::whatsThis()
 {
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
     TQWhatsThis::enterWhatsThisMode();
 #endif
 }
@@ -1907,7 +1907,7 @@ bool TQMainWindow::getLocation( TQDockWindow *dw, Dock &dock, int &index, bool &
     return TRUE;
 }
 
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
 /*!
     Returns a list of all the toolbars which are in the \a dock dock
     area, regardless of their state.
@@ -2214,7 +2214,7 @@ void TQMainWindow::menuAboutToShow()
 
 	empty = TRUE;
 
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
 	if ( dockWindows == AllDockWindows || dockWindows == OnlyToolBars ) {
 	    for ( o = l->first(); o; o = l->next() ) {
 		TQToolBar *tb = ::tqt_cast(o);
@@ -2280,7 +2280,7 @@ void TQMainWindow::slotPlaceChanged()
     TQDockWindow *dw = ::tqt_cast(obj);
     if ( dw )
 	emit dockWindowPositionChanged( dw );
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     TQToolBar *tb = ::tqt_cast(obj);
     if ( tb )
 	emit toolBarPositionChanged( tb );
@@ -2442,7 +2442,7 @@ void TQMainWindow::setAppropriate( TQDockWindow *dw, bool a )
     d->appropriate.replace( dw, a );
 }
 
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
 static void saveDockArea( TQTextStream &ts, TQDockArea *a )
 {
     TQPtrList l = a->dockWindowList();
diff --git a/src/widgets/qmenubar.cpp b/src/widgets/qmenubar.cpp
index 8ee3cad20..b9acce9ca 100644
--- a/src/widgets/qmenubar.cpp
+++ b/src/widgets/qmenubar.cpp
@@ -42,7 +42,7 @@
 // ### could be reorganised by discarding INCLUDE_MENUITEM_DEF and put
 // the relevant declarations in a private header?
 #include "ntqmainwindow.h"
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
 #include "ntqmenubar.h"
 #include "ntqpopupmenu.h"
 #include "ntqaccel.h"
@@ -271,7 +271,7 @@ TQMenuBar::TQMenuBar( TQWidget *parent, const char *name )
     macCreateNativeMenubar();
 #endif
     isMenuBar = TRUE;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     autoaccel = 0;
 #endif
     irects    = 0;
@@ -331,7 +331,7 @@ void TQMenuBar::styleChange( TQStyle& old )
 
 TQMenuBar::~TQMenuBar()
 {
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     delete autoaccel;
 #endif
 #if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
@@ -382,7 +382,7 @@ void TQMenuBar::performDelayedContentsChanged()
 {
     pendingDelayedContentsChanges = 0;
     // here the part the can be delayed
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     // if performDelayedStateChanged() will be called too,
     // it will call setupAccelerators() too, no need to do it twice
     if( !pendingDelayedStateChanges )
@@ -391,14 +391,14 @@ void TQMenuBar::performDelayedContentsChanged()
     calculateRects();
     if ( isVisible() ) {
 	update();
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
 	TQMainWindow *mw = ::tqt_cast(parent());
 	if ( mw ) {
 	    mw->triggerLayout();
 	    mw->update();
 	}
 #endif
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 	if ( parentWidget() && parentWidget()->layout() )
 	    parentWidget()->layout()->activate();
 #endif
@@ -425,7 +425,7 @@ void TQMenuBar::performDelayedStateChanged()
 {
     pendingDelayedStateChanges = 0;
     // here the part that can be delayed
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     setupAccelerators(); // ### when we have a good solution for the accel vs. focus
 			 // widget problem, remove that. That is only a workaround
                          // if you remove this, see performDelayedContentsChanged()
@@ -514,7 +514,7 @@ void TQMenuBar::languageChange()
 bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
 {
     if ( object == parent() && object
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
 	 && !::tqt_cast(object)
 #endif
 	 && event->type() == TQEvent::Resize ) {
@@ -558,7 +558,7 @@ bool TQMenuBar::eventFilter( TQObject *object, TQEvent *event )
     }
 
     TQKeyEvent * ke = (TQKeyEvent *) event;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     // look for Alt press and Alt-anything press
     if ( event->type() == TQEvent::Accel ) {
 	TQWidget * f = ((TQWidget *)object)->focusWidget();
@@ -661,7 +661,7 @@ void TQMenuBar::subHighlighted( int id )
   \internal
   Receives signals from menu accelerator.
 */
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 void TQMenuBar::accelActivated( int id )
 {
 #if defined(Q_WS_MAC) && !defined(TQMAC_QMENUBAR_NO_NATIVE)
@@ -680,7 +680,7 @@ void TQMenuBar::accelActivated( int id )
   This slot receives signals from menu accelerator when it is about to be
   destroyed.
 */
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 void TQMenuBar::accelDestroyed()
 {
     autoaccel = 0;				// don't delete it twice!
@@ -812,7 +812,7 @@ void TQMenuBar::hidePopups()
 
 void TQMenuBar::show()
 {
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     setupAccelerators();
 #endif
 
@@ -842,7 +842,7 @@ void TQMenuBar::show()
     TQWidget::show();
 #endif
 
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
     TQMainWindow *mw = ::tqt_cast(parent());
     if ( mw ) //### ugly workaround
 	mw->triggerLayout();
@@ -860,7 +860,7 @@ void TQMenuBar::hide()
     TQWidget::hide();
     setAltMode( FALSE );
     hidePopups();
-#ifndef QT_NO_MAINWINDOW
+#ifndef TQT_NO_MAINWINDOW
     TQMainWindow *mw = ::tqt_cast(parent());
     if ( mw ) //### ugly workaround
 	mw->triggerLayout();
@@ -1526,7 +1526,7 @@ void TQMenuBar::setAltMode( bool enable )
 /*!
     Sets up keyboard accelerators for the menu bar.
 */
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 void TQMenuBar::setupAccelerators()
 {
@@ -1629,7 +1629,7 @@ TQSize TQMenuBar::sizeHint() const
 
 TQSize TQMenuBar::minimumSize() const
 {
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     TQToolBar *tb = ::tqt_cast(parent());
     if ( tb )
 	return sizeHint();
@@ -1680,4 +1680,4 @@ void TQMenuBar::activateItemAt( int index )
 	goodbye( FALSE );
 }
 
-#endif // QT_NO_MENUBAR
+#endif // TQT_NO_MENUBAR
diff --git a/src/widgets/qmenudata.cpp b/src/widgets/qmenudata.cpp
index ef385ab16..f55ca509d 100644
--- a/src/widgets/qmenudata.cpp
+++ b/src/widgets/qmenudata.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqmenudata.h"
-#ifndef QT_NO_MENUDATA
+#ifndef TQT_NO_MENUDATA
 #include "ntqpopupmenu.h"
 #include "ntqmenubar.h"
 #include "ntqapplication.h"
@@ -281,7 +281,7 @@ int TQMenuData::insertAny( const TQString *text, const TQPixmap *pixmap,
 	newText.truncate( newText.findRev( '\t' ) );
 	mi->text_data = newText.isEmpty()?TQString():newText;
 #endif
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	mi->accel_key = TQt::Key_unknown;
 #endif
 	if ( pixmap && !pixmap->isNull() )
@@ -424,7 +424,7 @@ int TQMenuData::insertItem( const TQString &text,
 {
     int actualID = insertAny( &text, 0, 0, 0, id, index );
     connectItem( actualID, receiver, member );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( accel )
 	setAccel( accel, actualID );
 #endif
@@ -452,7 +452,7 @@ int TQMenuData::insertItem( const TQIconSet& icon,
 {
     int actualID = insertAny( &text, 0, 0, &icon, id, index );
     connectItem( actualID, receiver, member );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( accel )
 	setAccel( accel, actualID );
 #endif
@@ -481,7 +481,7 @@ int TQMenuData::insertItem( const TQPixmap &pixmap,
 {
     int actualID = insertAny( 0, &pixmap, 0, 0, id, index );
     connectItem( actualID, receiver, member );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( accel )
 	setAccel( accel, actualID );
 #endif
@@ -514,7 +514,7 @@ int TQMenuData::insertItem( const TQIconSet& icon,
 {
     int actualID = insertAny( 0, &pixmap, 0, &icon, id, index );
     connectItem( actualID, receiver, member );
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( accel )
 	setAccel( accel, actualID );
 #endif
@@ -857,7 +857,7 @@ void TQMenuData::clear()
 	menuContentsChanged();
 }
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 
 /*!
     Returns the accelerator key that has been defined for the menu
@@ -931,7 +931,7 @@ void TQMenuData::setAccel( const TQKeySequence& key, int id )
     }
 }
 
-#endif // QT_NO_ACCEL
+#endif // TQT_NO_ACCEL
 
 /*!
     Returns the icon set that has been set for menu item \a id, or 0
@@ -1019,7 +1019,7 @@ void TQMenuData::changeItem( int id, const TQString &text )
 	    mi->pixmap_data = 0;
 	}
 	mi->text_data = text;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	if ( !mi->accel_key && text.find( '\t' ) != -1 )
 	    mi->accel_key = TQt::Key_unknown;
 #endif
@@ -1144,7 +1144,7 @@ void TQMenuData::setItemEnabled( int id, bool enable )
     TQMenuItem *mi = findItem( id, &parent );
     if ( mi && (bool)mi->is_enabled != enable ) {
 	mi->is_enabled = enable;
-#if !defined(QT_NO_ACCEL) && !defined(QT_NO_POPUPMENU)
+#if !defined(TQT_NO_ACCEL) && !defined(TQT_NO_POPUPMENU)
 	if ( mi->popup() )
 	    mi->popup()->enableAccel( enable );
 #endif
@@ -1191,7 +1191,7 @@ void TQMenuData::setItemChecked( int id, bool check )
     TQMenuItem *mi = findItem( id, &parent );
     if ( mi && (bool)mi->is_checked != check ) {
 	mi->is_checked = check;
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 	if ( parent->isPopupMenu && !((TQPopupMenu *)parent)->isCheckable() )
 	    ((TQPopupMenu *)parent)->setCheckable( TRUE );
 #endif
@@ -1280,7 +1280,7 @@ TQMenuItem * TQMenuData::findItem( int id, TQMenuData ** parent ) const
     it.toFirst();
     while ( (mi=it.current()) ) {		// search submenus
 	++it;
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 	if ( mi->popup_menu ) {
 	    TQPopupMenu *p = mi->popup_menu;
 	    if (!p->avoid_circularity) {
@@ -1587,13 +1587,13 @@ bool TQCustomMenuItem::isSeparator() const
 */
 void TQMenuData::activateItemAt( int index )
 {
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     if ( isMenuBar )
 	( (TQMenuBar*)this )->activateItemAt( index );
     else
 #endif
     {
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     if ( isPopupMenu )
 	( (TQPopupMenu*)this )->activateItemAt( index );
 #endif
diff --git a/src/widgets/qmultilineedit.cpp b/src/widgets/qmultilineedit.cpp
index e34d3f9b3..09fe86a66 100644
--- a/src/widgets/qmultilineedit.cpp
+++ b/src/widgets/qmultilineedit.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqmultilineedit.h"
-#ifndef QT_NO_MULTILINEEDIT
+#ifndef TQT_NO_MULTILINEEDIT
 #include "ntqpainter.h"
 #include "ntqscrollbar.h"
 #include "ntqcursor.h"
diff --git a/src/widgets/qpopupmenu.cpp b/src/widgets/qpopupmenu.cpp
index a851abb2a..79812185e 100644
--- a/src/widgets/qpopupmenu.cpp
+++ b/src/widgets/qpopupmenu.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqpopupmenu.h"
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 #include "ntqmenubar.h"
 #include "ntqaccel.h"
 #include "ntqpainter.h"
@@ -123,7 +123,7 @@ static void popupSubMenuLater( int msec, TQPopupMenu * receiver ) {
 
 static bool preventAnimation = FALSE;
 
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 extern void qWhatsThisBDH();
 static TQMenuItem* whatsThisItem = 0;
 #endif
@@ -281,7 +281,7 @@ TQPopupMenu::TQPopupMenu( TQWidget *parent, const char *name )
     d->scroll.scrolltimer = 0;
     d->hasmouse = 0;
     isPopupMenu	  = TRUE;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     autoaccel	  = 0;
     accelDisabled = FALSE;
 #endif
@@ -387,7 +387,7 @@ void TQPopupMenu::performDelayedContentsChanged()
 {
     pendingDelayedContentsChanges = 0;
     // here the part the can be delayed
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     // if performDelayedStateChanged() will be called too,
     // it will call updateAccel() too, no need to do it twice
     if( !pendingDelayedStateChanges )
@@ -424,7 +424,7 @@ void TQPopupMenu::performDelayedStateChanged()
 {
     pendingDelayedStateChanges = 0;
     // here the part that can be delayed
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     updateAccel( 0 ); // ### when we have a good solution for the accel vs. focus widget problem, remove that. That is only a workaround
     // if you remove this, see performDelayedContentsChanged()
 #endif
@@ -570,7 +570,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
 	    y = sy;
     }
 #ifdef Q_WS_X11
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     TQMenuData *top = this;		// find top level
     while ( top->parentMenu )
 	top = top->parentMenu;
@@ -648,7 +648,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
     motion=0;
     actItem = -1;
 
-#ifndef QT_NO_EFFECTS
+#ifndef TQT_NO_EFFECTS
     int hGuess = tqApp->reverseLayout() ? TQEffects::LeftScroll : TQEffects::RightScroll;
     int vGuess = TQEffects::DownScroll;
     if ( tqApp->reverseLayout() ) {
@@ -663,7 +663,7 @@ void TQPopupMenu::popup( const TQPoint &pos, int indexAtPoint )
 	    hGuess = TQEffects::LeftScroll;
     }
 
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     if ( ( snapToMouse && ( y + h/2 < mouse.y() ) ) ||
 	( parentMenu && parentMenu->isMenuBar &&
 	( y + h/2 < ((TQMenuBar*)parentMenu)->mapToGlobal( ((TQMenuBar*)parentMenu)->pos() ).y() ) ) )
@@ -733,7 +733,7 @@ void TQPopupMenu::subHighlighted( int id )
 
 static bool fromAccel = FALSE;
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 void TQPopupMenu::accelActivated( int id )
 {
     TQMenuItem *mi = findItem( id );
@@ -751,7 +751,7 @@ void TQPopupMenu::accelDestroyed()		// accel about to be deleted
 {
     autoaccel = 0;				// don't delete it twice!
 }
-#endif //QT_NO_ACCEL
+#endif //TQT_NO_ACCEL
 
 void TQPopupMenu::popupDestroyed( TQObject *o )
 {
@@ -767,7 +767,7 @@ void TQPopupMenu::actSig( int id, bool inwhatsthis )
 	    TQAccessible::updateAccessibility( this, indexOf(id)+1, TQAccessible::MenuCommand );
 #endif
     } else {
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	TQRect r( itemGeometry( indexOf( id ) ) );
 	TQPoint p( r.center().x(), r.bottom() );
 	TQString whatsThis = findItem( id )->whatsThis();
@@ -830,7 +830,7 @@ void TQPopupMenu::hideAllPopups()
 	top = top->parentMenu;
     ((TQPopupMenu*)top)->hide();			// cascade from top level
 
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
     if (whatsThisItem) {
 	qWhatsThisBDH();
 	whatsThisItem = 0;
@@ -876,7 +876,7 @@ bool TQPopupMenu::tryMenuBar( TQMouseEvent *e )
     register TQMenuData *top = this;		// find top level
     while ( top->parentMenu )
 	top = top->parentMenu;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     return top->isMenuBar ?
 	((TQMenuBar *)top)->tryMouseEvent( this, e ) :
 			      ((TQPopupMenu*)top)->tryMouseEvent(this, e );
@@ -908,13 +908,13 @@ bool TQPopupMenu::tryMouseEvent( TQPopupMenu *p, TQMouseEvent * e)
 
 void TQPopupMenu::byeMenuBar()
 {
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     register TQMenuData *top = this;		// find top level
     while ( top->parentMenu )
 	top = top->parentMenu;
 #endif
     hideAllPopups();
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     if ( top->isMenuBar )
 	((TQMenuBar *)top)->goodbye();
 #endif
@@ -1069,7 +1069,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize)
     }
 
     if(badSize || force_update) {
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	updateAccel( 0 );
 #endif
 	int height = 0;
@@ -1248,7 +1248,7 @@ TQSize TQPopupMenu::updateSize(bool force_update, bool do_resize)
 }
 
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 /*!
   \internal
   The \a parent is 0 when it is updated when a menu item has
@@ -1300,7 +1300,7 @@ void TQPopupMenu::updateAccel( TQWidget *parent )
 	TQKeySequence k = mi->key();
 	if ( (int)k ) {
 	    int id = autoaccel->insertItem( k, mi->id() );
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	    autoaccel->setWhatsThis( id, mi->whatsThis() );
 #endif
 	}
@@ -1422,7 +1422,7 @@ void TQPopupMenu::hide()
 #if defined(QT_ACCESSIBILITY_SUPPORT)
     TQAccessible::updateAccessibility( this, 0, TQAccessible::PopupMenuEnd );
 #endif
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     TQMenuData *top = this;		// find top level
     while ( top->parentMenu )
 	top = top->parentMenu;
@@ -1712,13 +1712,13 @@ void TQPopupMenu::mouseReleaseEvent( TQMouseEvent *e )
 	    }
 	}
 	TQPopupMenu *popup = mi->popup();
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	    bool b = TQWhatsThis::inWhatsThisMode();
 #else
 	    const bool b = FALSE;
 #endif
 	if ( !mi->isEnabledAndVisible() ) {
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	    if ( b ) {
 		actItem = -1;
 		updateItem( mi->id() );
@@ -1869,7 +1869,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e )
       -			((e->state() & ControlButton) ? CTRL : 0) |
       -			((e->state() & AltButton) ? ALT : 0));
       -
-      - #ifndef QT_NO_ACCEL
+      - #ifndef TQT_NO_ACCEL
       -	if (mi)
       -	    setAccel(modifier + e->key(), mi->id());
       - #endif
@@ -1918,7 +1918,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e )
 	{
 	    TQMenuData* p = parentMenu;
 	    hide();
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
 	    if ( p && p->isMenuBar )
 		((TQMenuBar*) p)->goodbye( TRUE );
 #endif
@@ -1979,7 +1979,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e )
 	{
 	    if ( actItem < 0 )
 		break;
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	    bool b = TQWhatsThis::inWhatsThisMode();
 #else
 	    const bool b = FALSE;
@@ -2007,7 +2007,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e )
 	    }
 	}
 	break;
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
     case Key_F1:
 	if ( actItem < 0 || e->state() != ShiftButton)
 	    break;
@@ -2076,7 +2076,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e )
 		popup->setFirstItemActive();
 	    } else {
 		byeMenuBar();
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 		bool b = TQWhatsThis::inWhatsThisMode();
 #else
 		const bool b = FALSE;
@@ -2099,7 +2099,7 @@ void TQPopupMenu::keyPressEvent( TQKeyEvent *e )
 		dy = indexOf( firstAfterCurrent->id() ) - actItem;
 	}
     }
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     if ( !ok_key ) {				// send to menu bar
 	register TQMenuData *top = this;		// find top level
 	while ( top->parentMenu )
@@ -2584,7 +2584,7 @@ void TQPopupMenu::setActiveItem( int i )
     }
     if ( mi->id() != -1 )
 	hilitSig( mi->id() );
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
     if (whatsThisItem && whatsThisItem != mi) {
 	qWhatsThisBDH();
     }
@@ -2753,7 +2753,7 @@ void TQPopupMenu::toggleTearOff()
 	TQPopupMenu* p = new TQPopupMenu( parentWidget(), "tear off menu" );
 	connect( p, SIGNAL( activated(int) ), this, SIGNAL( activated(int) ) );
         connect( p, SIGNAL( highlighted(int) ), this, SIGNAL( highlighted(int) ) );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	p->setCaption( caption() );
 #endif
 	p->setCheckable( isCheckable() );
@@ -2799,13 +2799,13 @@ void TQPopupMenu::activateItemAt( int index )
 	} else {
 	    byeMenuBar();			// deactivate menu bar
 
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	    bool b = TQWhatsThis::inWhatsThisMode();
 #else
 	    const bool b = FALSE;
 #endif
 	    if ( !mi->isEnabledAndVisible() ) {
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 		if ( b ) {
 		    actItem = -1;
 		    updateItem( mi->id() );
@@ -2833,7 +2833,7 @@ void TQPopupMenu::activateItemAt( int index )
 	} else {
 	    TQMenuData* p = parentMenu;
 	    hide();
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
 	    if ( p && p->isMenuBar )
 		((TQMenuBar*) p)->goodbye( TRUE );
 #endif
@@ -2910,5 +2910,5 @@ int TQPopupMenu::menuItemHeight( TQMenuItem *mi, TQFontMetrics fm )
     return h;
 }
 
-#endif // QT_NO_POPUPMENU
+#endif // TQT_NO_POPUPMENU
 
diff --git a/src/widgets/qprogressbar.cpp b/src/widgets/qprogressbar.cpp
index ec5424c34..0271ee68f 100644
--- a/src/widgets/qprogressbar.cpp
+++ b/src/widgets/qprogressbar.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqprogressbar.h"
-#ifndef QT_NO_PROGRESSBAR
+#ifndef TQT_NO_PROGRESSBAR
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqpixmap.h"
diff --git a/src/widgets/qpushbutton.cpp b/src/widgets/qpushbutton.cpp
index e43ff2408..469eb802c 100644
--- a/src/widgets/qpushbutton.cpp
+++ b/src/widgets/qpushbutton.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqpushbutton.h"
-#ifndef QT_NO_PUSHBUTTON
+#ifndef TQT_NO_PUSHBUTTON
 #include "ntqdialog.h"
 #include "ntqfontmetrics.h"
 #include "ntqpainter.h"
@@ -260,11 +260,11 @@ public:
     {}
     ~TQPushButtonPrivate()
     {
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 	delete iconset;
 #endif
     }
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     TQGuardedPtr popup;
 #endif
     TQIconSet* iconset;
@@ -307,7 +307,7 @@ TQPushButton::TQPushButton( const TQString &text, TQWidget *parent,
     The \a parent and \a name arguments are sent to the TQWidget
     constructor.
 */
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
 TQPushButton::TQPushButton( const TQIconSet& icon, const TQString &text,
 			  TQWidget *parent, const char *name )
 	: TQButton( parent, name )
@@ -334,7 +334,7 @@ void TQPushButton::init()
     lastEnabled = FALSE;
     hasMenuArrow = FALSE;
     flt = FALSE;
-#ifndef QT_NO_DIALOG
+#ifndef TQT_NO_DIALOG
     autoDefButton = ::tqt_cast(topLevelWidget()) != 0;
 #else
     autoDefButton = FALSE;
@@ -388,7 +388,7 @@ void TQPushButton::setDefault( bool enable )
     if ( (bool)defButton == enable )
 	return;					// no change
     defButton = enable;
-#ifndef QT_NO_DIALOG
+#ifndef TQT_NO_DIALOG
     if ( defButton && ::tqt_cast(topLevelWidget()) )
  	((TQDialog*)topLevelWidget())->setMainDefault( this );
 #endif
@@ -409,7 +409,7 @@ TQSize TQPushButton::sizeHint() const
     int w = 0, h = 0;
 
     // calculate contents size...
-#ifndef QT_NO_ICONSET
+#ifndef TQT_NO_ICONSET
     if ( iconSet() && !iconSet()->isNull() ) {
 	int iw = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).width() + 4;
 	int ih = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal ).height();
@@ -614,7 +614,7 @@ void TQPushButton::focusInEvent( TQFocusEvent *e )
 {
     if (autoDefButton && !defButton) {
 	defButton = TRUE;
-#ifndef QT_NO_DIALOG
+#ifndef TQT_NO_DIALOG
 	if ( defButton && ::tqt_cast(topLevelWidget()) )
  	    ((TQDialog*)topLevelWidget())->setDefault( this );
 #endif
@@ -627,7 +627,7 @@ void TQPushButton::focusInEvent( TQFocusEvent *e )
 */
 void TQPushButton::focusOutEvent( TQFocusEvent *e )
 {
-#ifndef QT_NO_DIALOG
+#ifndef TQT_NO_DIALOG
     if ( defButton && autoDefButton ) {
 	if ( ::tqt_cast(topLevelWidget()) )
 	    ((TQDialog*)topLevelWidget())->setDefault( 0 );
@@ -635,14 +635,14 @@ void TQPushButton::focusOutEvent( TQFocusEvent *e )
 #endif
 
     TQButton::focusOutEvent( e );
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     if ( popup() && popup()->isVisible() )	// restore pressed status
 	setDown( TRUE );
 #endif
 }
 
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 /*!
     Associates the popup menu \a popup with this push button. This
     turns the button into a menu button.
@@ -662,8 +662,8 @@ void TQPushButton::setPopup( TQPopupMenu* popup )
     d->popup = popup;
     setIsMenuButton( popup != 0 );
 }
-#endif //QT_NO_POPUPMENU
-#ifndef QT_NO_ICONSET
+#endif //TQT_NO_POPUPMENU
+#ifndef TQT_NO_ICONSET
 void TQPushButton::setIconSet( const TQIconSet& icon )
 {
     if ( !d )
@@ -687,8 +687,8 @@ TQIconSet* TQPushButton::iconSet() const
 {
     return d ? d->iconset : 0;
 }
-#endif // QT_NO_ICONSET
-#ifndef QT_NO_POPUPMENU
+#endif // TQT_NO_ICONSET
+#ifndef TQT_NO_POPUPMENU
 /*!
     Returns the button's associated popup menu or 0 if no popup menu
     has been set.
@@ -707,7 +707,7 @@ void TQPushButton::popupPressed()
     if ( isDown() && popup ) {
 	bool horizontal = TRUE;
 	bool topLeft = TRUE;			// ### always TRUE
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
 	TQToolBar *tb = ::tqt_cast(parentWidget());
 	if ( tb && tb->orientation() == Vertical )
 	    horizontal = FALSE;
diff --git a/src/widgets/qradiobutton.cpp b/src/widgets/qradiobutton.cpp
index 10bbc8be1..4d98e8a6d 100644
--- a/src/widgets/qradiobutton.cpp
+++ b/src/widgets/qradiobutton.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqradiobutton.h"
-#ifndef QT_NO_RADIOBUTTON
+#ifndef TQT_NO_RADIOBUTTON
 #include "ntqbuttongroup.h"
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
@@ -138,7 +138,7 @@ void TQRadioButton::init()
 {
     setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
     setToggleButton( TRUE );
-#ifndef QT_NO_BUTTONGROUP
+#ifndef TQT_NO_BUTTONGROUP
     TQButtonGroup *bgrp = ::tqt_cast(parentWidget());
     if ( bgrp )
 	bgrp->setRadioButtonExclusive( TRUE );
@@ -197,7 +197,7 @@ void TQRadioButton::drawButton( TQPainter *paint )
     TQRect irect = TQStyle::visualRect( style().subRect(TQStyle::SR_RadioButtonIndicator, this), this );
     const TQColorGroup &cg = colorGroup();
 
-#if !defined( QT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX )
+#if !defined( TQT_NO_TEXTSTREAM ) && !defined( Q_WS_MACX )
 #   define  SAVE_RADIOBUTTON_PIXMAPS
 #endif
 #if defined(SAVE_RADIOBUTTON_PIXMAPS)
diff --git a/src/widgets/qrangecontrol.cpp b/src/widgets/qrangecontrol.cpp
index 7f1701ff7..2aa8f86c6 100644
--- a/src/widgets/qrangecontrol.cpp
+++ b/src/widgets/qrangecontrol.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqrangecontrol.h"
-#ifndef QT_NO_RANGECONTROL
+#ifndef TQT_NO_RANGECONTROL
 #include "ntqglobal.h"
 #include 
 
diff --git a/src/widgets/qscrollbar.cpp b/src/widgets/qscrollbar.cpp
index ecaa3b3fc..b234f1f29 100644
--- a/src/widgets/qscrollbar.cpp
+++ b/src/widgets/qscrollbar.cpp
@@ -39,13 +39,13 @@
 **********************************************************************/
 
 #include "ntqscrollbar.h"
-#ifndef QT_NO_SCROLLBAR
+#ifndef TQT_NO_SCROLLBAR
 #include "ntqpainter.h"
 #include "ntqbitmap.h"
 #include "ntqapplication.h"
 #include "ntqtimer.h"
 #include "ntqstyle.h"
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 #include 
 #endif
 #if defined(QT_ACCESSIBILITY_SUPPORT)
@@ -452,7 +452,7 @@ void TQScrollBar::rangeChange()
 void TQScrollBar::doAutoRepeat()
 {
     bool sendRepeat = clickedAt;
-#if !defined( QT_NO_CURSOR ) && !defined( QT_NO_STYLE )
+#if !defined( TQT_NO_CURSOR ) && !defined( TQT_NO_STYLE )
     if(sendRepeat && (pressedControl == TQStyle::SC_ScrollBarAddPage ||
                       pressedControl == TQStyle::SC_ScrollBarSubPage) &&
        style().styleHint(TQStyle::SH_ScrollBar_StopMouseOverSlider, this) &&
@@ -502,7 +502,7 @@ void TQScrollBar::stopAutoRepeat()
 /*!
     \reimp
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQScrollBar::wheelEvent( TQWheelEvent *e )
 {
     static float offset = 0;
diff --git a/src/widgets/qscrollview.cpp b/src/widgets/qscrollview.cpp
index 1938ff23f..c759a9952 100644
--- a/src/widgets/qscrollview.cpp
+++ b/src/widgets/qscrollview.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqwidget.h"
-#ifndef QT_NO_SCROLLVIEW
+#ifndef TQT_NO_SCROLLVIEW
 #include "ntqscrollbar.h"
 #include "ntqobjectlist.h"
 #include "ntqpainter.h"
@@ -128,7 +128,7 @@ public:
         clipped_viewport( 0 ),
         flags( vpwflags ),
         vx( 0 ), vy( 0 ), vwidth( 1 ), vheight( 1 ),
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
         autoscroll_timer( parent, "scrollview autoscroll timer" ),
 	drag_autoscroll( TRUE ),
 #endif
@@ -194,7 +194,7 @@ public:
     TQScrollView::ResizePolicy policy;
     TQScrollView::ScrollBarMode  vMode;
     TQScrollView::ScrollBarMode  hMode;
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     TQPoint cpDragStart;
     TQTimer autoscroll_timer;
     int autoscroll_time;
@@ -585,7 +585,7 @@ TQScrollView::TQScrollView( TQWidget *parent, const char *name, WFlags f ) :
     WFlags flags = WResizeNoErase | (f&WPaintClever) | (f&WRepaintNoErase) | (f&WStaticContents);
     d = new TQScrollViewData( this, flags );
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     connect( &d->autoscroll_timer, SIGNAL( timeout() ),
              this, SLOT( doDragAutoScroll() ) );
 #endif
@@ -1178,7 +1178,7 @@ void  TQScrollView::mouseMoveEvent( TQMouseEvent *e ) //#### remove for 4.0
 /*!
     \reimp
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQScrollView::wheelEvent( TQWheelEvent *e )
 {
     TQWheelEvent ce( viewport()->mapFromGlobal( e->globalPos() ),
@@ -1515,7 +1515,7 @@ bool TQScrollView::eventFilter( TQObject *obj, TQEvent *e )
 	    if ( ((TQMouseEvent*)e)->isAccepted() )
 		return TRUE;
             break;
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
         case TQEvent::DragEnter:
             viewportDragEnterEvent( (TQDragEnterEvent*)e );
             break;
@@ -1541,7 +1541,7 @@ bool TQScrollView::eventFilter( TQObject *obj, TQEvent *e )
             stopDragAutoScroll();
             viewportDropEvent( (TQDropEvent*)e );
             break;
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
         case TQEvent::ContextMenu:
             viewportContextMenuEvent( (TQContextMenuEvent*)e );
 	    if ( ((TQContextMenuEvent*)e)->isAccepted() )
@@ -1610,7 +1610,7 @@ void TQScrollView::contentsMouseMoveEvent( TQMouseEvent* e )
     e->ignore();
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 /*!
     This event handler is called whenever the TQScrollView receives a
@@ -1648,14 +1648,14 @@ void TQScrollView::contentsDropEvent( TQDropEvent * )
 {
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 /*!
     This event handler is called whenever the TQScrollView receives a
     wheelEvent() in \a{e}: the mouse position is translated to be a
     point on the contents.
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQScrollView::contentsWheelEvent( TQWheelEvent * e )
 {
     e->ignore();
@@ -1789,7 +1789,7 @@ void TQScrollView::viewportMouseMoveEvent( TQMouseEvent* e )
 	e->ignore();
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 /*!\internal
 
@@ -1849,7 +1849,7 @@ void TQScrollView::viewportDropEvent( TQDropEvent* e )
     e->setPoint(contentsToViewport(e->pos()));
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 /*!\internal
 
@@ -1859,7 +1859,7 @@ void TQScrollView::viewportDropEvent( TQDropEvent* e )
 
   \sa TQWidget::wheelEvent()
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQScrollView::viewportWheelEvent( TQWheelEvent* e )
 {
     /*
@@ -2743,7 +2743,7 @@ void TQScrollView::drawContents( TQPainter * )
 {
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 /*!
   \internal
@@ -2827,7 +2827,7 @@ bool TQScrollView::dragAutoScroll() const
     return d->drag_autoscroll;
 }
 
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
 
 /*!\internal
  */
@@ -2851,4 +2851,4 @@ TQSize TQScrollView::cachedSizeHint() const
     return d->use_cached_size_hint ? d->cachedSizeHint : TQSize();
 }
 
-#endif // QT_NO_SCROLLVIEW
+#endif // TQT_NO_SCROLLVIEW
diff --git a/src/widgets/qslider.cpp b/src/widgets/qslider.cpp
index fd8c36581..883065e0c 100644
--- a/src/widgets/qslider.cpp
+++ b/src/widgets/qslider.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqslider.h"
-#ifndef QT_NO_SLIDER
+#ifndef TQT_NO_SLIDER
 #include "ntqpainter.h"
 #include "ntqdrawutil.h"
 #include "ntqtimer.h"
@@ -511,7 +511,7 @@ void TQSlider::mouseMoveEvent( TQMouseEvent *e )
 /*!
     \reimp
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQSlider::wheelEvent( TQWheelEvent * e )
 {
     if ( e->orientation() != orientation() && !rect().contains(e->pos()) )
diff --git a/src/widgets/qspinbox.cpp b/src/widgets/qspinbox.cpp
index 44692688b..a79b18d7e 100644
--- a/src/widgets/qspinbox.cpp
+++ b/src/widgets/qspinbox.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqspinbox.h"
-#ifndef QT_NO_SPINBOX
+#ifndef TQT_NO_SPINBOX
 
 #include "ntqcursor.h"
 #include "ntqpushbutton.h"
@@ -710,7 +710,7 @@ void TQSpinBox::resizeEvent( TQResizeEvent* )
 /*!
     \reimp
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQSpinBox::wheelEvent( TQWheelEvent * e )
 {
     e->accept();
diff --git a/src/widgets/qspinwidget.cpp b/src/widgets/qspinwidget.cpp
index 9c0b2cbbc..7ea124cc7 100644
--- a/src/widgets/qspinwidget.cpp
+++ b/src/widgets/qspinwidget.cpp
@@ -38,7 +38,7 @@
 
 #include "ntqrangecontrol.h"
 
-#ifndef QT_NO_SPINWIDGET
+#ifndef TQT_NO_SPINWIDGET
 
 #include "ntqrect.h"
 #include "ntqtimer.h"
@@ -292,7 +292,7 @@ void TQSpinWidget::mouseMoveEvent( TQMouseEvent *e )
 /*!
     The event is passed in \a e.
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQSpinWidget::wheelEvent( TQWheelEvent *e )
 {
     e->accept();
diff --git a/src/widgets/qsplashscreen.cpp b/src/widgets/qsplashscreen.cpp
index 3aec8a234..a62fe7458 100644
--- a/src/widgets/qsplashscreen.cpp
+++ b/src/widgets/qsplashscreen.cpp
@@ -38,7 +38,7 @@
 
 #include "ntqsplashscreen.h"
 
-#ifndef QT_NO_SPLASHSCREEN
+#ifndef TQT_NO_SPLASHSCREEN
 
 #include "ntqapplication.h"
 #include "ntqpainter.h"
@@ -268,4 +268,4 @@ void TQSplashScreen::drawContents( TQPainter *painter )
     painter->drawText( r, d->currAlign, d->currStatus );
 }
 
-#endif //QT_NO_SPLASHSCREEN
+#endif //TQT_NO_SPLASHSCREEN
diff --git a/src/widgets/qsplitter.cpp b/src/widgets/qsplitter.cpp
index f179a7aea..c94757620 100644
--- a/src/widgets/qsplitter.cpp
+++ b/src/widgets/qsplitter.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqsplitter.h"
-#ifndef QT_NO_SPLITTER
+#ifndef TQT_NO_SPLITTER
 
 #include "ntqlayout.h"
 #include "../kernel/qlayoutengine_p.h"
@@ -105,7 +105,7 @@ TQSize TQSplitterHandle::sizeHint() const
 void TQSplitterHandle::setOrientation( Orientation o )
 {
     orient = o;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     setCursor( o == TQSplitter::Horizontal ? splitHCursor : splitVCursor );
 #endif
 }
@@ -1271,7 +1271,7 @@ void TQSplitter::updateHandles()
     recalc( isVisible() );
 }
 
-#ifndef QT_NO_TEXTSTREAM
+#ifndef TQT_NO_TEXTSTREAM
 /*!
     \relates TQSplitter
 
diff --git a/src/widgets/qstatusbar.cpp b/src/widgets/qstatusbar.cpp
index 557d7ef71..d3d294d2e 100644
--- a/src/widgets/qstatusbar.cpp
+++ b/src/widgets/qstatusbar.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqstatusbar.h"
-#ifndef QT_NO_STATUSBAR
+#ifndef TQT_NO_STATUSBAR
 
 #include "ntqptrlist.h"
 #include "ntqlayout.h"
@@ -127,7 +127,7 @@ public:
     TQBoxLayout * box;
     TQTimer * timer;
 
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
     TQSizeGrip * resizer;
 #endif
 
@@ -149,7 +149,7 @@ TQStatusBar::TQStatusBar( TQWidget * parent, const char *name )
     d->box = 0;
     d->timer = 0;
 
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
     d->resizer = 0;
     setSizeGripEnabled(TRUE); // causes reformat()
 #else
@@ -260,7 +260,7 @@ void TQStatusBar::removeWidget( TQWidget* widget )
 
 bool TQStatusBar::isSizeGripEnabled() const
 {
-#ifdef QT_NO_SIZEGRIP
+#ifdef TQT_NO_SIZEGRIP
     return FALSE;
 #else
     return !!d->resizer;
@@ -269,7 +269,7 @@ bool TQStatusBar::isSizeGripEnabled() const
 
 void TQStatusBar::setSizeGripEnabled(bool enabled)
 {
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
     if ( !enabled != !d->resizer ) {
 	if ( enabled ) {
 	    d->resizer = new TQSizeGrip( this, "TQStatusBar::resizer" );
@@ -328,7 +328,7 @@ void TQStatusBar::reformat()
 	item = d->items.next();
     }
     l->addSpacing( 4 );
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
     if ( d->resizer ) {
 	maxH = TQMAX( maxH, d->resizer->sizeHint().height() );
 	d->box->addSpacing( 1 );
@@ -451,7 +451,7 @@ void TQStatusBar::paintEvent( TQPaintEvent * )
     TQPainter p( this );
     TQStatusBarPrivate::SBItem* item = d->items.first();
 
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
     int psx = ( d->resizer && d->resizer->isVisible() ) ? d->resizer->x() : width()-12;
 #else
     int psx = width() - 12;
@@ -502,7 +502,7 @@ bool TQStatusBar::event( TQEvent *e )
 	    item = d->items.next();
 	}
 
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
 	if ( d->resizer )
 	    maxH = TQMAX( maxH, d->resizer->sizeHint().height() );
 #endif
diff --git a/src/widgets/qsyntaxhighlighter.cpp b/src/widgets/qsyntaxhighlighter.cpp
index 6c97ac517..e33f0113c 100644
--- a/src/widgets/qsyntaxhighlighter.cpp
+++ b/src/widgets/qsyntaxhighlighter.cpp
@@ -41,7 +41,7 @@
 #include "ntqsyntaxhighlighter.h"
 #include "private/qsyntaxhighlighter_p.h"
 
-#ifndef QT_NO_SYNTAXHIGHLIGHTER
+#ifndef TQT_NO_SYNTAXHIGHLIGHTER
 #include "../kernel/qrichtext_p.h"
 #include "ntqtextedit.h"
 #include "ntqtimer.h"
diff --git a/src/widgets/qsyntaxhighlighter_p.h b/src/widgets/qsyntaxhighlighter_p.h
index 594a73e57..156cc9321 100644
--- a/src/widgets/qsyntaxhighlighter_p.h
+++ b/src/widgets/qsyntaxhighlighter_p.h
@@ -41,7 +41,7 @@
 #ifndef TQSYNTAXHIGHLIGHTER_P_H
 #define TQSYNTAXHIGHLIGHTER_P_H
 
-#ifndef QT_NO_SYNTAXHIGHLIGHTER
+#ifndef TQT_NO_SYNTAXHIGHLIGHTER
 #include "ntqsyntaxhighlighter.h"
 #include "private/qrichtext_p.h"
 
@@ -93,5 +93,5 @@ private:
     friend class TQTextEdit;
 };
 
-#endif // QT_NO_SYNTAXHIGHLIGHTER
+#endif // TQT_NO_SYNTAXHIGHLIGHTER
 #endif // TQSYNTAXHIGHLIGHTER_P_H
diff --git a/src/widgets/qtabbar.cpp b/src/widgets/qtabbar.cpp
index db08012c4..08e5f24f4 100644
--- a/src/widgets/qtabbar.cpp
+++ b/src/widgets/qtabbar.cpp
@@ -37,7 +37,7 @@
 **********************************************************************/
 
 #include "ntqtabbar.h"
-#ifndef QT_NO_TABBAR
+#ifndef TQT_NO_TABBAR
 #include "ntqaccel.h"
 #include "ntqbitmap.h"
 #include "ntqtoolbutton.h"
@@ -237,7 +237,7 @@ class TQTabBarToolTip;
 struct TQTabPrivate {
     int id;
     int focus;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQAccel * a;
 #endif
     TQTab *pressed;
@@ -249,7 +249,7 @@ struct TQTabPrivate {
     TQTabBarToolTip * toolTips;
 };
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 /* \internal
 */
 class TQTabBarToolTip : public TQToolTip
@@ -296,7 +296,7 @@ protected:
 	if ( tb->d->scrolls && (rectL.contains( p ) || rectR.contains( p )) )
 	     return;
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	// find and show the tool tip for the tab under the point p
 	TQMapIterator it;
 	for ( it = tabTips.begin(); it != tabTips.end(); ++it ) {
@@ -342,7 +342,7 @@ TQTabBar::TQTabBar( TQWidget * parent, const char *name )
     d->id = 0;
     d->focus = 0;
     d->toolTips = 0;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     d->a = new TQAccel( this, "tab accelerators" );
     connect( d->a, SIGNAL(activated(int)), this, SLOT(setCurrentTab(int)) );
     connect( d->a, SIGNAL(activatedAmbiguously(int)), this, SLOT(setCurrentTab(int)) );
@@ -370,7 +370,7 @@ TQTabBar::TQTabBar( TQWidget * parent, const char *name )
 
 TQTabBar::~TQTabBar()
 {
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     if ( d->toolTips )
 	delete d->toolTips;
 #endif
@@ -434,7 +434,7 @@ int TQTabBar::insertTab( TQTab * newTab, int index )
     updateArrowButtons();
     makeVisible( tab( currentTab() ) );
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     int p = TQAccel::shortcutKey( newTab->label );
     if ( p )
 	d->a->insertItem( p, newTab->id );
@@ -450,11 +450,11 @@ int TQTabBar::insertTab( TQTab * newTab, int index )
 void TQTabBar::removeTab( TQTab * t )
 {
     //#### accelerator labels??
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     if ( d->toolTips )
 	d->toolTips->remove( t );
 #endif
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     if ( d->a )
 	d->a->removeItem( t->id );
 #endif
@@ -492,7 +492,7 @@ void TQTabBar::setTabEnabled( int id, bool enabled )
 	if ( t && t->id == id ) {
 	    if ( t->enabled != enabled ) {
 		t->enabled = enabled;
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 		d->a->setItemEnabled( t->id, enabled );
 #endif
 		TQRect r( t->r );
@@ -1334,7 +1334,7 @@ void TQTabBar::updateArrowButtons()
 */
 void TQTabBar::removeToolTip( int index )
 {
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQTab * tab = tabAt( index );
     if ( !tab || !d->toolTips )
 	return;
@@ -1348,7 +1348,7 @@ void TQTabBar::removeToolTip( int index )
 */
 void TQTabBar::setToolTip( int index, const TQString & tip )
 {
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     TQTab * tab = tabAt( index );
     if ( !tab )
 	return;
@@ -1363,7 +1363,7 @@ void TQTabBar::setToolTip( int index, const TQString & tip )
 */
 TQString TQTabBar::toolTip( int index ) const
 {
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     if ( d->toolTips )
 	return d->toolTips->tipForTab( tabAt( index ) );
     else
@@ -1378,7 +1378,7 @@ void TQTab::setText( const TQString& text )
 {
     label = text;
     if ( tb ) {
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 	tb->d->a->removeItem( id );
 	int p = TQAccel::shortcutKey( text );
 	if ( p )
diff --git a/src/widgets/qtabwidget.cpp b/src/widgets/qtabwidget.cpp
index 43c9c76df..214368814 100644
--- a/src/widgets/qtabwidget.cpp
+++ b/src/widgets/qtabwidget.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqtabwidget.h"
-#ifndef QT_NO_TABWIDGET
+#ifndef TQT_NO_TABWIDGET
 #include "ntqobjectlist.h"
 #include "ntqtabbar.h"
 #include "ntqapplication.h"
diff --git a/src/widgets/qtextbrowser.cpp b/src/widgets/qtextbrowser.cpp
index 3449fada9..0cc40aa64 100644
--- a/src/widgets/qtextbrowser.cpp
+++ b/src/widgets/qtextbrowser.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqtextbrowser.h"
-#ifndef QT_NO_TEXTBROWSER
+#ifndef TQT_NO_TEXTBROWSER
 #include "../kernel/qrichtext_p.h"
 
 #include "ntqapplication.h"
@@ -227,7 +227,7 @@ void TQTextBrowser::reload()
 
 void TQTextBrowser::setSource(const TQString& name)
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( isVisible() )
 	tqApp->setOverrideCursor( waitCursor );
 #endif
@@ -262,7 +262,7 @@ void TQTextBrowser::setSource(const TQString& name)
 	    TQString firstTag = txt.left( txt.find( '>' ) + 1 );
 	    if ( firstTag.left( 3 ) == "restoreOverrideCursor();
 #endif
 		return;
@@ -302,7 +302,7 @@ void TQTextBrowser::setSource(const TQString& name)
     else
 	setContentsPos( 0, 0 );
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( isVisible() )
 	tqApp->restoreOverrideCursor();
 #endif
@@ -552,4 +552,4 @@ void TQTextBrowser::emitLinkClicked( const TQString &s )
 	setSource( s );
 }
 
-#endif  // QT_NO_TEXTBROWSER
+#endif  // TQT_NO_TEXTBROWSER
diff --git a/src/widgets/qtextedit.cpp b/src/widgets/qtextedit.cpp
index 67703f342..598093fbc 100644
--- a/src/widgets/qtextedit.cpp
+++ b/src/widgets/qtextedit.cpp
@@ -40,10 +40,10 @@
 
 #include "ntqtextedit.h"
 
-#ifndef QT_NO_TEXTEDIT
+#ifndef TQT_NO_TEXTEDIT
 
 // Keep this position to avoid patch rejection
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 #include "ntqinputcontext.h"
 #endif
 
@@ -78,7 +78,7 @@
 #include "private/qsyntaxhighlighter_p.h"
 #include 
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 #include 
 #define ACCEL_KEY(k) "\t" + TQString(TQKeySequence( TQt::CTRL | TQt::Key_ ## k ))
 #else
@@ -100,7 +100,7 @@ public:
     TQTextEditPrivate()
 	:preeditStart(-1),preeditLength(-1),ensureCursorVisibleInShowEvent(FALSE),
 	 tabChangesFocus(FALSE),
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 	 clipboard_mode( TQClipboard::Clipboard ),
 #endif
 #ifdef QT_TEXTEDIT_OPTIMIZATION
@@ -123,7 +123,7 @@ public:
     TQString scrollToAnchor; // used to deferr scrollToAnchor() until the show event when we are resized
     TQString pressedName;
     TQString onName;
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     TQClipboard::Mode clipboard_mode;
 #endif
     TQTimer *trippleClickTimer;
@@ -137,7 +137,7 @@ public:
     uint autoFormatting;
 };
 
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 class TQRichTextDrag : public TQTextDrag
 {
 public:
@@ -983,7 +983,7 @@ void TQTextEdit::init()
 
     setKeyCompression( TRUE );
     viewport()->setMouseTracking( TRUE );
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
     cursor = new TQTextCursor( doc );
@@ -1007,7 +1007,7 @@ void TQTextEdit::init()
     connect( blinkTimer, SIGNAL( timeout() ),
 	     this, SLOT( blinkCursor() ) );
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     dragStartTimer = new TQTimer( this );
     connect( dragStartTimer, SIGNAL( timeout() ),
 	     this, SLOT( startDrag() ) );
@@ -1287,7 +1287,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
 	    // Ctrl-Enter inserts a line break in rich text mode
 	    insert( TQString( TQChar( 0x2028) ), TRUE, FALSE );
 	} else {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 	    clearUndoRedoInfo = FALSE;
@@ -1573,7 +1573,7 @@ void TQTextEdit::keyPressEvent( TQKeyEvent *e )
  */
 bool TQTextEdit::sendMouseEventToInputContext( TQMouseEvent *e )
 {
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     if ( d->composeMode() ) {
 	TQTextCursor c( doc );
 	if ( c.place( e->pos(), doc->firstParagraph(), FALSE, FALSE, FALSE ) ) {
@@ -1843,7 +1843,7 @@ void TQTextEdit::doKeyboardAction( KeyboardAction action )
 
 void TQTextEdit::readFormats( TQTextCursor &c1, TQTextCursor &c2, TQTextString &text, bool fillStyles )
 {
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
     TQDataStream styleStream( undoRedoInfo.styleInformation, IO_WriteOnly );
 #endif
     c2.restoreState();
@@ -1852,7 +1852,7 @@ void TQTextEdit::readFormats( TQTextCursor &c1, TQTextCursor &c2, TQTextString &
     if ( c1.paragraph() == c2.paragraph() ) {
 	for ( int i = c1.index(); i < c2.index(); ++i )
 	    text.insert( lastIndex + i - c1.index(), c1.paragraph()->at( i ), TRUE );
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 	if ( fillStyles ) {
 	    styleStream << (int) 1;
 	    c1.paragraph()->writeStyleInformation( styleStream );
@@ -1872,7 +1872,7 @@ void TQTextEdit::readFormats( TQTextCursor &c1, TQTextCursor &c2, TQTextString &
 
 	for ( i = 0; i < c2.index(); ++i )
 	    text.insert( i + lastIndex, c2.paragraph()->at( i ), TRUE );
-#ifndef QT_NO_DATASTREAM
+#ifndef TQT_NO_DATASTREAM
 	if ( fillStyles ) {
 	    styleStream << num;
 	    for ( TQTextParagraph *p = c1.paragraph(); --num >= 0; p = p->next() )
@@ -1948,7 +1948,7 @@ void TQTextEdit::removeSelectedText( int selNum )
 	if ( contentsHeight() < visibleHeight() )
 	    viewport()->repaint( 0, contentsHeight(), visibleWidth(), visibleHeight() - contentsHeight(), TRUE );
 #endif
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 	updateMicroFocusHint();
@@ -2036,7 +2036,7 @@ void TQTextEdit::moveCursor( CursorAction action, bool select )
 	    repaintChanged();
 	    ensureCursorVisible();
 	    drawCursor( TRUE );
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 	}
@@ -2232,7 +2232,7 @@ enum {
 /*!
     \reimp
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQTextEdit::contentsWheelEvent( TQWheelEvent *e )
 {
     if ( isReadOnly() ) {
@@ -2303,7 +2303,7 @@ void TQTextEdit::contentsMousePressEvent( TQMouseEvent *e )
 	    }
 	}
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 	if ( doc->inSelection( TQTextDocument::Standard, e->pos() ) ) {
 	    mightStartDrag = TRUE;
 	    drawCursor( TRUE );
@@ -2337,7 +2337,7 @@ void TQTextEdit::contentsMousePressEvent( TQMouseEvent *e )
 	    drawCursor( TRUE );
 	} else {
 	    repaintChanged();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 	}
@@ -2347,7 +2347,7 @@ void TQTextEdit::contentsMousePressEvent( TQMouseEvent *e )
 	    drawCursor( TRUE );
 	} else {
 	    repaintChanged();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 	}
@@ -2372,7 +2372,7 @@ void TQTextEdit::contentsMouseMoveEvent( TQMouseEvent *e )
     if ( sendMouseEventToInputContext( e ) ) {
 	// don't return from here to avoid cursor vanishing
     } else if ( mousePressed ) {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 	if ( mightStartDrag ) {
 	    dragStartTimer->stop();
 	    if ( ( e->pos() - dragStartPos ).manhattanLength() > TQApplication::startDragDistance() ) {
@@ -2381,7 +2381,7 @@ void TQTextEdit::contentsMouseMoveEvent( TQMouseEvent *e )
 		if (guard.isNull()) // we got deleted during the dnd
                     return;
 	    }
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    if ( !isReadOnly() )
 		viewport()->setCursor( ibeamCursor );
 #endif
@@ -2393,7 +2393,7 @@ void TQTextEdit::contentsMouseMoveEvent( TQMouseEvent *e )
 	oldMousePos = mousePos;
     }
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( !isReadOnly() && !mousePressed ) {
 	if ( doc->hasSelection( TQTextDocument::Standard ) && doc->inSelection( TQTextDocument::Standard, e->pos() ) )
 	    viewport()->setCursor( arrowCursor );
@@ -2406,7 +2406,7 @@ void TQTextEdit::contentsMouseMoveEvent( TQMouseEvent *e )
 
 void TQTextEdit::copyToClipboard()
 {
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     if (TQApplication::clipboard()->supportsSelection()) {
 	d->clipboard_mode = TQClipboard::Selection;
 
@@ -2444,7 +2444,7 @@ void TQTextEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
     TQTextCursor oldCursor = *cursor;
     if ( scrollTimer->isActive() )
 	scrollTimer->stop();
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( dragStartTimer->isActive() )
 	dragStartTimer->stop();
     if ( mightStartDrag ) {
@@ -2457,7 +2457,7 @@ void TQTextEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
 	mousePressed = FALSE;
 	copyToClipboard();
     }
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     else if ( e->button() == MidButton && !isReadOnly() ) {
         // only do middle-click pasting on systems that have selections (ie. X11)
         if (TQApplication::clipboard()->supportsSelection()) {
@@ -2479,7 +2479,7 @@ void TQTextEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
                 drawCursor( TRUE );
             } else {
                 repaintChanged();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
                 viewport()->setCursor( ibeamCursor );
 #endif
             }
@@ -2495,7 +2495,7 @@ void TQTextEdit::contentsMouseReleaseEvent( TQMouseEvent * e )
 	updateCurrentFormat();
     inDoubleClick = FALSE;
 
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
     if ( (   (!onLink.isEmpty() && onLink == pressedLink)
 	  || (!d->onName.isEmpty() && d->onName == d->pressedName))
 	 && linksEnabled() && mouseWasPressed ) {
@@ -2612,7 +2612,7 @@ void TQTextEdit::contentsMouseDoubleClickEvent( TQMouseEvent * e )
     emit doubleClicked( para, index );
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 /*!
     \reimp
@@ -2707,7 +2707,7 @@ void TQTextEdit::contentsDropEvent( TQDropEvent *e )
 	    doc->removeSelection( TQTextDocument::Standard );
 	} else {
 	    doc->removeSelection( TQTextDocument::Standard );
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 	}
@@ -2721,7 +2721,7 @@ void TQTextEdit::contentsDropEvent( TQDropEvent *e )
 		if ( e->provides( "application/x-qrichtext" ) )
 		    subType = "x-qrichtext";
 	    }
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 	    pasteSubType( subType.latin1(), e );
 #endif
 	    // emit appropriate signals.
@@ -2744,7 +2744,7 @@ void TQTextEdit::contentsDropEvent( TQDropEvent *e )
 void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e )
 {
     e->accept();
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     if ( d->composeMode() )
 	return;
 #endif
@@ -2752,7 +2752,7 @@ void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e )
     clearUndoRedo();
     mousePressed = FALSE;
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     TQGuardedPtr that = this;
     TQGuardedPtr popup = createPopupMenu( e->pos() );
     if ( !popup )
@@ -2769,7 +2769,7 @@ void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e )
 	clear();
     else if ( r == d->id[ IdSelectAll ] ) {
 	selectAll();
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
         // if the clipboard support selections, put the newly selected text into
         // the clipboard
 	if (TQApplication::clipboard()->supportsSelection()) {
@@ -2789,7 +2789,7 @@ void TQTextEdit::contentsContextMenuEvent( TQContextMenuEvent *e )
 	undo();
     else if ( r == d->id[ IdRedo ] )
 	redo();
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     else if ( r == d->id[ IdCut ] )
 	cut();
     else if ( r == d->id[ IdCopy ] )
@@ -3287,7 +3287,7 @@ void TQTextEdit::undo()
     for ( int i = 0; i < (int)doc->numSelections(); ++i )
 	doc->removeSelection( i );
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 
@@ -3338,7 +3338,7 @@ void TQTextEdit::redo()
     for ( int i = 0; i < (int)doc->numSelections(); ++i )
 	doc->removeSelection( i );
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 
@@ -3372,7 +3372,7 @@ void TQTextEdit::redo()
 
 void TQTextEdit::paste()
 {
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
     if ( isReadOnly() )
 	return;
     TQString subType = "plain";
@@ -3420,7 +3420,7 @@ void TQTextEdit::repaintChanged()
     paintDocument( FALSE, &p, contentsX(), contentsY(), visibleWidth(), visibleHeight() );
 }
 
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 TQTextDrag *TQTextEdit::dragObject( TQWidget *parent ) const
 {
     if ( !doc->hasSelection( TQTextDocument::Standard ) ||
@@ -3456,14 +3456,14 @@ void TQTextEdit::cut()
 
 void TQTextEdit::normalCopy()
 {
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     TQTextDrag *drag = dragObject();
     if ( !drag )
 	return;
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
     TQApplication::clipboard()->setData( drag, d->clipboard_mode );
-#endif // QT_NO_MIMECLIPBOARD
-#endif // QT_NO_MIME
+#endif // TQT_NO_MIMECLIPBOARD
+#endif // TQT_NO_MIME
 }
 
 /*!
@@ -3474,7 +3474,7 @@ void TQTextEdit::normalCopy()
 
 void TQTextEdit::copy()
 {
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 # ifdef QT_TEXTEDIT_OPTIMIZATION
     if ( d->optimMode && optimHasSelection() )
 	TQApplication::clipboard()->setText( optimSelectedText(), d->clipboard_mode );
@@ -4051,7 +4051,7 @@ bool TQTextEdit::find( const TQString &expr, bool cs, bool wo, bool forward,
 	return optimFind( expr, cs, wo, forward, para, index );
 #endif
     drawCursor( FALSE );
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
     TQTextCursor findcur = *cursor;
@@ -4524,7 +4524,7 @@ int TQTextEdit::alignment() const
 
 void TQTextEdit::startDrag()
 {
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     mousePressed = FALSE;
     inDoubleClick = FALSE;
     TQDragObject *drag = dragObject( viewport() );
@@ -4565,7 +4565,7 @@ void TQTextEdit::selectAll( bool select )
     repaintChanged();
     emit copyAvailable( doc->hasSelection( TQTextDocument::Standard ) );
     emit selectionChanged();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 }
@@ -4730,7 +4730,7 @@ bool TQTextEdit::linkUnderline() const
     \sa mimeSourceFactory()
  */
 
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 void TQTextEdit::setMimeSourceFactory( TQMimeSourceFactory* factory )
 {
     doc->setMimeSourceFactory( factory );
@@ -4896,7 +4896,7 @@ bool TQTextEdit::handleReadOnlyKeyEvent( TQKeyEvent *e )
     case Key_F16: // Copy key on Sun keyboards
 	copy();
 	break;
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
     case Key_Return:
     case Key_Enter:
     case Key_Space: {
@@ -4920,7 +4920,7 @@ bool TQTextEdit::handleReadOnlyKeyEvent( TQKeyEvent *e )
 		    }
 		}
 	    }
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 	}
@@ -5083,7 +5083,7 @@ void TQTextEdit::setDocument( TQTextDocument *dc )
     lastFormatted = 0;
 }
 
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
 
 /*!
     Pastes the text with format \a subtype from the clipboard into the
@@ -5098,7 +5098,7 @@ void TQTextEdit::setDocument( TQTextDocument *dc )
 
 void TQTextEdit::pasteSubType( const TQCString &subtype )
 {
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
     TQMimeSource *m = TQApplication::clipboard()->data( d->clipboard_mode );
     pasteSubType( subtype, m );
 #endif
@@ -5108,7 +5108,7 @@ void TQTextEdit::pasteSubType( const TQCString &subtype )
 
 void TQTextEdit::pasteSubType( const TQCString& subtype, TQMimeSource *m )
 {
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
     TQCString st = subtype;
     if ( subtype != "x-qrichtext" )
 	st.prepend( "text/" );
@@ -5213,10 +5213,10 @@ void TQTextEdit::pasteSubType( const TQCString& subtype, TQMimeSource *m )
 	if ( !t.isEmpty() )
 	    insert( t, FALSE, TRUE );
     }
-#endif //QT_NO_MIME
+#endif //TQT_NO_MIME
 }
 
-#ifndef QT_NO_MIMECLIPBOARD
+#ifndef TQT_NO_MIMECLIPBOARD
 /*!
     Prompts the user to choose a type from a list of text types
     available, then copies text from the clipboard (if there is any)
@@ -5231,11 +5231,11 @@ void TQTextEdit::pasteSpecial( const TQPoint& pt )
 	pasteSubType( st );
 }
 #endif
-#ifndef QT_NO_MIME
+#ifndef TQT_NO_MIME
 TQCString TQTextEdit::pickSpecial( TQMimeSource* ms, bool always_ask, const TQPoint& pt )
 {
     if ( ms )  {
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 	TQPopupMenu popup( this, "qt_pickspecial_menu" );
 	TQString fmt;
 	int n = 0;
@@ -5273,8 +5273,8 @@ TQCString TQTextEdit::pickSpecial( TQMimeSource* ms, bool always_ask, const TQPo
     }
     return TQCString();
 }
-#endif // QT_NO_MIME
-#endif // QT_NO_CLIPBOARD
+#endif // TQT_NO_MIME
+#endif // TQT_NO_CLIPBOARD
 
 /*!
     \enum TQTextEdit::WordWrap
@@ -5641,14 +5641,14 @@ bool TQTextEdit::getParagraphFormat( int para, TQFont *font, TQColor *color,
 TQPopupMenu *TQTextEdit::createPopupMenu( const TQPoint& pos )
 {
     Q_UNUSED( pos )
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     TQPopupMenu *popup = new TQPopupMenu( this, "qt_edit_menu" );
     if ( !isReadOnly() ) {
 	d->id[ IdUndo ] = popup->insertItem( tr( "&Undo" ) + ACCEL_KEY( Z ) );
 	d->id[ IdRedo ] = popup->insertItem( tr( "&Redo" ) + ACCEL_KEY( Y ) );
 	popup->insertSeparator();
     }
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     if ( !isReadOnly() )
 	d->id[ IdCut ] = popup->insertItem( tr( "Cu&t" ) + ACCEL_KEY( X ) );
     d->id[ IdCopy ] = popup->insertItem( tr( "&Copy" ) + ACCEL_KEY( C ) );
@@ -5665,7 +5665,7 @@ TQPopupMenu *TQTextEdit::createPopupMenu( const TQPoint& pos )
     d->id[ IdSelectAll ] = popup->insertItem( tr( "Select All" ) + ACCEL_KEY( A ) );
 #endif
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     TQInputContext *qic = getInputContext();
     if ( qic )
 	qic->addMenusTo( popup );
@@ -5673,7 +5673,7 @@ TQPopupMenu *TQTextEdit::createPopupMenu( const TQPoint& pos )
     
     popup->setItemEnabled( d->id[ IdUndo ], !isReadOnly() && doc->commands()->isUndoAvailable() );
     popup->setItemEnabled( d->id[ IdRedo ], !isReadOnly() && doc->commands()->isRedoAvailable() );
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     popup->setItemEnabled( d->id[ IdCut ], !isReadOnly() && doc->hasSelection( TQTextDocument::Standard, TRUE ) );
 #ifdef QT_TEXTEDIT_OPTIMIZATION
     popup->setItemEnabled( d->id[ IdCopy ], d->optimMode ? optimHasSelection() : doc->hasSelection( TQTextDocument::Standard, TRUE ) );
@@ -5897,7 +5897,7 @@ void TQTextEdit::setReadOnly( bool b )
     if ( (bool) readonly == b )
 	return;
     readonly = b;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( readonly )
 	viewport()->setCursor( arrowCursor );
     else
@@ -6085,7 +6085,7 @@ void TQTextEdit::updateCursor( const TQPoint & pos )
 	TQTextCursor c = *cursor;
 	placeCursor( pos, &c, TRUE );
 
-#ifndef QT_NO_NETWORKPROTOCOL
+#ifndef TQT_NO_NETWORKPROTOCOL
 	bool insideParagRect = TRUE;
 	if (c.paragraph() == doc->lastParagraph()
 	    && c.paragraph()->rect().y() + c.paragraph()->rect().height() < pos.y())
@@ -6105,14 +6105,14 @@ void TQTextEdit::updateCursor( const TQPoint & pos )
 		d->onName = TQString::null;
 
 	    if (!c.paragraph()->at( c.index() )->anchorHref().isEmpty() ) {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 		viewport()->setCursor( onLink.isEmpty() ? arrowCursor : pointingHandCursor );
 #endif
 		TQUrl u( doc->context(), onLink, TRUE );
 		emitHighlighted( u.toString( FALSE, FALSE ) );
 	    }
 	} else {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor );
 #endif
 	    onLink = TQString::null;
@@ -6137,7 +6137,7 @@ void TQTextEdit::placeCursor( const TQPoint &pos, TQTextCursor *c )
 /*! \internal */
 void TQTextEdit::clipboardChanged()
 {
-#ifndef QT_NO_CLIPBOARD
+#ifndef TQT_NO_CLIPBOARD
     // don't listen to selection changes
     disconnect( TQApplication::clipboard(), SIGNAL(selectionChanged()), this, 0);
 #endif
@@ -7474,4 +7474,4 @@ TQSyntaxHighlighter * TQTextEdit::syntaxHighlighter() const
 	return 0;
 }
 
-#endif //QT_NO_TEXTEDIT
+#endif //TQT_NO_TEXTEDIT
diff --git a/src/widgets/qtextview.cpp b/src/widgets/qtextview.cpp
index 475236dc8..b672bee3d 100644
--- a/src/widgets/qtextview.cpp
+++ b/src/widgets/qtextview.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqtextview.h"
 
-#ifndef QT_NO_TEXTVIEW
+#ifndef TQT_NO_TEXTVIEW
 
 /*! \class TQTextView
     \brief The TQTextView class provides a rich-text viewer.
diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/qtitlebar.cpp
index 8fc3ca468..d06e3dab5 100644
--- a/src/widgets/qtitlebar.cpp
+++ b/src/widgets/qtitlebar.cpp
@@ -42,7 +42,7 @@
 
 #include "qtitlebar_p.h"
 
-#ifndef QT_NO_TITLEBAR
+#ifndef TQT_NO_TITLEBAR
 
 #include 
 #include "ntqapplication.h"
@@ -55,14 +55,14 @@
 #include "ntqpainter.h"
 #include "ntqstyle.h"
 #include "private/qinternal_p.h"
-#ifndef QT_NO_WORKSPACE
+#ifndef TQT_NO_WORKSPACE
 #include "ntqworkspace.h"
 #endif
 #if defined(Q_WS_WIN)
 #include "qt_windows.h"
 #endif
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 class TQTitleBarTip : public TQToolTip
 {
 public:
@@ -120,7 +120,7 @@ public:
 		break;
 	    }
 	}
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	if ( tipstring.isEmpty() ) {
 	    if ( t->visibleText() != t->caption() )
 		tipstring = t->caption();
@@ -149,7 +149,7 @@ public:
     bool pressed            :1;
     bool autoraise          :1;
     TQString cuttext;
-#ifdef QT_NO_WIDGET_TOPEXTRA
+#ifdef TQT_NO_WIDGET_TOPEXTRA
     TQString cap;
 #endif
 };
@@ -159,7 +159,7 @@ TQTitleBar::TQTitleBar(TQWidget* w, TQWidget* parent, const char* name)
 {
     d = new TQTitleBarPrivate();
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     d->toolTip = new TQTitleBarTip( this );
 #endif
     d->window = w;
@@ -169,7 +169,7 @@ TQTitleBar::TQTitleBar(TQWidget* w, TQWidget* parent, const char* name)
 	setWFlags( ((TQTitleBar*)w)->getWFlags() | WNoAutoErase );
 	if ( w->minimumSize() == w->maximumSize() )
 	    clearWFlags( WStyle_Maximize );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     	setCaption( w->caption() );
 #endif
     } else {
@@ -183,7 +183,7 @@ TQTitleBar::TQTitleBar(TQWidget* w, TQWidget* parent, const char* name)
 
 TQTitleBar::~TQTitleBar()
 {
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     delete d->toolTip;
 #endif
 
@@ -402,7 +402,7 @@ void TQTitleBar::mouseMoveEvent( TQMouseEvent * e)
 	if ( d->buttonDown == TQStyle::SC_TitleBarLabel && d->movable && d->pressed ) {
 	    if ( (d->moveOffset - mapToParent( e->pos() ) ).manhattanLength() >= 4 ) {
 		TQPoint p = mapFromGlobal(e->globalPos());
-#ifndef QT_NO_WORKSPACE
+#ifndef TQT_NO_WORKSPACE
 		if(d->window && d->window->parentWidget()->inherits("TQWorkspaceChild")) {
 		    TQWorkspace *workspace = ::tqt_cast(d->window->parentWidget()->parentWidget());
 		    if(workspace) {
@@ -505,7 +505,7 @@ void TQTitleBar::mouseDoubleClickEvent( TQMouseEvent *e )
     }
 }
 
-#ifdef QT_NO_WIDGET_TOPEXTRA
+#ifdef TQT_NO_WIDGET_TOPEXTRA
 // We provide one, since titlebar is useless otherwise.
 TQString TQTitleBar::caption() const
 {
@@ -537,7 +537,7 @@ void TQTitleBar::setCaption( const TQString& title )
 {
     if( caption() == title)
 	return;
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     TQWidget::setCaption( title );
 #else
     d->cap = title;
@@ -550,8 +550,8 @@ void TQTitleBar::setCaption( const TQString& title )
 
 void TQTitleBar::setIcon( const TQPixmap& icon )
 {
-#ifndef QT_NO_WIDGET_TOPEXTRA
-#ifndef QT_NO_IMAGE_SMOOTHSCALE
+#ifndef TQT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_IMAGE_SMOOTHSCALE
     TQRect menur = style().querySubControlMetrics(TQStyle::CC_TitleBar, this,
 						  TQStyle::SC_TitleBarSysMenu);
 
@@ -668,4 +668,4 @@ TQSize TQTitleBar::sizeHint() const
     return TQSize( menur.width(), style().pixelMetric( TQStyle::PM_TitleBarHeight, this ) );
 }
 
-#endif //QT_NO_TITLEBAR
+#endif //TQT_NO_TITLEBAR
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index 2317b8da6..d45ec0717 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -60,7 +60,7 @@
 #include "ntqlabel.h"
 #endif // QT_H
 
-#if !defined(QT_NO_TITLEBAR)
+#if !defined(TQT_NO_TITLEBAR)
 
 class TQToolTip;
 class TQTitleBarPrivate;
@@ -90,7 +90,7 @@ public:
 
     TQSize sizeHint() const;
 
-#ifdef QT_NO_WIDGET_TOPEXTRA
+#ifdef TQT_NO_WIDGET_TOPEXTRA
     // We provide one, since titlebar is useless otherwise.
     TQString caption() const;
 #endif
diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp
index 518d81c4a..79b13a80b 100644
--- a/src/widgets/qtoolbar.cpp
+++ b/src/widgets/qtoolbar.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqtoolbar.h"
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
 
 #include "ntqmainwindow.h"
 #include "ntqtooltip.h"
@@ -631,7 +631,7 @@ void TQToolBar::createPopup()
 	    continue;
 	}
 	TQWidget *w = (TQWidget*)it.current();
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 	if ( ::tqt_cast(w) )
 	    j = 1;
 #endif
@@ -672,11 +672,11 @@ void TQToolBar::createPopup()
 		    d->extensionPopup->setItemChecked( id, b->isOn() );
 		if ( !b->isEnabled() )
 		    d->extensionPopup->setItemEnabled( id, FALSE );
-#ifndef QT_NO_COMBOBOX
+#ifndef TQT_NO_COMBOBOX
 	    } else if ( ::tqt_cast(w) ) {
 		TQComboBox *c = (TQComboBox*)w;
 		if ( c->count() != 0 ) {
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 		    TQString s = c->caption();
 #else
 		    TQString s;
@@ -706,7 +706,7 @@ void TQToolBar::createPopup()
 			}
 		    }
 		}
-#endif //QT_NO_COMBOBOX
+#endif //TQT_NO_COMBOBOX
 	    }
 	}
         ++it;
diff --git a/src/widgets/qtoolbox.cpp b/src/widgets/qtoolbox.cpp
index d1c30012c..40bfb6de4 100644
--- a/src/widgets/qtoolbox.cpp
+++ b/src/widgets/qtoolbox.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqtoolbox.h"
 
-#ifndef QT_NO_TOOLBOX
+#ifndef TQT_NO_TOOLBOX
 
 #include 
 #include 
@@ -690,4 +690,4 @@ void TQToolBox::itemRemoved( int index )
     Q_UNUSED(index)
 }
 
-#endif //QT_NO_TOOLBOX
+#endif //TQT_NO_TOOLBOX
diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp
index aa4ae4c1f..74f3f4ade 100644
--- a/src/widgets/qtoolbutton.cpp
+++ b/src/widgets/qtoolbutton.cpp
@@ -40,7 +40,7 @@
 
 #undef TQT_NO_COMPAT
 #include "ntqtoolbutton.h"
-#ifndef QT_NO_TOOLBUTTON
+#ifndef TQT_NO_TOOLBUTTON
 
 #include "ntqdrawutil.h"
 #include "ntqpainter.h"
@@ -61,7 +61,7 @@ class TQToolButtonPrivate
 {
     // ### add tool tip magic here
 public:
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     TQGuardedPtr popup;
     TQTimer* popupTimer;
     int delay;
@@ -143,7 +143,7 @@ TQToolButton::TQToolButton( TQWidget * parent, const char *name )
     : TQButton( parent, name )
 {
     init();
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     TQToolBar* tb = ::tqt_cast(parent);
     if ( tb ) {
 	setAutoRaise( TRUE );
@@ -192,7 +192,7 @@ void TQToolButton::init()
 {
     d = new TQToolButtonPrivate;
     d->textPos = Under;
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     d->delay = 600;
     d->popup = 0;
     d->popupTimer = 0;
@@ -215,7 +215,7 @@ void TQToolButton::init()
     setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum ) );
 }
 
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
 
 /*!
     Constructs a tool button called \a name, that is a child of \a
@@ -249,7 +249,7 @@ TQToolButton::TQToolButton( const TQIconSet& iconSet, const TQString &textLabel,
     } else {
 	setUsesBigPixmap( FALSE );
     }
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     if ( !textLabel.isEmpty() ) {
 	if ( !grouptext.isEmpty() && parent->mainWindow() )
 	    TQToolTip::add( this, textLabel,
@@ -271,7 +271,7 @@ TQToolButton::TQToolButton( const TQIconSet& iconSet, const TQString &textLabel,
 
 TQToolButton::~TQToolButton()
 {
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     d->popupTimer = 0;
     d->popup = 0;
 #endif
@@ -352,7 +352,7 @@ TQSize TQToolButton::sizeHint() const
 	}
     }
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     if ( popup() && ! popupDelay() )
      	w += style().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
 #endif
@@ -467,7 +467,7 @@ void TQToolButton::drawButton( TQPainter * p )
     if (isDown())
 	active |= TQStyle::SC_ToolButton;
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     if (d->popup && !d->delay) {
 	controls |= TQStyle::SC_ToolButtonMenu;
 	if (d->instantPopup || isDown())
@@ -585,7 +585,7 @@ void TQToolButton::mousePressEvent( TQMouseEvent *e )
 				       TQStyle::SC_ToolButtonMenu), this );
     d->instantPopup = (popupr.isValid() && popupr.contains(e->pos()));
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     if ( d->discardNextMouseEvent ) {
 	d->discardNextMouseEvent = FALSE;
 	d->instantPopup = FALSE;
@@ -607,7 +607,7 @@ void TQToolButton::mousePressEvent( TQMouseEvent *e )
 */
 bool TQToolButton::eventFilter( TQObject *o, TQEvent *e )
 {
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
     if ( o != d->popup )
 	return TQButton::eventFilter( o, e );
     switch ( e->type() ) {
@@ -638,7 +638,7 @@ bool TQToolButton::uses3D() const
 {
     return style().styleHint(TQStyle::SH_ToolButton_Uses3D)
 	&& (!autoRaise() || ( hasMouse() && isEnabled() )
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 	    || ( d->popup && d->popup->isVisible() && d->delay <= 0 ) || d->instantPopup
 #endif
 	    );
@@ -670,7 +670,7 @@ void TQToolButton::setTextLabel( const TQString &newLabel , bool tipToo )
     if ( tl == newLabel )
 	return;
 
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
     if ( tipToo ) {
         TQToolTip::remove( this );
         TQToolTip::add( this, newLabel );
@@ -836,7 +836,7 @@ TQIconSet TQToolButton::iconSet( bool /* on */ ) const
 
 #endif
 
-#ifndef QT_NO_POPUPMENU
+#ifndef TQT_NO_POPUPMENU
 /*!
     Associates the popup menu \a popup with this tool button.
 
@@ -911,7 +911,7 @@ void TQToolButton::popupTimerDone()
     d->repeat = autoRepeat();
     setAutoRepeat( FALSE );
     bool horizontal = TRUE;
-#ifndef QT_NO_TOOLBAR
+#ifndef TQT_NO_TOOLBAR
     TQToolBar *tb = ::tqt_cast(parentWidget());
     if ( tb && tb->orientation() == Vertical )
 	horizontal = FALSE;
@@ -1029,7 +1029,7 @@ void TQToolButton::setText( const TQString &txt )
     }
 }
 
-#ifndef QT_NO_PALETTE
+#ifndef TQT_NO_PALETTE
 /*!
     \reimp
 */
diff --git a/src/widgets/qtooltip.cpp b/src/widgets/qtooltip.cpp
index 93091437f..5d3cae194 100644
--- a/src/widgets/qtooltip.cpp
+++ b/src/widgets/qtooltip.cpp
@@ -37,7 +37,7 @@
 **********************************************************************/
 
 #include "ntqtooltip.h"
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 #include "ntqlabel.h"
 #include "ntqptrdict.h"
 #include "ntqapplication.h"
@@ -570,7 +570,7 @@ void TQTipManager::showTip()
     if ( label->text().length() ) {
 	label->move( p );
 
-#ifndef QT_NO_EFFECTS
+#ifndef TQT_NO_EFFECTS
 	if ( TQApplication::isEffectEnabled( UI_AnimateTooltip ) == FALSE ||
 	     previousTip || preventAnimation )
 	    label->show();
diff --git a/src/widgets/qvalidator.cpp b/src/widgets/qvalidator.cpp
index 20c86bfc3..c23972549 100644
--- a/src/widgets/qvalidator.cpp
+++ b/src/widgets/qvalidator.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqvalidator.h"
-#ifndef QT_NO_VALIDATOR
+#ifndef TQT_NO_VALIDATOR
 
 #include 
 #include 
@@ -346,7 +346,7 @@ void TQIntValidator::setTop( int top )
 }
 
 
-#ifndef QT_NO_REGEXP
+#ifndef TQT_NO_REGEXP
 
 /*!
     \class TQDoubleValidator
diff --git a/src/widgets/qvbox.cpp b/src/widgets/qvbox.cpp
index 975c2416a..8236c1a4f 100644
--- a/src/widgets/qvbox.cpp
+++ b/src/widgets/qvbox.cpp
@@ -40,7 +40,7 @@
 
 
 #include "ntqvbox.h"
-#ifndef QT_NO_VBOX
+#ifndef TQT_NO_VBOX
 
 /*!
     \class TQVBox ntqvbox.h
diff --git a/src/widgets/qvbuttongroup.cpp b/src/widgets/qvbuttongroup.cpp
index c817d3c97..206d7cd75 100644
--- a/src/widgets/qvbuttongroup.cpp
+++ b/src/widgets/qvbuttongroup.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqvbuttongroup.h"
-#ifndef QT_NO_VBUTTONGROUP
+#ifndef TQT_NO_VBUTTONGROUP
 
 /*!
   \class TQVButtonGroup ntqvbuttongroup.h
diff --git a/src/widgets/qvgroupbox.cpp b/src/widgets/qvgroupbox.cpp
index 5ae77babb..de48909bf 100644
--- a/src/widgets/qvgroupbox.cpp
+++ b/src/widgets/qvgroupbox.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqvgroupbox.h"
-#ifndef QT_NO_VGROUPBOX
+#ifndef TQT_NO_VGROUPBOX
 
 /*!
   \class TQVGroupBox ntqvgroupbox.h
diff --git a/src/widgets/qwhatsthis.cpp b/src/widgets/qwhatsthis.cpp
index 2a61fec80..cd87acd5c 100644
--- a/src/widgets/qwhatsthis.cpp
+++ b/src/widgets/qwhatsthis.cpp
@@ -37,7 +37,7 @@
 **********************************************************************/
 
 #include "ntqwhatsthis.h"
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 #include "ntqapplication.h"
 #include "ntqpaintdevicemetrics.h"
 #include "ntqpixmap.h"
@@ -163,7 +163,7 @@ protected:
 
 private:
     TQString text;
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     TQSimpleRichText* doc;
 #endif
     TQString anchor;
@@ -247,7 +247,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co
     setBackgroundMode( NoBackground );
     setPalette( TQToolTip::palette() );
     setMouseTracking( TRUE );
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     setCursor( arrowCursor );
 #endif
 
@@ -256,7 +256,7 @@ TQWhatsThat::TQWhatsThat( TQWidget* w, const TQString& txt, TQWidget* parent, co
 
 
     TQRect r;
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     doc = 0;
     if ( TQStyleSheet::mightBeRichText( text ) ) {
 	TQFont f = TQApplication::font( this );
@@ -291,7 +291,7 @@ TQWhatsThat::~TQWhatsThat()
 {
     if ( wt && wt->whatsThat == this )
 	wt->whatsThat = 0;
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     if ( doc )
 	delete doc;
 #endif
@@ -309,7 +309,7 @@ void TQWhatsThat::mousePressEvent( TQMouseEvent* e )
 {
     pressed = TRUE;
     if ( e->button() == LeftButton && rect().contains( e->pos() ) ) {
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
 	if ( doc )
 	    anchor = doc->anchorAt( e->pos() -  TQPoint( hMargin, vMargin) );
 #endif
@@ -322,7 +322,7 @@ void TQWhatsThat::mouseReleaseEvent( TQMouseEvent* e )
 {
     if ( !pressed )
 	return;
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     if ( e->button() == LeftButton && doc && rect().contains( e->pos() ) ) {
 	TQString a = doc->anchorAt( e->pos() -  TQPoint( hMargin, vMargin ) );
 	TQString href;
@@ -341,8 +341,8 @@ void TQWhatsThat::mouseReleaseEvent( TQMouseEvent* e )
 
 void TQWhatsThat::mouseMoveEvent( TQMouseEvent* e)
 {
-#ifndef QT_NO_RICHTEXT
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_RICHTEXT
+#ifndef TQT_NO_CURSOR
     if ( !doc )
 	return;
     TQString a = doc->anchorAt( e->pos() -  TQPoint( hMargin, vMargin ) );
@@ -402,7 +402,7 @@ void TQWhatsThat::paintEvent( TQPaintEvent* )
     p.setPen( colorGroup().foreground() );
     r.addCoords( hMargin, vMargin, -hMargin, -vMargin );
 
-#ifndef QT_NO_RICHTEXT
+#ifndef TQT_NO_RICHTEXT
     if ( doc ) {
 	doc->draw( &p, r.x(), r.y(), r, colorGroup(), 0 );
     }
@@ -471,7 +471,7 @@ void TQWhatsThisButton::mouseReleased()
 {
     if ( wt->state == TQWhatsThisPrivate::Inactive && isOn() ) {
 	TQWhatsThisPrivate::setUpWhatsThis();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	TQApplication::setOverrideCursor( whatsThisCursor, FALSE );
 #endif
 	wt->state = TQWhatsThisPrivate::Waiting;
@@ -501,7 +501,7 @@ TQWhatsThisPrivate::TQWhatsThisPrivate()
 
 TQWhatsThisPrivate::~TQWhatsThisPrivate()
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( state == Waiting && tqApp )
 	TQApplication::restoreOverrideCursor();
 #endif
@@ -639,7 +639,7 @@ void TQWhatsThisPrivate::leaveWhatsThisMode()
 	    ++it;
 	    b->setOn( FALSE );
 	}
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	TQApplication::restoreOverrideCursor();
 #endif
 	state = Inactive;
@@ -919,7 +919,7 @@ void TQWhatsThis::enterWhatsThisMode()
     TQWhatsThisPrivate::setUpWhatsThis();
     if ( wt->state == TQWhatsThisPrivate::Inactive ) {
 	wt->enterWhatsThisMode();
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	TQApplication::setOverrideCursor( whatsThisCursor, FALSE );
 #endif
 	wt->state = TQWhatsThisPrivate::Waiting;
diff --git a/src/widgets/qwidgetinterface_p.h b/src/widgets/qwidgetinterface_p.h
index 38505841e..5cfd43e48 100644
--- a/src/widgets/qwidgetinterface_p.h
+++ b/src/widgets/qwidgetinterface_p.h
@@ -56,7 +56,7 @@
 #include "ntqiconset.h"
 #endif // QT_H
 
-#ifndef QT_NO_WIDGETPLUGIN
+#ifndef TQT_NO_WIDGETPLUGIN
 
 class TQWidget;
 
@@ -141,5 +141,5 @@ public:
 };
 
 #endif // QT_CONTAINER_CUSTOM_WIDGETS
-#endif // QT_NO_WIDGETPLUGIN
+#endif // TQT_NO_WIDGETPLUGIN
 #endif // TQWIDGETINTERFACE_P_H
diff --git a/src/widgets/qwidgetplugin.cpp b/src/widgets/qwidgetplugin.cpp
index 58c1e2c04..7d73ef962 100644
--- a/src/widgets/qwidgetplugin.cpp
+++ b/src/widgets/qwidgetplugin.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqwidgetplugin.h"
 
-#ifndef QT_NO_WIDGETPLUGIN
+#ifndef TQT_NO_WIDGETPLUGIN
 #include "qwidgetinterface_p.h"
 #include "ntqobjectcleanuphandler.h"
 #include "ntqwidget.h"
@@ -726,4 +726,4 @@ TQString TQWidgetContainerPlugin::createCode( const TQString &, const TQString &
 
 #endif // QT_CONTAINER_CUSTOM_WIDGETS
 
-#endif //QT_NO_WIDGETPLUGIN
+#endif //TQT_NO_WIDGETPLUGIN
diff --git a/src/widgets/qwidgetresizehandler.cpp b/src/widgets/qwidgetresizehandler.cpp
index 80339a4fd..f1bc73627 100644
--- a/src/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/qwidgetresizehandler.cpp
@@ -40,7 +40,7 @@
 
 #include "qwidgetresizehandler_p.h"
 
-#ifndef QT_NO_RESIZEHANDLER
+#ifndef TQT_NO_RESIZEHANDLER
 #include "ntqframe.h"
 #include "ntqapplication.h"
 #include "ntqcursor.h"
@@ -113,7 +113,7 @@ bool TQWidgetResizeHandler::eventFilter( TQObject *o, TQEvent *ee )
 
     TQWidget *w = childOf( widget, (TQWidget*)o );
     if ( !w
-#ifndef QT_NO_SIZEGRIP
+#ifndef TQT_NO_SIZEGRIP
 	 || ::tqt_cast(o)
 #endif
 	 || tqApp->activePopupWidget() ) {
@@ -200,7 +200,7 @@ void TQWidgetResizeHandler::mouseMoveEvent( TQMouseEvent *e )
 
 	if ( widget->isMinimized() || !isActive(Resize) )
 	    mode = Center;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	setMouseCursor( mode );
 #endif
 	return;
@@ -315,7 +315,7 @@ void TQWidgetResizeHandler::mouseMoveEvent( TQMouseEvent *e )
 
 void TQWidgetResizeHandler::setMouseCursor( MousePosition m )
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     switch ( m ) {
     case TopLeft:
     case BottomRight:
@@ -365,7 +365,7 @@ void TQWidgetResizeHandler::keyPressEvent( TQKeyEvent * e )
 		mode = BottomLeft;
 	    else if ( mode == TopRight )
 		mode = TopLeft;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    setMouseCursor( mode );
 	    widget->grabMouse( widget->cursor() );
 #else
@@ -390,7 +390,7 @@ void TQWidgetResizeHandler::keyPressEvent( TQKeyEvent * e )
 		mode = BottomRight;
 	    else if ( mode == TopLeft )
 		mode = TopRight;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    setMouseCursor( mode );
 	    widget->grabMouse( widget->cursor() );
 #else
@@ -415,7 +415,7 @@ void TQWidgetResizeHandler::keyPressEvent( TQKeyEvent * e )
 		mode = TopLeft;
 	    else if ( mode == BottomRight )
 		mode = TopRight;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    setMouseCursor( mode );
 	    widget->grabMouse( widget->cursor() );
 #else
@@ -440,7 +440,7 @@ void TQWidgetResizeHandler::keyPressEvent( TQKeyEvent * e )
 		mode = BottomLeft;
 	    else if ( mode == TopRight )
 		mode = BottomRight;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 	    setMouseCursor( mode );
 	    widget->grabMouse( widget->cursor() );
 #else
@@ -484,7 +484,7 @@ void TQWidgetResizeHandler::doResize()
 	    mode = BottomRight;
     }
     invertedMoveOffset = widget->rect().bottomRight() - moveOffset;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     setMouseCursor( mode );
     widget->grabMouse( widget->cursor()  );
 #else
@@ -505,7 +505,7 @@ void TQWidgetResizeHandler::doMove()
     buttonDown = TRUE;
     moveOffset = widget->mapFromGlobal( TQCursor::pos() );
     invertedMoveOffset = widget->rect().bottomRight() - moveOffset;
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     widget->grabMouse( SizeAllCursor );
 #else
     widget->grabMouse();
@@ -513,4 +513,4 @@ void TQWidgetResizeHandler::doMove()
     widget->grabKeyboard();
 }
 
-#endif //QT_NO_RESIZEHANDLER
+#endif //TQT_NO_RESIZEHANDLER
diff --git a/src/widgets/qwidgetresizehandler_p.h b/src/widgets/qwidgetresizehandler_p.h
index c86ada5dd..c65f47bdf 100644
--- a/src/widgets/qwidgetresizehandler_p.h
+++ b/src/widgets/qwidgetresizehandler_p.h
@@ -56,7 +56,7 @@
 #ifndef QT_H
 #include "ntqobject.h"
 #endif // QT_H
-#ifndef QT_NO_RESIZEHANDLER
+#ifndef TQT_NO_RESIZEHANDLER
 class TQMouseEvent;
 class TQKeyEvent;
 
@@ -133,5 +133,5 @@ private:	// Disabled copy constructor and operator=
 
 };
 
-#endif //QT_NO_RESIZEHANDLER
+#endif //TQT_NO_RESIZEHANDLER
 #endif
diff --git a/src/widgets/qwidgetstack.cpp b/src/widgets/qwidgetstack.cpp
index d6adf42d7..8024901f1 100644
--- a/src/widgets/qwidgetstack.cpp
+++ b/src/widgets/qwidgetstack.cpp
@@ -41,7 +41,7 @@
 #include "ntqwidgetstack.h"
 #include "ntqlayout.h"
 #include "../kernel/qlayoutengine_p.h"
-#ifndef QT_NO_WIDGETSTACK
+#ifndef TQT_NO_WIDGETSTACK
 
 #include "ntqobjectlist.h"
 #include "ntqfocusdata.h"
@@ -559,7 +559,7 @@ TQSize TQWidgetStack::sizeHint() const
 	    sh.rwidth() = 0;
 	if ( w->sizePolicy().verData() == TQSizePolicy::Ignored )
 	    sh.rheight() = 0;
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 	size = size.expandedTo( sh ).expandedTo( qSmartMinSize(w) );
 #endif
     }
@@ -589,7 +589,7 @@ TQSize TQWidgetStack::minimumSizeHint() const
 	    sh.rwidth() = 0;
 	if ( w->sizePolicy().verData() == TQSizePolicy::Ignored )
 	    sh.rheight() = 0;
-#ifndef QT_NO_LAYOUT
+#ifndef TQT_NO_LAYOUT
 	size = size.expandedTo( sh ).expandedTo( w->minimumSize() );
 #endif
     }
diff --git a/src/workspace/ntqworkspace.h b/src/workspace/ntqworkspace.h
index 8a53303e8..45ba1dd24 100644
--- a/src/workspace/ntqworkspace.h
+++ b/src/workspace/ntqworkspace.h
@@ -46,7 +46,7 @@
 #include "ntqwidgetlist.h"
 #endif // QT_H
 
-#ifndef QT_NO_WORKSPACE
+#ifndef TQT_NO_WORKSPACE
 
 #if !defined( TQT_MODULE_WORKSPACE ) || defined( QT_INTERNAL_WORKSPACE )
 #define TQM_EXPORT_WORKSPACE
@@ -108,7 +108,7 @@ public slots:
     void activatePrevWindow();
 
 protected:
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     void styleChange( TQStyle& );
 #endif
     void childEvent( TQChildEvent * );
@@ -116,7 +116,7 @@ protected:
     bool eventFilter( TQObject *, TQEvent * );
     void showEvent( TQShowEvent *e );
     void hideEvent( TQHideEvent *e );
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
     void wheelEvent( TQWheelEvent *e );
 #endif
 
@@ -164,6 +164,6 @@ private:	// Disabled copy constructor and operator=
 };
 
 
-#endif // QT_NO_WORKSPACE
+#endif // TQT_NO_WORKSPACE
 
 #endif // TQWORKSPACE_H
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index 08d356d1a..7df816511 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -39,7 +39,7 @@
 **********************************************************************/
 
 #include "ntqworkspace.h"
-#ifndef QT_NO_WORKSPACE
+#ifndef TQT_NO_WORKSPACE
 #include "ntqapplication.h"
 #include "../widgets/qtitlebar_p.h"
 #include "ntqobjectlist.h"
@@ -323,7 +323,7 @@ TQWorkspace::init()
     d->popup->insertSeparator();
     d->popup->insertItem(TQIconSet(style().stylePixmap(TQStyle::SP_TitleBarCloseButton)),
 				  tr("&Close")
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 					+"\t"+TQAccel::keyToString(CTRL+Key_F4)
 #endif
 		    , this, SLOT( closeActiveWindow() ) );
@@ -339,12 +339,12 @@ TQWorkspace::init()
     d->toolPopup->insertItem(TQIconSet(style().stylePixmap(TQStyle::SP_TitleBarShadeButton)), tr("Sh&ade"), 6);
     d->toolPopup->insertItem(TQIconSet(style().stylePixmap(TQStyle::SP_TitleBarCloseButton)),
 				      tr("&Close")
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
 					+"\t"+TQAccel::keyToString( CTRL+Key_F4)
 #endif
 		, this, SLOT( closeActiveWindow() ) );
 
-#ifndef QT_NO_ACCEL
+#ifndef TQT_NO_ACCEL
     TQAccel* a = new TQAccel( this );
     a->connectItem( a->insertItem( ALT + Key_Minus),
 		    this, SLOT( showOperationMenu() ) );
@@ -370,7 +370,7 @@ TQWorkspace::init()
     setBackgroundMode( PaletteDark );
     setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
 
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     d->topCaption = topLevelWidget()->caption();
 #endif
 
@@ -478,7 +478,7 @@ void TQWorkspace::childEvent( TQChildEvent * e)
 
 /*! \reimp
 */
-#ifndef QT_NO_WHEELEVENT
+#ifndef TQT_NO_WHEELEVENT
 void TQWorkspace::wheelEvent( TQWheelEvent *e )
 {
     if ( !scrollBarsEnabled() )
@@ -537,7 +537,7 @@ void TQWorkspace::activateWindow( TQWidget* w, bool change_focus )
 	 !d->active->windowWidget()->testWFlags( WStyle_Tool ) ) {
         d->active->showMaximized();
 	if ( d->maxtools ) {
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	    if ( w->icon() ) {
 		TQPixmap pm(*w->icon());
 		int iconSize = d->maxtools->size().height();
@@ -992,7 +992,7 @@ void TQWorkspace::showEvent( TQShowEvent *e )
 			dw->setResizeEnabled(TRUE);
 			dw->setCloseMode( TQDockWindow::Always );
 			dw->setResizeEnabled(FALSE);
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 			dw->setCaption(o->caption());
 #endif
 			TQSize os(w->size());
@@ -1099,7 +1099,7 @@ void TQWorkspace::minimizeWindow( TQWidget* w)
 	    wasMax = TRUE;
 	    d->maxWindow = 0;
 	    inCaptionChange = TRUE;
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	    if ( !!d->topCaption )
 		topLevelWidget()->setCaption( d->topCaption );
 #endif
@@ -1154,7 +1154,7 @@ void TQWorkspace::normalizeWindow( TQWidget* w)
 	if ( c == d->maxWindow ) {
 	    c->setGeometry( d->maxRestore );
 	    d->maxWindow = 0;
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	    inCaptionChange = TRUE;
 	    if ( !!d->topCaption )
 		topLevelWidget()->setCaption( d->topCaption );
@@ -1215,7 +1215,7 @@ void TQWorkspace::maximizeWindow( TQWidget* w)
 	    if ( c->titlebar )
 		c->titlebar->setMovable( FALSE );
 	}
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	inCaptionChange = TRUE;
 	if ( !!d->topCaption )
 	    topLevelWidget()->setCaption( tr("%1 - [%2]")
@@ -1336,7 +1336,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e)
 
     static TQTime* t = 0;
     static TQWorkspace* tc = 0;
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     if ( o == d->maxtools && d->menuId != -1 ) {
 	switch ( e->type() ) {
 	case TQEvent::MouseButtonPress:
@@ -1406,7 +1406,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e)
 		} else {
 		    hideMaximizeControls();
 		}
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 		inCaptionChange = TRUE;
 		if ( !!d->topCaption )
 		    topLevelWidget()->setCaption( d->topCaption );
@@ -1425,7 +1425,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e)
 	if ( inCaptionChange )
 	    break;
 
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	inCaptionChange = TRUE;
 	if ( o == topLevelWidget() ) {
 	    TQWidget *tlw = (TQWidget*)o;
@@ -1464,7 +1464,7 @@ bool TQWorkspace::eventFilter( TQObject *o, TQEvent * e)
 
 void TQWorkspace::showMaximizeControls()
 {
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     Q_ASSERT(d->maxWindow);
     TQMenuBar* b = 0;
 
@@ -1501,7 +1501,7 @@ void TQWorkspace::showMaximizeControls()
 	if ( d->maxWindow->windowWidget() &&
 	     d->maxWindow->windowWidget()->testWFlags(WStyle_Minimize) ) {
 	    TQToolButton* iconB = new TQToolButton( d->maxcontrols, "iconify" );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	    TQToolTip::add( iconB, tr( "Minimize" ) );
 #endif
 	    l->addWidget( iconB );
@@ -1513,7 +1513,7 @@ void TQWorkspace::showMaximizeControls()
 	}
 
 	TQToolButton* restoreB = new TQToolButton( d->maxcontrols, "restore" );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	TQToolTip::add( restoreB, tr( "Restore Down" ) );
 #endif
 	l->addWidget( restoreB );
@@ -1525,7 +1525,7 @@ void TQWorkspace::showMaximizeControls()
 
 	l->addSpacing( 2 );
 	TQToolButton* closeB = new TQToolButton( d->maxcontrols, "close" );
-#ifndef QT_NO_TOOLTIP
+#ifndef TQT_NO_TOOLTIP
 	TQToolTip::add( closeB, tr( "Close" ) );
 #endif
 	l->addWidget( closeB );
@@ -1553,7 +1553,7 @@ void TQWorkspace::showMaximizeControls()
 	    d->maxtools = new TQLabel( topLevelWidget(), "qt_maxtools" );
 	    d->maxtools->installEventFilter( this );
 	}
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	if ( d->active->windowWidget() && d->active->windowWidget()->icon() ) {
 	    TQPixmap pm(*d->active->windowWidget()->icon());
 	    int iconSize = d->maxcontrols->size().height();
@@ -1579,7 +1579,7 @@ void TQWorkspace::showMaximizeControls()
 
 void TQWorkspace::hideMaximizeControls()
 {
-#ifndef QT_NO_MENUBAR
+#ifndef TQT_NO_MENUBAR
     if ( d->maxmenubar ) {
 	int mi = d->menuId;
 	if ( mi != -1 ) {
@@ -2078,7 +2078,7 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *parent,
     if (!childWidget)
 	return;
 
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     setCaption( childWidget->caption() );
 #endif
 
@@ -2095,7 +2095,7 @@ TQWorkspaceChild::TQWorkspaceChild( TQWidget* window, TQWorkspace *parent,
 
     int th = titlebar ? titlebar->sizeHint().height() : 0;
     if ( titlebar ) {
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	int iconSize = th;
 	if( childWidget->icon() ) {
 	    TQPixmap pm(*childWidget->icon());
@@ -2372,7 +2372,7 @@ bool TQWorkspaceChild::eventFilter( TQObject * o, TQEvent * e)
 	}
 	break;
     case TQEvent::CaptionChange:
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	setCaption( childWidget->caption() );
 	if ( iconw )
 	    iconw->setCaption( childWidget->caption() );
@@ -2386,7 +2386,7 @@ bool TQWorkspaceChild::eventFilter( TQObject * o, TQEvent * e)
 
 	    TQPixmap pm;
 	    int iconSize = titlebar->size().height();
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
 	    if ( childWidget->icon() ) {
 		pm = *childWidget->icon();
 		if(pm.width() > iconSize || pm.height() > iconSize) {
@@ -2515,7 +2515,7 @@ void TQWorkspaceChild::enterEvent( TQEvent * )
 
 void TQWorkspaceChild::leaveEvent( TQEvent * )
 {
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
     if ( !widgetResizeHandler->isButtonDown() )
 	setCursor( arrowCursor );
 #endif
@@ -2645,7 +2645,7 @@ TQWidget* TQWorkspaceChild::iconWidget() const
 	connect( iconw, SIGNAL( doubleClicked() ),
 		 this, SLOT( titleBarDoubleClicked() ) );
     }
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     if ( windowWidget() ) {
 	iconw->setCaption( windowWidget()->caption() );
 	if ( windowWidget()->icon() ) {
@@ -2751,7 +2751,7 @@ void TQWorkspaceChild::setCaption( const TQString& cap )
 {
     if ( titlebar )
 	titlebar->setCaption( cap );
-#ifndef QT_NO_WIDGET_TOPEXTRA
+#ifndef TQT_NO_WIDGET_TOPEXTRA
     TQWidget::setCaption( cap );
 #endif
 }
@@ -3003,7 +3003,7 @@ TQWorkspace::WindowMode TQWorkspace::windowMode() const
     return d->wmode;
 }
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
 /*!\reimp */
 void TQWorkspace::styleChange( TQStyle &olds )
 {
@@ -3023,4 +3023,4 @@ void TQWorkspace::styleChange( TQStyle &olds )
 
 
 #include "qworkspace.moc"
-#endif // QT_NO_WORKSPACE
+#endif // TQT_NO_WORKSPACE
diff --git a/src/xml/ntqdom.h b/src/xml/ntqdom.h
index c35e39580..aa250520f 100644
--- a/src/xml/ntqdom.h
+++ b/src/xml/ntqdom.h
@@ -51,7 +51,7 @@
 #define TQM_EXPORT_DOM Q_EXPORT
 #endif
 
-#ifndef QT_NO_DOM
+#ifndef TQT_NO_DOM
 
 class TQIODevice;
 class TQTextStream;
@@ -673,5 +673,5 @@ private:
 
 TQM_EXPORT_DOM TQTextStream& operator<<( TQTextStream&, const TQDomNode& );
 
-#endif //QT_NO_DOM
+#endif //TQT_NO_DOM
 #endif // TQDOM_H
diff --git a/src/xml/ntqxml.h b/src/xml/ntqxml.h
index 6f5f6046d..b6a08d828 100644
--- a/src/xml/ntqxml.h
+++ b/src/xml/ntqxml.h
@@ -55,7 +55,7 @@
 #define TQM_EXPORT_XML Q_EXPORT
 #endif
 
-#ifndef QT_NO_XML
+#ifndef TQT_NO_XML
 
 class TQXmlNamespaceSupport;
 class TQXmlAttributes;
@@ -533,6 +533,6 @@ inline int TQXmlAttributes::count() const
 { return length(); }
 
 
-#endif //QT_NO_XML
+#endif //TQT_NO_XML
 
 #endif
diff --git a/src/xml/qdom.cpp b/src/xml/qdom.cpp
index 64658c1c6..e60190816 100644
--- a/src/xml/qdom.cpp
+++ b/src/xml/qdom.cpp
@@ -40,7 +40,7 @@
 
 #include "ntqdom.h"
 
-#ifndef QT_NO_DOM
+#ifndef TQT_NO_DOM
 
 #include "ntqxml.h"
 #include "ntqptrlist.h"
@@ -7089,4 +7089,4 @@ bool TQDomHandler::notationDecl( const TQString & name, const TQString & publicI
     return TRUE;
 }
 
-#endif //QT_NO_DOM
+#endif //TQT_NO_DOM
diff --git a/src/xml/qsvgdevice.cpp b/src/xml/qsvgdevice.cpp
index 9acaf4f97..c4e710ea4 100644
--- a/src/xml/qsvgdevice.cpp
+++ b/src/xml/qsvgdevice.cpp
@@ -38,7 +38,7 @@
 
 #include 
 
-#ifndef QT_NO_SVG
+#ifndef TQT_NO_SVG
 
 #include "ntqpainter.h"
 #include "ntqpaintdevicemetrics.h"
@@ -582,7 +582,7 @@ bool TQSvgDevice::cmd ( int c, TQPainter *painter, TQPDevCmdParam *p )
 	    e.setAttribute( "points", str.stripWhiteSpace() );
 	}
 	break;
-#ifndef QT_NO_BEZIER
+#ifndef TQT_NO_BEZIER
     case PdcDrawCubicBezier:
 	a = *p[0].ptarr;
 	e = doc.createElement( "path" );
@@ -1424,7 +1424,7 @@ void TQSvgDevice::drawPath( const TQString &data )
 	    y = arg[ 0 ] + offsetY;
 	    path.setPoint( pcount++, int(x), int(y) );
 	    break;
-#ifndef QT_NO_BEZIER
+#ifndef TQT_NO_BEZIER
 	case 5:					// 'C' cubic bezier curveto
 	case 6:					// 'S' smooth shorthand
 	case 7:					// 'Q' quadratic bezier curves
@@ -1467,7 +1467,7 @@ void TQSvgDevice::drawPath( const TQString &data )
 		path.setPoint( pcount++, bezier[ k ] );
 	    break;
 	}
-#endif // QT_NO_BEZIER
+#endif // TQT_NO_BEZIER
 	case 9:					// 'A' elliptical arc curve
 	    // ### just a straight line
 	    x = arg[ 5 ] + offsetX;
@@ -1588,4 +1588,4 @@ void TQSvgDevice::applyTransform( TQDomElement *e ) const
     e->setAttribute( "transform", s );
 }
 
-#endif // QT_NO_SVG
+#endif // TQT_NO_SVG
diff --git a/src/xml/qsvgdevice_p.h b/src/xml/qsvgdevice_p.h
index 5b3fe48b5..388f671bb 100644
--- a/src/xml/qsvgdevice_p.h
+++ b/src/xml/qsvgdevice_p.h
@@ -65,7 +65,7 @@
 #define TQM_EXPORT_SVG Q_EXPORT
 #endif
 
-#ifndef QT_NO_SVG
+#ifndef TQT_NO_SVG
 
 class TQPainter;
 class TQDomNode;
@@ -135,6 +135,6 @@ inline TQRect TQSvgDevice::boundingRect() const
     return brect;
 }
 
-#endif // QT_NO_SVG
+#endif // TQT_NO_SVG
 
 #endif // TQSVGDEVICE_P_H
diff --git a/src/xml/qxml.cpp b/src/xml/qxml.cpp
index e29e027fa..55024acb4 100644
--- a/src/xml/qxml.cpp
+++ b/src/xml/qxml.cpp
@@ -49,7 +49,7 @@
 // needed for QT_TRANSLATE_NOOP:
 #include "ntqobject.h"
 
-#ifndef QT_NO_XML
+#ifndef TQT_NO_XML
 
 //#define QT_QXML_DEBUG
 
@@ -7695,4 +7695,4 @@ void TQXmlSimpleReader::stringClear()
 }
 
 
-#endif //QT_NO_XML
+#endif //TQT_NO_XML
diff --git a/tools/designer/designer/actiondnd.cpp b/tools/designer/designer/actiondnd.cpp
index b0e619c2d..dbbc6d208 100644
--- a/tools/designer/designer/actiondnd.cpp
+++ b/tools/designer/designer/actiondnd.cpp
@@ -530,7 +530,7 @@ void TQDesignerToolBar::buttonMouseMoveEvent( TQMouseEvent *e, TQObject *o )
     indicator->hide();
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 
 void TQDesignerToolBar::dragEnterEvent( TQDragEnterEvent *e )
 {
diff --git a/tools/designer/designer/actiondnd.h b/tools/designer/designer/actiondnd.h
index 6d4f7df7c..d444dcd5a 100644
--- a/tools/designer/designer/actiondnd.h
+++ b/tools/designer/designer/actiondnd.h
@@ -203,7 +203,7 @@ public:
 protected:
     bool eventFilter( TQObject *, TQEvent * );
     void paintEvent( TQPaintEvent * );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent( TQDragEnterEvent * );
     void dragMoveEvent( TQDragMoveEvent * );
     void dragLeaveEvent( TQDragLeaveEvent * );
diff --git a/tools/designer/designer/command.cpp b/tools/designer/designer/command.cpp
index 1a39ce846..4858ec283 100644
--- a/tools/designer/designer/command.cpp
+++ b/tools/designer/designer/command.cpp
@@ -58,7 +58,7 @@
 #include 
 #include 
 #include 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include 
 #endif
 #include 
@@ -609,7 +609,7 @@ void SetPropertyCommand::setProperty( const TQVariant &v, const TQString ¤
 	editor->refetchData();
 	editor->emitWidgetChanged();
 	( ( PropertyItem* )editor->propertyList()->currentItem() )->setChanged( MetaDataBase::isPropertyChanged( widget, propName ) );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( propName == "database" ) {
 	    formWindow()->mainWindow()->objectHierarchy()->databasePropertyChanged( (TQWidget*)((TQObject *)widget), MetaDataBase::fakeProperty( widget, "database" ).toStringList() );
 	}
@@ -1532,7 +1532,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 						  TQIconView *iv, const TQValueList &items )
     : Command( n, fw ), newItems( items ), iconview( iv )
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     TQIconViewItem *i = 0;
     for ( i = iconview->firstItem(); i; i = i->nextItem() ) {
 	Item item;
@@ -1546,7 +1546,7 @@ PopulateIconViewCommand::PopulateIconViewCommand( const TQString &n, FormWindow
 
 void PopulateIconViewCommand::execute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList::Iterator it = newItems.begin(); it != newItems.end(); ++it ) {
 	Item i = *it;
@@ -1557,7 +1557,7 @@ void PopulateIconViewCommand::execute()
 
 void PopulateIconViewCommand::unexecute()
 {
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     iconview->clear();
     for ( TQValueList::Iterator it = oldItems.begin(); it != oldItems.end(); ++it ) {
 	Item i = *it;
@@ -1715,7 +1715,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 					    const TQValueList &columns )
     : Command( n, fw ), newRows( rows ), newColumns( columns ), table( t )
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     int i = 0;
     TQMap columnFields = MetaDataBase::columnFields( table );
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
@@ -1738,7 +1738,7 @@ PopulateTableCommand::PopulateTableCommand( const TQString &n, FormWindow *fw, T
 
 void PopulateTableCommand::execute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap columnFields;
     table->setNumCols( (int)newColumns.count() );
     int i = 0;
@@ -1757,7 +1757,7 @@ void PopulateTableCommand::execute()
 
 void PopulateTableCommand::unexecute()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQMap columnFields;
     table->setNumCols( (int)oldColumns.count() );
     int i = 0;
diff --git a/tools/designer/designer/connectionitems.cpp b/tools/designer/designer/connectionitems.cpp
index 35d44c195..24a478656 100644
--- a/tools/designer/designer/connectionitems.cpp
+++ b/tools/designer/designer/connectionitems.cpp
@@ -413,7 +413,7 @@ void SlotItem::signalChanged( const TQString &signal )
 
 bool SlotItem::ignoreSlot( const char* slot ) const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( qstrcmp( slot, "update()" ) == 0 &&
 	 ::tqt_cast(lastReceiver) )
 	return FALSE;
diff --git a/tools/designer/designer/database.cpp b/tools/designer/designer/database.cpp
index ca917c1d9..602e9c236 100644
--- a/tools/designer/designer/database.cpp
+++ b/tools/designer/designer/database.cpp
@@ -37,7 +37,7 @@
 #include "database2.h"
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 
 #if defined(DESIGNER)
 #include "formwindow.h"
diff --git a/tools/designer/designer/database.h b/tools/designer/designer/database.h
index 0af7a92f9..31e0a1eb9 100644
--- a/tools/designer/designer/database.h
+++ b/tools/designer/designer/database.h
@@ -36,7 +36,7 @@
 
 #include "ntqfeatures.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include 
 #include 
 #include 
diff --git a/tools/designer/designer/database2.h b/tools/designer/designer/database2.h
index df7c294b1..41a636b4f 100644
--- a/tools/designer/designer/database2.h
+++ b/tools/designer/designer/database2.h
@@ -36,7 +36,7 @@
 
 #include "ntqfeatures.h"
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include 
 #include 
 #include 
diff --git a/tools/designer/designer/dbconnectionimpl.cpp b/tools/designer/designer/dbconnectionimpl.cpp
index ae6cbac9e..fd9cf4eb0 100644
--- a/tools/designer/designer/dbconnectionimpl.cpp
+++ b/tools/designer/designer/dbconnectionimpl.cpp
@@ -57,7 +57,7 @@ DatabaseConnectionEditor::~DatabaseConnectionEditor()
 
 void DatabaseConnectionEditor::accept()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     conn->setUsername( connectionWidget->editUsername->text() );
     conn->setPassword( connectionWidget->editPassword->text() );
     conn->setHostname( connectionWidget->editHostname->text() );
diff --git a/tools/designer/designer/dbconnectionsimpl.cpp b/tools/designer/designer/dbconnectionsimpl.cpp
index 0507cb713..60ad7d345 100644
--- a/tools/designer/designer/dbconnectionsimpl.cpp
+++ b/tools/designer/designer/dbconnectionsimpl.cpp
@@ -62,7 +62,7 @@ DatabaseConnectionsEditor::DatabaseConnectionsEditor( Project *pro, TQWidget* pa
     connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) );
     connectionWidget = new DatabaseConnectionWidget( grp );
     grpLayout->addWidget( connectionWidget, 0, 0 );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList lst = project->databaseConnections();
     for ( DatabaseConnection *conn = lst.first(); conn; conn = lst.next() )
 	listConnections->insertItem( conn->name() );
@@ -112,7 +112,7 @@ void DatabaseConnectionsEditor::newConnection()
 
 void DatabaseConnectionsEditor::doConnect()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( listConnections->currentItem() == -1 ||
 	 !listConnections->item( listConnections->currentItem() )->isSelected() ) { // new connection
 	// ### do error checking for duplicated connection names
@@ -154,7 +154,7 @@ void DatabaseConnectionsEditor::doConnect()
 
 void DatabaseConnectionsEditor::currentConnectionChanged( const TQString &s )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = project->databaseConnection( s );
     blockChanges = TRUE;
     enableAll( conn != 0 );
diff --git a/tools/designer/designer/designerappiface.cpp b/tools/designer/designer/designerappiface.cpp
index bbcba7784..e00cf67cd 100644
--- a/tools/designer/designer/designerappiface.cpp
+++ b/tools/designer/designer/designerappiface.cpp
@@ -278,7 +278,7 @@ void DesignerProjectImpl::setupDatabases() const
 TQPtrList DesignerProjectImpl::databaseConnections() const
 {
     TQPtrList lst;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList conns = project->databaseConnections();
     for ( DatabaseConnection *d = conns.first(); d; d = conns.next() )
 	lst.append( d->iFace() );
@@ -437,7 +437,7 @@ bool DesignerProjectImpl::isGenericObject( TQObject *o ) const
 
 
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DesignerDatabaseImpl::DesignerDatabaseImpl( DatabaseConnection *d )
     : db( d )
 {
diff --git a/tools/designer/designer/designerappiface.h b/tools/designer/designer/designerappiface.h
index 7b5719b45..fef579db0 100644
--- a/tools/designer/designer/designerappiface.h
+++ b/tools/designer/designer/designerappiface.h
@@ -126,7 +126,7 @@ private:
 
 };
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 class TQSqlDatabase;
 
 class DesignerDatabaseImpl: public DesignerDatabase
diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp
index f092f8d22..e529432ad 100644
--- a/tools/designer/designer/formwindow.cpp
+++ b/tools/designer/designer/formwindow.cpp
@@ -2444,7 +2444,7 @@ bool FormWindow::isCustomWidgetUsed( MetaDataBase::CustomWidget *w )
 
 bool FormWindow::isDatabaseWidgetUsed() const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQStringList dbClasses;
     dbClasses << "TQDataTable"; // add more here
     TQPtrDictIterator it( insertedWidgets );
@@ -2460,7 +2460,7 @@ bool FormWindow::isDatabaseWidgetUsed() const
 
 bool FormWindow::isDatabaseAware() const
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( TQString(mContainer->className()) == "TQDesignerDataBrowser" || TQString(mContainer->className()) == "TQDesignerDataView" )
 	return TRUE;
     return isDatabaseWidgetUsed();
diff --git a/tools/designer/designer/hierarchyview.cpp b/tools/designer/designer/hierarchyview.cpp
index e96a86473..c365a4d3a 100644
--- a/tools/designer/designer/hierarchyview.cpp
+++ b/tools/designer/designer/hierarchyview.cpp
@@ -350,7 +350,7 @@ void HierarchyList::changeNameOf( TQObject *o, const TQString &name )
 
 void HierarchyList::changeDatabaseOf( TQObject *o, const TQString &info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !formWindow->isDatabaseAware() )
 	return;
     TQListViewItem *item = findItem( o );
@@ -368,7 +368,7 @@ void HierarchyList::setup()
 	return;
     clear();
     TQWidget *w = formWindow->mainContainer();
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( formWindow->isDatabaseAware() ) {
 	if ( columns() == 2 ) {
 	    addColumn( tr( "Database" ) );
@@ -426,7 +426,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     }
 
     TQString dbInfo;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     dbInfo = MetaDataBase::fakeProperty( o, "database" ).toStringList().join(".");
 #endif
 
@@ -1445,7 +1445,7 @@ void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & )
 
 void HierarchyView::databasePropertyChanged( TQWidget *w, const TQStringList& info )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQString i = info.join( "." );
     listview->changeDatabaseOf( w, i );
 #endif
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 3c837a9da..f80cf6026 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -72,7 +72,7 @@
 #include "formsettings.h"
 #include "preferences.h"
 #include "pixmapcollectioneditor.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionimpl.h"
 #endif
 //#include "connectioneditor.h"
diff --git a/tools/designer/designer/mainwindowactions.cpp b/tools/designer/designer/mainwindowactions.cpp
index 2a5bf1c0c..d7519f61a 100644
--- a/tools/designer/designer/mainwindowactions.cpp
+++ b/tools/designer/designer/mainwindowactions.cpp
@@ -74,7 +74,7 @@
 #include "pixmapcollectioneditor.h"
 #include "styledbutton.h"
 #include "customwidgeteditorimpl.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionsimpl.h"
 #include "dbconnectionimpl.h"
 #endif
@@ -819,7 +819,7 @@ void MainWindow::setupProjectActions()
     connect( this, SIGNAL( hasNonDummyProject(bool) ), actionEditPixmapCollection, SLOT( setEnabled(bool) ) );
     actionEditPixmapCollection->addTo( projectMenu );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQAction* actionEditDatabaseConnections = new TQAction( tr( "Database Connections..." ), TQPixmap(),
 						 tr( "&Database Connections..." ), 0, this, 0 );
     actionEditDatabaseConnections->setStatusTip( tr("Opens a dialog for editing the current project's database connections") );
@@ -1853,7 +1853,7 @@ void MainWindow::editPixmapCollection()
 
 void MainWindow::editDatabaseConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnectionsEditor dia( currentProject, this, 0, TRUE );
     dia.exec();
 #endif
diff --git a/tools/designer/designer/project.cpp b/tools/designer/designer/project.cpp
index ec322f13e..aadadc82f 100644
--- a/tools/designer/designer/project.cpp
+++ b/tools/designer/designer/project.cpp
@@ -36,7 +36,7 @@
 #include "designerappiface.h"
 #include "../interfaces/languageinterface.h"
 #include "pixmapcollection.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "dbconnectionimpl.h"
 #endif
 #include "resource.h"
@@ -55,7 +55,7 @@
 #include "mainwindow.h"
 #include 
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include 
 #include 
 #include 
@@ -66,7 +66,7 @@
 # include 
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DatabaseConnection::~DatabaseConnection()
 {
     delete iface;
@@ -74,7 +74,7 @@ DatabaseConnection::~DatabaseConnection()
 
 bool DatabaseConnection::refreshCatalog()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( loaded )
 	return TRUE;
     if ( !open() )
@@ -96,7 +96,7 @@ bool DatabaseConnection::refreshCatalog()
 #endif
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void DatabaseConnection::remove()
 {
     if ( nm == "(default)" )
@@ -110,7 +110,7 @@ void DatabaseConnection::remove()
 
 bool DatabaseConnection::open( bool suppressDialog )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     // register our name, if nec
     if ( nm == "(default)" ) {
 	if ( !TQSqlDatabase::contains() ) // default doesn't exists?
@@ -183,7 +183,7 @@ void DatabaseConnection::close()
 {
     if ( !loaded )
 	return;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( conn ) {
 	conn->close();
     }
@@ -241,7 +241,7 @@ void Project::setModified( bool b )
     emit projectModified();
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 DatabaseConnection *Project::databaseConnection( const TQString &name )
 {
     for ( DatabaseConnection *conn = dbConnections.first();
@@ -818,21 +818,21 @@ void Project::save( bool onlyProjectFile )
     }
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQPtrList Project::databaseConnections() const
 {
     return dbConnections;
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::setDatabaseConnections( const TQPtrList &lst )
 {
     dbConnections = lst;
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::addDatabaseConnection( DatabaseConnection *conn )
 {
     dbConnections.append( conn );
@@ -840,7 +840,7 @@ void Project::addDatabaseConnection( DatabaseConnection *conn )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 void Project::removeDatabaseConnection( const TQString &c )
 {
     for ( DatabaseConnection *conn = dbConnections.first(); conn; conn = dbConnections.next() ) {
@@ -854,7 +854,7 @@ void Project::removeDatabaseConnection( const TQString &c )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseConnectionList()
 {
     TQStringList lst;
@@ -864,7 +864,7 @@ TQStringList Project::databaseConnectionList()
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseTableList( const TQString &connection )
 {
     DatabaseConnection *conn = databaseConnection( connection );
@@ -875,7 +875,7 @@ TQStringList Project::databaseTableList( const TQString &connection )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 TQStringList Project::databaseFieldList( const TQString &connection, const TQString &table )
 {
     DatabaseConnection *conn = databaseConnection( connection );
@@ -885,7 +885,7 @@ TQStringList Project::databaseFieldList( const TQString &connection, const TQStr
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static TQString makeIndent( int indent )
 {
     TQString s;
@@ -894,7 +894,7 @@ static TQString makeIndent( int indent )
 }
 #endif
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static void saveSingleProperty( TQTextStream &ts, const TQString& name, const TQString& value, int indent )
 {
     ts << makeIndent( indent ) << "" << endl;
@@ -907,7 +907,7 @@ static void saveSingleProperty( TQTextStream &ts, const TQString& name, const TQ
 
 void Project::saveConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( dbFile.isEmpty() ) {
 	TQFileInfo fi( fileName() );
 	setDatabaseDescription( fi.baseName() + ".db" );
@@ -974,7 +974,7 @@ void Project::saveConnections()
 #endif
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static TQDomElement loadSingleProperty( TQDomElement e, const TQString& name )
 {
     TQDomElement n;
@@ -990,7 +990,7 @@ static TQDomElement loadSingleProperty( TQDomElement e, const TQString& name )
 
 void Project::loadConnections()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( dbFile.isEmpty() || !TQFile::exists( makeAbsolute( dbFile ) ) )
 	return;
 
@@ -1061,7 +1061,7 @@ can be closed again with closeDatabase().
 
 bool Project::openDatabase( const TQString &connection, bool suppressDialog )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = databaseConnection( connection );
     if ( connection.isEmpty() && !conn )
 	conn = databaseConnection( "(default)" );
@@ -1080,7 +1080,7 @@ bool Project::openDatabase( const TQString &connection, bool suppressDialog )
 */
 void Project::closeDatabase( const TQString &connection )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DatabaseConnection *conn = databaseConnection( connection );
     if ( connection.isEmpty() && !conn )
 	conn = databaseConnection( "(default)" );
diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h
index 810e5b005..f5c6f1485 100644
--- a/tools/designer/designer/project.h
+++ b/tools/designer/designer/project.h
@@ -54,14 +54,14 @@ struct DesignerDatabase;
 class PixmapCollection;
 class Project;
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 class TQSqlDatabase;
 
 class DatabaseConnection
 {
 public:
     DatabaseConnection( Project *p ) :
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	conn( 0 ),
 #endif
 	project( p ), loaded( FALSE ), iface( 0 ) {}
@@ -93,7 +93,7 @@ public:
     TQStringList tables() const { return tbls; }
     TQStringList fields( const TQString& t ) { return flds[t]; }
     TQMap fields() { return flds; }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase* connection() const { return conn; }
     void remove();
 #endif
@@ -105,7 +105,7 @@ private:
     int prt;
     TQStringList tbls;
     TQMap flds;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQSqlDatabase *conn;
 #endif
     Project *project;
@@ -150,7 +150,7 @@ public:
 
     void save( bool onlyProjectFile = FALSE );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList databaseConnections() const;
     void setDatabaseConnections( const TQPtrList &lst );
     void addDatabaseConnection( DatabaseConnection *conn );
@@ -255,7 +255,7 @@ private:
     TQString proName;
     TQString desc;
     TQString dbFile;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQPtrList dbConnections;
 #endif
     TQString lang;
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index 27f9bfeb5..b3448a8d0 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -2012,7 +2012,7 @@ void PropertyDatabaseItem::createChildren()
 
 void PropertyDatabaseItem::initChildren()
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     PropertyItem *item = 0;
     TQStringList lst = value().toStringList();
     TQString conn, table;
@@ -2114,7 +2114,7 @@ bool PropertyDatabaseItem::hasSubItems() const
 
 void PropertyDatabaseItem::childValueChanged( PropertyItem *c )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     TQStringList lst;
     lst << ( (PropertyListItem*)PropertyItem::child( 0 ) )->currentItem()
 	<< ( (PropertyListItem*)PropertyItem::child( 1 ) )->currentItem();
@@ -3008,7 +3008,7 @@ static TQVariant::Type type_to_variant( const TQString &s )
     return TQVariant::Invalid;
 }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 static bool parent_is_data_aware( TQWidget *w )
 {
     TQWidget *p = w ? w->parentWidget() : 0;
@@ -3270,7 +3270,7 @@ void PropertyList::setupProperties()
 	    item->setChanged( TRUE, FALSE );
     }
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !::tqt_cast(editor->widget()) && !::tqt_cast(editor->widget()) &&
 	 !::tqt_cast(editor->widget()) && parent_is_data_aware( ::tqt_cast(editor->widget()) ) ) {
 	item = new PropertyDatabaseItem( this, item, 0, "database", editor->formWindow()->mainContainer() != w );
diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp
index 2866e4037..682da9e8a 100644
--- a/tools/designer/designer/resource.cpp
+++ b/tools/designer/designer/resource.cpp
@@ -33,7 +33,7 @@
 
 #include "actiondnd.h"
 #include "command.h"
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 #include "formfile.h"
@@ -70,7 +70,7 @@
 #include 
 #include 
 #include 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include 
 #include 
 #endif
@@ -1214,12 +1214,12 @@ void Resource::saveItems( TQObject *obj, TQTextStream &ts, int indent )
 	}
 	saveItem( lv->firstChild(), ts, indent - 1 );
     }
-#if !defined (QT_NO_TABLE)
+#if !defined (TQT_NO_TABLE)
     else if ( ::tqt_cast(obj) ) {
 	TQTable *table = (TQTable*)obj;
 	int i;
 	TQMap columnFields = MetaDataBase::columnFields( table );
-#  ifndef QT_NO_SQL
+#  ifndef TQT_NO_SQL
 	bool isDataTable = ::tqt_cast(table);
 #  else
         bool isDataTable = false;
@@ -1998,7 +1998,7 @@ void Resource::createColumn( const TQDomElement &e, TQWidget *widget )
 	if ( !resizable )
 	    lv->header()->setResizeEnabled( resizable, i );
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     else if ( ::tqt_cast(widget) ) {
 	TQTable *table = (TQTable*)widget;
 	bool isRow;
diff --git a/tools/designer/designer/styledbutton.cpp b/tools/designer/designer/styledbutton.cpp
index 64c55b481..c60c0944d 100644
--- a/tools/designer/designer/styledbutton.cpp
+++ b/tools/designer/designer/styledbutton.cpp
@@ -223,7 +223,7 @@ void StyledButton::mousePressEvent(TQMouseEvent* e)
 void StyledButton::mouseMoveEvent(TQMouseEvent* e)
 {
     TQButton::mouseMoveEvent( e );
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     if ( !mousePressed )
 	return;
     if ( ( pressPos - e->pos() ).manhattanLength() > TQApplication::startDragDistance() ) {
@@ -250,7 +250,7 @@ void StyledButton::mouseMoveEvent(TQMouseEvent* e)
 #endif
 }
 
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
 void StyledButton::dragEnterEvent( TQDragEnterEvent *e )
 {
     setFocus();
@@ -299,4 +299,4 @@ void StyledButton::dropEvent( TQDropEvent *e )
 	e->ignore();
     }
 }
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
diff --git a/tools/designer/designer/styledbutton.h b/tools/designer/designer/styledbutton.h
index 81cc634be..3c11cf1fb 100644
--- a/tools/designer/designer/styledbutton.h
+++ b/tools/designer/designer/styledbutton.h
@@ -85,12 +85,12 @@ signals:
 protected:
     void mousePressEvent(TQMouseEvent*);
     void mouseMoveEvent(TQMouseEvent*);
-#ifndef QT_NO_DRAGANDDROP
+#ifndef TQT_NO_DRAGANDDROP
     void dragEnterEvent ( TQDragEnterEvent * );
     void dragMoveEvent ( TQDragMoveEvent * );
     void dragLeaveEvent ( TQDragLeaveEvent * );
     void dropEvent ( TQDropEvent * );
-#endif // QT_NO_DRAGANDDROP
+#endif // TQT_NO_DRAGANDDROP
     void drawButton( TQPainter* );
     void drawButtonLabel( TQPainter* );
     void resizeEvent( TQResizeEvent* );
diff --git a/tools/designer/designer/tableeditorimpl.cpp b/tools/designer/designer/tableeditorimpl.cpp
index ecb6bec39..34100071e 100644
--- a/tools/designer/designer/tableeditorimpl.cpp
+++ b/tools/designer/designer/tableeditorimpl.cpp
@@ -32,7 +32,7 @@
 **********************************************************************/
 
 #include "tableeditorimpl.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include 
 #endif
 #include "formwindow.h"
@@ -53,17 +53,17 @@
 
 TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *fw, const char* name, bool modal, WFlags fl )
     : TableEditorBase( parent, name, modal, fl ),
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     editTable( (TQTable*)editWidget ),
 #endif
     formWindow( fw )
 {
     connect( buttonHelp, SIGNAL( clicked() ), MainWindow::self, SLOT( showDialogHelp() ) );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     labelColumnPixmap->setText( "" );
     labelRowPixmap->setText( "" );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( !::tqt_cast(editTable) ) 
 #endif
     {
@@ -72,7 +72,7 @@ TableEditor::TableEditor( TQWidget* parent,  TQWidget *editWidget, FormWindow *f
 	labelTable->hide();
 	labelTableValue->hide();
     }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( ::tqt_cast(editTable) ) {
 	// ## why does this behave weird?
 	//	TabWidget->removePage( rows_tab );
@@ -126,7 +126,7 @@ void TableEditor::columnTextChanged( const TQString &s )
     listColumns->blockSignals( TRUE );
     listColumns->changeItem( s, listColumns->currentItem() );
     listColumns->blockSignals( FALSE );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     if ( table->horizontalHeader()->iconSet( listColumns->currentItem() ) )
 	table->horizontalHeader()->setLabel( listColumns->currentItem(),
 					     *table->horizontalHeader()->iconSet( listColumns->currentItem() ), s );
@@ -163,7 +163,7 @@ void TableEditor::currentColumnChanged( TQListBoxItem *i )
 	labelColumnPixmap->setText( "" );
     editColumnText->blockSignals( FALSE );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( ::tqt_cast(editTable) ) {
 	TQString s = *fieldMap.find( listColumns->index( i ) );
 	if ( s.isEmpty() )
@@ -206,7 +206,7 @@ void TableEditor::deleteColumnClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() - 1 );
     delete listColumns->item( listColumns->currentItem() );
     readColumns();
@@ -221,7 +221,7 @@ void TableEditor::deleteRowClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() - 1 );
     delete listRows->item( listRows->currentItem() );
     readRows();
@@ -234,7 +234,7 @@ void TableEditor::deleteRowClicked()
 
 void TableEditor::newColumnClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumCols( table->numCols() + 1 );
     TQMap m;
     for ( int i = 0; i < table->numCols() - 1; ++i )
@@ -248,7 +248,7 @@ void TableEditor::newColumnClicked()
     TQListBoxItem *item = listColumns->item( listColumns->count() - 1 );
     listColumns->setCurrentItem( item );
     listColumns->setSelected( item, TRUE );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( ::tqt_cast(editTable) ) {
 	comboFields->setFocus();
     } else
@@ -262,7 +262,7 @@ void TableEditor::newColumnClicked()
 
 void TableEditor::newRowClicked()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->setNumRows( table->numRows() + 1 );
     TQMap m;
     for ( int i = 0; i < table->numRows() - 1; ++i )
@@ -303,7 +303,7 @@ void TableEditor::rowTextChanged( const TQString &s )
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     listRows->blockSignals(TRUE);
     listRows->changeItem( s, listRows->currentItem() );
     listRows->blockSignals(FALSE);
@@ -334,7 +334,7 @@ void TableEditor::applyClicked()
     TQValueList cols;
 
     int i = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( i = 0; i < table->horizontalHeader()->count(); ++i ) {
 	PopulateTableCommand::Column col;
 	col.text = table->horizontalHeader()->label( i );
@@ -370,7 +370,7 @@ void TableEditor::chooseRowPixmapClicked()
     if ( pix.isNull() )
 	return;
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), pix, table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( pix, listRows->currentText(), listRows->currentItem() );
 #endif
@@ -380,7 +380,7 @@ void TableEditor::deleteRowPixmapClicked()
 {
     if ( listRows->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->verticalHeader()->setLabel( listRows->currentItem(), TQPixmap(), table->verticalHeader()->label( listRows->currentItem() ) );
     listRows->changeItem( listRows->currentText(), listRows->currentItem() );
 #endif
@@ -398,7 +398,7 @@ void TableEditor::chooseColPixmapClicked()
 
     if ( pix.isNull() )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), pix, table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( pix, listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -408,7 +408,7 @@ void TableEditor::deleteColPixmapClicked()
 {
     if ( listColumns->currentItem() == -1 )
 	return;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     table->horizontalHeader()->setLabel( listColumns->currentItem(), TQPixmap(), table->horizontalHeader()->label( listColumns->currentItem() ) );
     listColumns->changeItem( listColumns->currentText(), listColumns->currentItem() );
 #endif
@@ -416,7 +416,7 @@ void TableEditor::deleteColPixmapClicked()
 
 void TableEditor::readFromTable()
 {
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     TQHeader *cols = editTable->horizontalHeader();
     table->setNumCols( cols->count() );
     TQMap columnFields = MetaDataBase::columnFields( editTable );
@@ -463,7 +463,7 @@ void TableEditor::readFromTable()
 void TableEditor::readColumns()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listColumns->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->horizontalHeader()->setLabel( j, *i->pixmap(), i->text() );
@@ -476,7 +476,7 @@ void TableEditor::readColumns()
 void TableEditor::readRows()
 {
     int j = 0;
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     for ( TQListBoxItem *i = listRows->firstItem(); i; i = i->next(), ++j ) {
 	if ( i->pixmap() )
 	    table->verticalHeader()->setLabel( j, *i->pixmap(), i->text() );
diff --git a/tools/designer/designer/widgetfactory.cpp b/tools/designer/designer/widgetfactory.cpp
index 97f3332e0..53fa747c4 100644
--- a/tools/designer/designer/widgetfactory.cpp
+++ b/tools/designer/designer/widgetfactory.cpp
@@ -45,7 +45,7 @@
 #include "formwindow.h"
 #include "multilineeditorimpl.h"
 #include "../interfaces/widgetinterface.h"
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include "tableeditorimpl.h"
 #endif
 #include "project.h"
@@ -57,10 +57,10 @@
 #include 
 #include 
 #include 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include 
 #endif
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include 
 #endif
 #include 
@@ -95,7 +95,7 @@
 #include 
 #include 
 #include 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "database.h"
 #endif
 
@@ -735,7 +735,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	    return new TQButtonGroup( TQString::fromLatin1( name ), parent, name );
 	return new TQButtonGroup( parent, name );
     } else if ( className == "TQIconView" ) {
-#if !defined(QT_NO_ICONVIEW)
+#if !defined(TQT_NO_ICONVIEW)
 	TQIconView* iv = new TQIconView( parent, name );
 	if ( init )
 	    (void) new TQIconViewItem( iv, MainWindow::tr( "New Item" ) );
@@ -744,17 +744,17 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	return 0;
 #endif
     } else if ( className == "TQTable" ) {
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
 	if ( init )
 	    return new TQTable( 3, 3, parent, name );
 	return new TQTable( parent, name );
 #else
 	return 0;
 #endif
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     } else if ( className == "TQDataTable" ) {
 	return new TQDataTable( parent, name );
-#endif //QT_NO_SQL
+#endif //TQT_NO_SQL
     } else if ( className == "TQDateEdit" ) {
 	return new TQDateEdit( parent, name );
     } else if ( className == "TQTimeEdit" ) {
@@ -966,7 +966,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare
 	MetaDataBase::addEntry( w );
 	return tb;
     }
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     else if ( className == "TQDataBrowser" ) {
 	TQWidget *w = new TQDesignerDataBrowser( parent, name );
 	if ( parent )
@@ -1259,7 +1259,7 @@ const char* WidgetFactory::classNameOf( TQObject* o )
 	return "TQPopupMenu";
     else if ( ::tqt_cast(o) )
 	return "TQToolBox";
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     else if ( ::tqt_cast(o) )
 	return "TQDataBrowser";
     else if ( ::tqt_cast(o) )
@@ -1343,9 +1343,9 @@ void WidgetFactory::initChangedProperties( TQObject *o )
 	MetaDataBase::setPropertyChanged( o, "itemIconSet", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemToolTip", TRUE );
 	MetaDataBase::setPropertyChanged( o, "itemBackgroundMode", TRUE );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     } else if ( ::tqt_cast(o) ) {
-#  ifndef QT_NO_SQL
+#  ifndef TQT_NO_SQL
         if (!::tqt_cast(o) )
 #  endif
         {
@@ -1455,7 +1455,7 @@ void WidgetFactory::editWidget( int id, TQWidget *parent, TQWidget *editWidget,
 	delete e;
 	return;
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     if (::tqt_cast(editWidget) != 0) {
 	TableEditor *e = new TableEditor( parent, editWidget, fw );
 	e->exec();
diff --git a/tools/designer/plugins/wizards/main.cpp b/tools/designer/plugins/wizards/main.cpp
index 5060ec7ee..159252a42 100644
--- a/tools/designer/plugins/wizards/main.cpp
+++ b/tools/designer/plugins/wizards/main.cpp
@@ -35,7 +35,7 @@
 #include 
 #include 
 #include 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include "sqlformwizardimpl.h"
 #endif
 #include "mainwindowwizard.h"
@@ -88,7 +88,7 @@ bool StandardTemplateWizardInterface::canUnload() const
 TQStringList StandardTemplateWizardInterface::featureList() const
 {
     TQStringList list;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     list << "TQDataBrowser" << "TQDesignerDataBrowser" << "TQDataView" << \
 	"TQDesignerDataView" << "TQDataTable";
 #endif
@@ -100,7 +100,7 @@ TQStringList StandardTemplateWizardInterface::featureList() const
 void StandardTemplateWizardInterface::setup( const TQString &templ, TQWidget *widget, DesignerFormWindow *fw, TQUnknownInterface *aIface )
 {
     inUse = TRUE;
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     if ( templ == "TQDesignerDataView" ||
 	 templ == "TQDesignerDataBrowser" ||
 	 templ == "TQDataView" ||
diff --git a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
index 40c54e04d..5da841fe6 100644
--- a/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
+++ b/tools/designer/plugins/wizards/sqlformwizardimpl.cpp
@@ -50,7 +50,7 @@
 #include 
 #include 
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include 
 #include 
 #include 
@@ -154,7 +154,7 @@ void SqlFormWizard::autoPopulate( bool populate )
 		// remove primary index fields, if any
 		listBoxSortField->insertStringList( lst );
 		d->open( FALSE );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 		TQSqlCursor tab( listBoxTable->currentText(), TRUE, d->connection() );
 		TQSqlIndex pIdx = tab.primaryIndex();
 		for ( uint i = 0; i < pIdx.count(); i++ ) {
@@ -323,7 +323,7 @@ void SqlFormWizard::accept()
     if ( !appIface || mode == None )
 	return;
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     DesignerProject *proIface = (DesignerProject*)( (DesignerInterface*)appIface )->currentProject();
     if ( !widget || !proIface ) {
 	SqlFormWizardBase::accept();
diff --git a/tools/designer/shared/widgetdatabase.cpp b/tools/designer/shared/widgetdatabase.cpp
index bdda59323..baa3c1be5 100644
--- a/tools/designer/shared/widgetdatabase.cpp
+++ b/tools/designer/shared/widgetdatabase.cpp
@@ -240,7 +240,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     append( r );
 
-#if !defined(QT_NO_ICONVIEW) || defined(UIC)
+#if !defined(TQT_NO_ICONVIEW) || defined(UIC)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_iconview.png";
     r->name = "TQIconView";
@@ -250,7 +250,7 @@ void WidgetDatabase::setupDataBase( int id )
     append( r );
 #endif
 
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_table.png";
     r->name = "TQTable";
@@ -260,7 +260,7 @@ void WidgetDatabase::setupDataBase( int id )
     append( r );
 #endif
 
-#if !defined(QT_NO_SQL)
+#if !defined(TQT_NO_SQL)
     r = new WidgetDatabaseRecord;
     r->iconSet = "designer_datatable.png";
     r->includeFile = "ntqdatatable.h";
@@ -548,7 +548,7 @@ void WidgetDatabase::setupDataBase( int id )
 
     append( r );
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     r = new WidgetDatabaseRecord;
     r->iconSet = "";
     r->name = "TQDataBrowser";
diff --git a/tools/designer/uic/embed.cpp b/tools/designer/uic/embed.cpp
index b43233d16..937e1cce6 100644
--- a/tools/designer/uic/embed.cpp
+++ b/tools/designer/uic/embed.cpp
@@ -43,8 +43,8 @@
 // on embedded, we do not compress image data. Rationale: by mapping
 // the ready-only data directly into memory we are both faster and
 // more memory efficient
-#if defined(Q_WS_QWS) && !defined(QT_NO_IMAGE_COLLECTION_COMPRESSION)
-#define QT_NO_IMAGE_COLLECTION_COMPRESSION
+#if defined(Q_WS_QWS) && !defined(TQT_NO_IMAGE_COLLECTION_COMPRESSION)
+#define TQT_NO_IMAGE_COLLECTION_COMPRESSION
 #endif
 
 struct EmbedImage
@@ -56,7 +56,7 @@ struct EmbedImage
     TQString name;
     TQString cname;
     bool alpha;
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
     ulong compressed;
 #endif
 };
@@ -77,7 +77,7 @@ static TQString convertToCIdentifier( const char *s )
 
 static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
 {
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
     TQByteArray bazip( tqCompress( input, nbytes ) );
     ulong len = bazip.size();
 #else
@@ -92,7 +92,7 @@ static ulong embedData( TQTextStream& out, const uchar* input, int nbytes )
 	    s.truncate( 0 );
 	}
 	uint v = (uchar)
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 		 bazip
 #else
 		 input
@@ -176,7 +176,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	    img = img.convertBitOrder(TQImage::BigEndian);
 	out << s.sprintf( "static const unsigned char %s_data[] = {",
 			  (const char *)e->cname );
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 	e->compressed =
 #endif
 	    embedData( out, img.bits(), img.numBytes() );
@@ -193,7 +193,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	out << "static struct EmbedImage {\n"
 	    "    int width, height, depth;\n"
 	    "    const unsigned char *data;\n"
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 	    "    ulong compressed;\n"
 #endif
 	    "    int numColors;\n"
@@ -208,7 +208,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 		<< e->height << ", "
 		<< e->depth << ", "
 		<< "(const unsigned char*)" << e->cname << "_data, "
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 		<< e->compressed << ", "
 #endif
 		<< e->numColors << ", ";
@@ -223,7 +223,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	    out << "\"" << e->name << "\" },\n";
 	    e = list_image.next();
 	}
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 	out << "    { 0, 0, 0, 0, 0, 0, 0, 0, 0 }\n};\n";
 #else
 	out << "    { 0, 0, 0, 0, 0, 0, 0, 0 }\n};\n";
@@ -234,7 +234,7 @@ void Uic::embed( TQTextStream& out, const char* project, const TQStringList& ima
 	    "{\n"
 	    "    for ( int i=0; embed_image_vec[i].data; i++ ) {\n"
 	    "	if ( TQString::fromUtf8(embed_image_vec[i].name) == name ) {\n"
-#ifndef QT_NO_IMAGE_COLLECTION_COMPRESSION
+#ifndef TQT_NO_IMAGE_COLLECTION_COMPRESSION
 	    "	    TQByteArray baunzip;\n"
 	    "	    baunzip = tqUncompress( embed_image_vec[i].data, \n"
 	    "		embed_image_vec[i].compressed );\n"
diff --git a/tools/designer/uilib/ntqwidgetfactory.h b/tools/designer/uilib/ntqwidgetfactory.h
index 99095d07d..5b7e97c3f 100644
--- a/tools/designer/uilib/ntqwidgetfactory.h
+++ b/tools/designer/uilib/ntqwidgetfactory.h
@@ -88,7 +88,7 @@ private:
     void createListViewColumn( TQListView *lv, const TQString& txt,
 			       const TQPixmap& pix, bool clickable,
 			       bool resizable );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     void createTableColumnOrRow( TQTable *table, const TQString& txt,
 				 const TQPixmap& pix, const TQString& field,
 				 bool isRow );
diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp
index 9cb6eeaa8..a0bc08523 100644
--- a/tools/designer/uilib/qwidgetfactory.cpp
+++ b/tools/designer/uilib/qwidgetfactory.cpp
@@ -52,7 +52,7 @@
 #include 
 #include 
 
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 #include 
 #include 
 #include 
@@ -67,7 +67,7 @@
 #include 
 #include 
 #include 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 #include 
 #endif
 #include 
@@ -359,7 +359,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge
     widgetFactory->loadExtraSource();
 
     if ( widgetFactory->toplevel ) {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	TQMap::Iterator cit = widgetFactory->sqlWidgetConnections.begin();
 	for( ; cit != widgetFactory->sqlWidgetConnections.end(); ++cit ) {
 	    if ( widgetFactory->noDatabaseWidgets.find( cit.key()->name() ) !=
@@ -777,7 +777,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings,
 	if ( parent->inherits("TQListView") ) {
 	    createListViewColumn( (TQListView *) parent, text, pixmap, clickable,
 				  resizable );
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 	} else if ( parent->inherits("TQTable") ) {
 	    createTableColumnOrRow( (TQTable *) parent, text, pixmap, field,
 				    isRow );
@@ -870,7 +870,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in,
 		} else {
 		    (void) new TQListBoxPixmap( listBox, pixmap, text );
 		}
-    #ifndef QT_NO_ICONVIEW
+    #ifndef TQT_NO_ICONVIEW
 	    } else if ( parent->inherits("TQIconView") ) {
 		(void) new TQIconViewItem( (TQIconView *) parent, text, pixmap );
     #endif
@@ -1434,11 +1434,11 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa
     } else if ( className == "TQButtonGroup" ) {
 	return new TQButtonGroup( parent, name );
     } else if ( className == "TQIconView" ) {
-#if !defined(QT_NO_ICONVIEW)
+#if !defined(TQT_NO_ICONVIEW)
 	return new TQIconView( parent, name );
 #endif
     } else if ( className == "TQTable" ) {
-#if !defined(QT_NO_TABLE)
+#if !defined(TQT_NO_TABLE)
 	return new TQTable( parent, name );
 #endif
     } else if ( className == "TQListBox" ) {
@@ -1523,7 +1523,7 @@ TQWidget *TQWidgetFactory::createWidget( const TQString &className, TQWidget *pa
 	return mw;
 
     }
-#if !defined(QT_NO_SQL)
+#if !defined(TQT_NO_SQL)
     else if ( className == "TQDataTable" ) {
 	return new TQDataTable( parent, name );
     } else if ( className == "TQDataBrowser" ) {
@@ -1863,7 +1863,7 @@ void TQWidgetFactory::setProperty( TQObject* obj, const TQString &prop,
 	    } else if ( prop == "buttonGroupId" ) {
 		if ( obj->inherits( "TQButton" ) && obj->parent()->inherits( "TQButtonGroup" ) )
 		    ( (TQButtonGroup*)obj->parent() )->insert( (TQButton*)obj, value.toInt() );
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	    } else if ( prop == "database" && !obj->inherits( "TQDataView" )
 		 && !obj->inherits( "TQDataBrowser" ) ) {
 		const TQStringList& lst = value.asStringList();
@@ -2217,18 +2217,18 @@ void TQWidgetFactory::createListViewColumn( TQListView *lv, const TQString& txt,
 	lv->header()->setResizeEnabled( resizable, i );
 }
 
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
 void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& txt,
 					     const TQPixmap& pix,
 					     const TQString& field, bool isRow )
 {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
     bool isSql = table->inherits( "TQDataTable" );
 #endif
     if ( isRow )
 	table->setNumRows( table->numRows() + 1 );
     else {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( !isSql )
 #endif
 	    table->setNumCols( table->numCols() + 1 );
@@ -2243,14 +2243,14 @@ void TQWidgetFactory::createTableColumnOrRow( TQTable *table, const TQString& tx
     int i = isRow ? table->numRows() - 1 : table->numCols() - 1;
     TQHeader *h = !isRow ? table->horizontalHeader() : table->verticalHeader();
     if ( !pix.isNull() ) {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( isSql )
 	    ((TQDataTable*)table)->addColumn( field, txt, -1, pix );
 	else
 #endif
 	    h->setLabel( i, pix, txt );
     } else {
-#ifndef QT_NO_SQL
+#ifndef TQT_NO_SQL
 	if ( isSql )
 	    ((TQDataTable*)table)->addColumn( field, txt );
 	else
@@ -2290,7 +2290,7 @@ void TQWidgetFactory::createColumn( const TQDomElement &e, TQWidget *widget )
 	}
 	createListViewColumn( lv, txt, pix, clickable, resizable );
     }
-#ifndef QT_NO_TABLE
+#ifndef TQT_NO_TABLE
     else if ( widget->inherits( "TQTable" ) ) {
 	TQTable *table = (TQTable*)widget;
 
@@ -2361,7 +2361,7 @@ void TQWidgetFactory::createItem( const TQDomElement &e, TQWidget *widget, TQLis
 	} else {
 	    new TQListBoxText( lb, txt );
 	}
-#ifndef QT_NO_ICONVIEW
+#ifndef TQT_NO_ICONVIEW
     } else if ( widget->inherits( "TQIconView" ) ) {
 	TQDomElement n = e.firstChild().toElement();
 	TQPixmap pix;
diff --git a/tools/qconfig/main.cpp b/tools/qconfig/main.cpp
index 4e46f0de1..9eefed74f 100644
--- a/tools/qconfig/main.cpp
+++ b/tools/qconfig/main.cpp
@@ -185,7 +185,7 @@ public:
     TQString id;
     ChoiceItem(const TQString& i, TQListViewItem* parent) :
 	TQCheckListItem(parent,
-	    i.mid(6), // strip "QT_NO_" as we reverse the logic
+	    i.mid(6), // strip "TQT_NO_" as we reverse the logic
 	    CheckBox),
 	id(i)
     {
@@ -402,7 +402,7 @@ void Main::loadFeatures(const TQString& filename)
 	return;
     }
     TQTextStream s(&file);
-    TQRegExp qt_no_xxx("QT_NO_[A-Z_0-9]*");
+    TQRegExp qt_no_xxx("TQT_NO_[A-Z_0-9]*");
     TQStringList sections;
 
 #if 1
@@ -569,7 +569,7 @@ void Main::loadConfig(const TQString& filename)
 	return;
     }
     TQTextStream s(&file);
-    TQRegExp qt_no_xxx("QT_NO_[A-Z_0-9]*");
+    TQRegExp qt_no_xxx("TQT_NO_[A-Z_0-9]*");
 
     for (TQStringList::Iterator ch = choices.begin(); ch != choices.end(); ++ch) {
 	item[*ch]->setDefined(FALSE);
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 07c2f92ad..ed7992df9 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -382,7 +382,7 @@ MainWindow::MainWindow()
     inputStyleLabel->hide();
 #endif
 
-#if defined(Q_WS_X11) && !defined(QT_NO_IM_EXTENSIONS)
+#if defined(Q_WS_X11) && !defined(TQT_NO_IM_EXTENSIONS)
     /*
         This code makes it possible to set up default input method.
 
@@ -519,7 +519,7 @@ void MainWindow::fileSave()
 	    str = "Root";
         settings.writeEntry( "/qt/XIMInputStyle", inputStyle->currentText() );
 
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM_EXTENSIONS)
 	TQString imSwitcher = settings.readEntry("/qt/DefaultInputMethodSwitcher", "imsw-multi");
 	settings.writeEntry("/qt/DefaultInputMethodSwitcher", imSwitcher);
 	int imIndex = inputMethodCombo->currentItem();
diff --git a/tools/tqvfb/README b/tools/tqvfb/README
index 5fded7912..63beaa45a 100644
--- a/tools/tqvfb/README
+++ b/tools/tqvfb/README
@@ -15,7 +15,7 @@ framebuffer.
 
 To use the virtual framebuffer:
 
-1. Ensure QT_NO_QWS_VFB is not set in ntqconfig.h (when you configure Qt,
+1. Ensure TQT_NO_QWS_VFB is not set in ntqconfig.h (when you configure Qt,
    add the -tqvfb option).
 2. Start tqvfb (tqvfb should be compiled as a normal Qt/X11 application,
    NOT as a Qt/Embedded application!).
@@ -51,5 +51,5 @@ Then for each button region the format is:
 
 The virtual framebuffer is a development tool only.  No security issues have
 been considered in the virtual framebuffer design.  It should not be used
-in a production environment and QT_NO_QWS_VFB should always be in force
+in a production environment and TQT_NO_QWS_VFB should always be in force
 in production libraries.
diff --git a/tools/tqvfb/tqvfbview.cpp b/tools/tqvfb/tqvfbview.cpp
index 3ede4b656..f96df8ca1 100644
--- a/tools/tqvfb/tqvfbview.cpp
+++ b/tools/tqvfb/tqvfbview.cpp
@@ -32,9 +32,9 @@
 **********************************************************************/
 
 #include "ntqglobal.h"
-#if !defined( Q_WS_QWS ) || defined( QT_NO_QWS_MULTIPROCESS )
+#if !defined( Q_WS_QWS ) || defined( TQT_NO_QWS_MULTIPROCESS )
 #define TQLock TQWSSemaphore
-#undef QT_NO_QWS_MULTIPROCESS
+#undef TQT_NO_QWS_MULTIPROCESS
 #include "../../src/kernel/qlock.cpp"
 #else
 #include "qlock_p.h"
-- 
cgit v1.2.1