From 8eb500c4e81229a9853e2f9bac4f39450083f3d7 Mon Sep 17 00:00:00 2001
From: Michele Calgaro <michele.calgaro@yahoo.it>
Date: Thu, 20 Jul 2023 15:36:09 +0900
Subject: Replace Q_OBJECT with TQ_OBJECT

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
---
 arts/kde/kartsdispatcher.h                         |  2 +-
 arts/kde/kartsfloatwatch.h                         |  2 +-
 arts/kde/kartsserver.h                             |  2 +-
 arts/kde/kaudioconverter.h                         |  2 +-
 arts/kde/kaudioplaystream.h                        |  2 +-
 arts/kde/kaudioplaystream_p.h                      |  2 +-
 arts/kde/kaudiorecordstream.h                      |  2 +-
 arts/kde/kaudiorecordstream_p.h                    |  2 +-
 arts/kde/kconverttest.h                            |  2 +-
 arts/kde/kdatarequest_impl.h                       |  2 +-
 arts/kde/kioinputstream_impl.h                     |  2 +-
 arts/kde/kplayobject.h                             |  4 ++--
 arts/kde/kplayobjectcreator.h                      |  2 +-
 arts/kde/kplayobjectfactory_p.h                    |  2 +-
 arts/kde/kvideowidget.h                            |  2 +-
 arts/kde/mcop-dcop/kmcop.h                         |  2 +-
 arts/knotify/knotify.h                             |  2 +-
 dcop/HOWTO                                         |  4 ++--
 dcop/Mainpage.dox                                  |  4 ++--
 dcop/dcop_deadlock_test.h                          |  2 +-
 dcop/dcopclient.h                                  |  2 +-
 dcop/dcopidl/scanner.ll                            |  1 -
 dcop/dcopidl2cpp/dcopidl_test.h                    |  6 ++---
 dcop/dcopidlng/kalyptus                            |  9 ++-----
 dcop/dcopserver.h                                  |  2 +-
 dcop/testdcop.h                                    |  4 ++--
 dcop/tests/driver.h                                |  2 +-
 dnssd/domainbrowser.h                              |  2 +-
 dnssd/publicservice.h                              |  2 +-
 dnssd/query.h                                      |  2 +-
 dnssd/remoteservice.h                              |  2 +-
 dnssd/responder.h                                  |  2 +-
 dnssd/servicebrowser.h                             |  2 +-
 interfaces/tdeimproxy/interface/kimiface.h         |  4 ++--
 interfaces/tdeimproxy/library/tdeimproxy.h         |  2 +-
 interfaces/tdemediaplayer/player.h                 |  2 +-
 .../tdefileaudiopreview/tdefileaudiopreview.h      |  2 +-
 interfaces/tdemediaplayer/view.h                   |  2 +-
 interfaces/tdescript/sample/shellscript.h          |  2 +-
 interfaces/tdescript/scriptclientinterface.h       |  2 +-
 interfaces/tdescript/scriptinterface.h             |  2 +-
 interfaces/tdescript/scriptloader.h                |  2 +-
 interfaces/tdescript/scriptmanager.h               |  2 +-
 .../tdetexteditor/configinterfaceextension.h       |  2 +-
 interfaces/tdetexteditor/document.h                |  2 +-
 interfaces/tdetexteditor/editor.h                  |  2 +-
 interfaces/tdetexteditor/editorchooser.h           |  4 ++--
 interfaces/tdetexteditor/plugin.h                  |  2 +-
 interfaces/tdetexteditor/view.h                    |  2 +-
 interfaces/terminal/test/main.h                    |  2 +-
 kab/addressbook.h                                  |  2 +-
 kab/kabapi.h                                       |  2 +-
 kab/qconfigDB.h                                    |  2 +-
 kate/interfaces/document.h                         |  6 ++---
 kate/interfaces/view.h                             |  2 +-
 kate/part/katearbitraryhighlight.h                 |  4 ++--
 kate/part/kateautoindent.h                         | 22 ++++++++---------
 kate/part/katebookmarks.h                          |  2 +-
 kate/part/katebuffer.h                             |  2 +-
 kate/part/katecodecompletion.h                     |  6 ++---
 kate/part/katecodefoldinghelpers.h                 |  2 +-
 kate/part/katedialogs.h                            | 26 ++++++++++----------
 kate/part/katedocument.h                           |  2 +-
 kate/part/katedocumenthelpers.h                    |  2 +-
 kate/part/katefiletype.h                           |  4 ++--
 kate/part/katehighlight.h                          |  4 ++--
 kate/part/kateprinter.h                            |  6 ++---
 kate/part/kateschema.h                             | 14 +++++------
 kate/part/katesearch.h                             |  4 ++--
 kate/part/katespell.h                              |  2 +-
 kate/part/katesupercursor.h                        |  6 ++---
 kate/part/katetemplatehandler.h                    |  2 +-
 kate/part/kateview.h                               |  2 +-
 kate/part/kateviewhelpers.h                        |  8 +++----
 kate/part/kateviewinternal.h                       |  2 +-
 kate/part/test_regression.h                        |  2 +-
 kate/plugins/autobookmarker/autobookmarker.h       |  6 ++---
 kate/plugins/insertfile/insertfileplugin.h         |  4 ++--
 kate/plugins/isearch/ISearchPlugin.h               |  4 ++--
 kate/plugins/kdatatool/kate_kdatatool.h            |  4 ++--
 kate/plugins/wordcompletion/docwordcompletion.h    |  6 ++---
 kded/kded.h                                        |  6 ++---
 kded/kdedmodule.h                                  |  2 +-
 kded/tdebuildsycoca.h                              |  2 +-
 kded/test/test.h                                   |  2 +-
 kded/vfolder_menu.h                                |  2 +-
 libtdescreensaver/tdescreensaver.h                 |  4 ++--
 networkstatus/connectionmanager.h                  |  2 +-
 networkstatus/networkstatus.h                      |  2 +-
 networkstatus/networkstatusindicator.h             |  2 +-
 networkstatus/testservice.h                        |  2 +-
 tdeabc/addressbook.h                               |  2 +-
 tdeabc/addresseedialog.h                           |  2 +-
 tdeabc/addresslineedit.h                           |  2 +-
 tdeabc/distributionlist.h                          |  2 +-
 tdeabc/distributionlistdialog.h                    |  4 ++--
 tdeabc/distributionlisteditor.h                    |  2 +-
 tdeabc/ldapclient.h                                |  4 ++--
 tdeabc/ldapconfigwidget.h                          |  2 +-
 tdeabc/lock.h                                      |  2 +-
 tdeabc/plugins/dir/resourcedir.h                   |  2 +-
 tdeabc/plugins/dir/resourcedirconfig.h             |  2 +-
 tdeabc/plugins/file/resourcefile.h                 |  2 +-
 tdeabc/plugins/file/resourcefileconfig.h           |  2 +-
 tdeabc/plugins/ldaptdeio/resourceldaptdeio.h       |  2 +-
 tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h |  6 ++---
 tdeabc/plugins/net/resourcenet.h                   |  2 +-
 tdeabc/plugins/net/resourcenetconfig.h             |  2 +-
 tdeabc/plugins/sql/resourcesqlconfig.h             |  2 +-
 tdeabc/resource.h                                  |  2 +-
 tdeabc/resourceselectdialog.h                      |  2 +-
 tdeabc/tests/testldapclient.h                      |  2 +-
 tdeabc/tests/testlock.h                            |  2 +-
 tdecert/tdecertpart.h                              |  2 +-
 tdecmshell/main.h                                  |  4 ++--
 tdecore/kasyncio.h                                 |  2 +-
 tdecore/kaudioplayer.h                             |  2 +-
 tdecore/kbufferedio.h                              |  2 +-
 tdecore/kcheckaccelerators.h                       |  2 +-
 tdecore/kclipboard.h                               |  2 +-
 tdecore/kcompletion.h                              |  2 +-
 tdecore/kdesktopfile.h                             |  2 +-
 tdecore/kextsock.h                                 |  2 +-
 tdecore/kglobalaccel.h                             |  2 +-
 tdecore/kglobalaccel_win.h                         |  2 +-
 tdecore/kglobalaccel_x11.h                         |  2 +-
 tdecore/kiconloader_p.h                            |  2 +-
 tdecore/klibloader.h                               |  6 ++---
 tdecore/kmanagerselection.h                        |  4 ++--
 tdecore/kprocctrl.h                                |  2 +-
 tdecore/kprocess.h                                 |  4 ++--
 tdecore/kprocio.h                                  |  2 +-
 tdecore/ksimpleconfig.h                            |  2 +-
 tdecore/ksimpledirwatch.h                          |  2 +-
 tdecore/ksimpledirwatch_p.h                        |  2 +-
 tdecore/ksock.h                                    |  4 ++--
 tdecore/ksockaddr.h                                |  6 ++---
 tdecore/kuniqueapplication.h                       |  2 +-
 tdecore/kxmessages.h                               |  2 +-
 tdecore/network/kbufferedsocket.h                  |  2 +-
 tdecore/network/kclientsocketbase.h                |  2 +-
 tdecore/network/kdatagramsocket.h                  |  2 +-
 tdecore/network/kresolver.h                        |  2 +-
 tdecore/network/kreverseresolver.h                 |  2 +-
 tdecore/network/kserversocket.h                    |  2 +-
 tdecore/network/ksrvresolverworker_p.h             |  2 +-
 tdecore/network/kstreamsocket.h                    |  2 +-
 tdecore/tdeaccel.h                                 |  2 +-
 tdecore/tdeaccelmanager_private.h                  |  4 ++--
 tdecore/tdeaccelprivate.h                          |  2 +-
 tdecore/tdeapplication.h                           |  4 ++--
 tdecore/tdeconfig.h                                |  2 +-
 tdecore/tdeconfigbase.h                            |  2 +-
 tdecore/tdeconfigdialogmanager.h                   |  2 +-
 .../network-manager/network-manager.h              |  2 +-
 .../network-manager/network-manager_p.h            |  4 ++--
 tdecore/tdehw/tdecryptographiccarddevice.h         |  2 +-
 tdecore/tdehw/tdeeventdevice.h                     |  2 +-
 tdecore/tdehw/tdegenericdevice.h                   |  2 +-
 tdecore/tdehw/tdehardwaredevices.h                 |  2 +-
 tdecore/tdehw/tdenetworkconnections.h              |  4 ++--
 tdecore/tdemultipledrag.h                          |  2 +-
 tdecore/tdeshortcutmenu.h                          |  2 +-
 tdecore/tdestartupinfo.h                           |  2 +-
 tdecore/tdesycoca.h                                |  2 +-
 tdecore/tests/kipctest.h                           |  2 +-
 tdecore/tests/klocaletest.h                        |  2 +-
 tdecore/tests/kprocesstest.h                       |  2 +-
 tdecore/tests/kprociotest.h                        |  2 +-
 tdecore/tests/tdeconfigtestgui.h                   |  2 +-
 tdecore/twinmodule.h                               |  2 +-
 tdefile-plugins/elf/tdefile_elf.h                  |  2 +-
 tdefx/tdestyle.h                                   |  2 +-
 tdehtml/domtreeview.h                              |  2 +-
 tdehtml/ecma/kjs_debugwin.h                        |  8 +++----
 tdehtml/ecma/kjs_window.h                          |  2 +-
 tdehtml/ecma/xmlhttprequest.h                      |  2 +-
 tdehtml/html/html_documentimpl.h                   |  2 +-
 tdehtml/html/html_objectimpl.h                     |  2 +-
 tdehtml/java/kjavaapplet.h                         |  2 +-
 tdehtml/java/kjavaappletcontext.h                  |  2 +-
 tdehtml/java/kjavaappletserver.h                   |  4 ++--
 tdehtml/java/kjavaappletviewer.h                   | 10 ++++----
 tdehtml/java/kjavaappletwidget.h                   |  2 +-
 tdehtml/java/kjavadownloader.h                     |  6 ++---
 tdehtml/java/kjavaprocess.h                        |  2 +-
 tdehtml/misc/knsplugininstaller.h                  |  4 ++--
 tdehtml/misc/loader.h                              |  4 ++--
 tdehtml/rendering/render_form.h                    | 18 +++++++-------
 tdehtml/rendering/render_frames.h                  |  6 ++---
 tdehtml/rendering/render_layer.h                   |  4 ++--
 tdehtml/rendering/render_replaced.h                |  2 +-
 tdehtml/tdehtml_ext.h                              |  6 ++---
 tdehtml/tdehtml_factory.h                          |  2 +-
 tdehtml/tdehtml_pagecache.h                        |  4 ++--
 tdehtml/tdehtml_part.h                             |  2 +-
 tdehtml/tdehtml_printsettings.h                    |  2 +-
 tdehtml/tdehtml_run.h                              |  2 +-
 tdehtml/tdehtmlimage.h                             |  6 ++---
 tdehtml/tdehtmlpart_p.h                            |  4 ++--
 tdehtml/tdehtmlview.h                              |  2 +-
 tdehtml/tdemultipart/tdemultipart.h                |  4 ++--
 tdehtml/test_regression.h                          |  4 ++--
 tdehtml/testtdehtml.h                              |  2 +-
 tdehtml/xml/dom_docimpl.h                          |  2 +-
 tdehtml/xml/xml_tokenizer.h                        |  2 +-
 tdeinit/tdelauncher.h                              |  4 ++--
 tdeio/bookmarks/kbookmarkbar.h                     |  2 +-
 tdeio/bookmarks/kbookmarkdombuilder.h              |  2 +-
 tdeio/bookmarks/kbookmarkimporter.h                |  4 ++--
 tdeio/bookmarks/kbookmarkimporter_crash.h          |  2 +-
 tdeio/bookmarks/kbookmarkimporter_ie.h             |  2 +-
 tdeio/bookmarks/kbookmarkimporter_ns.h             |  2 +-
 tdeio/bookmarks/kbookmarkimporter_opera.h          |  2 +-
 tdeio/bookmarks/kbookmarkmanager.h                 |  4 ++--
 tdeio/bookmarks/kbookmarkmenu.h                    |  4 ++--
 tdeio/bookmarks/kbookmarkmenu_p.h                  |  8 +++----
 tdeio/httpfilter/httpfilter.h                      | 10 ++++----
 tdeio/kpasswdserver/kpasswdserver.h                |  2 +-
 tdeio/kssl/ksslcertdlg.h                           |  2 +-
 tdeio/kssl/ksslinfodlg.h                           |  2 +-
 tdeio/kssl/ksslkeygen.h                            |  2 +-
 tdeio/misc/kpac/discovery.h                        |  2 +-
 tdeio/misc/kpac/downloader.h                       |  2 +-
 tdeio/misc/kpac/proxyscout.h                       |  2 +-
 tdeio/misc/kssld/kssld.h                           |  2 +-
 tdeio/misc/tdesendbugmail/main.h                   |  2 +-
 tdeio/misc/tdesendbugmail/smtp.h                   |  2 +-
 tdeio/misc/tdewalletd/ktimeout.h                   |  2 +-
 tdeio/misc/tdewalletd/tdewalletd.h                 |  2 +-
 tdeio/misc/uiserver.h                              |  6 ++---
 tdeio/tdefile/kacleditwidget.h                     |  2 +-
 tdeio/tdefile/kacleditwidget_p.h                   |  4 ++--
 tdeio/tdefile/kcombiview.h                         |  2 +-
 tdeio/tdefile/kcustommenueditor.h                  |  2 +-
 tdeio/tdefile/kdirselectdialog.h                   |  2 +-
 tdeio/tdefile/kdirsize.h                           |  2 +-
 tdeio/tdefile/kdiskfreesp.h                        |  2 +-
 tdeio/tdefile/kencodingfiledialog.h                |  2 +-
 tdeio/tdefile/kicondialog.h                        |  6 ++---
 tdeio/tdefile/kimagefilepreview.h                  |  2 +-
 tdeio/tdefile/kmetaprops.h                         |  2 +-
 tdeio/tdefile/knotifydialog.h                      |  4 ++--
 tdeio/tdefile/kopenwith.h                          |  2 +-
 tdeio/tdefile/kopenwith_p.h                        |  2 +-
 tdeio/tdefile/kpreviewprops.h                      |  2 +-
 tdeio/tdefile/kpreviewwidgetbase.h                 |  2 +-
 tdeio/tdefile/kpropertiesdialog.h                  | 20 ++++++++--------
 tdeio/tdefile/kurlbar.h                            |  6 ++---
 tdeio/tdefile/kurlcombobox.h                       |  2 +-
 tdeio/tdefile/kurlrequester.h                      |  4 ++--
 tdeio/tdefile/kurlrequesterdlg.h                   |  2 +-
 tdeio/tdefile/tdediroperator.h                     |  2 +-
 tdeio/tdefile/tdefilebookmarkhandler.h             |  2 +-
 tdeio/tdefile/tdefiledetailview.h                  |  2 +-
 tdeio/tdefile/tdefiledialog.h                      |  2 +-
 tdeio/tdefile/tdefilefiltercombo.h                 |  2 +-
 tdeio/tdefile/tdefileiconview.h                    |  2 +-
 tdeio/tdefile/tdefilemetainfowidget.h              |  2 +-
 tdeio/tdefile/tdefilemetapreview.h                 |  2 +-
 tdeio/tdefile/tdefilepreview.h                     |  2 +-
 tdeio/tdefile/tdefilesharedlg.h                    |  2 +-
 tdeio/tdefile/tdefilespeedbar.h                    |  2 +-
 tdeio/tdefile/tdefiletreebranch.h                  |  2 +-
 tdeio/tdefile/tdefiletreeview.h                    |  2 +-
 tdeio/tdefile/tdefileview.h                        |  2 +-
 tdeio/tdefile/tests/kfdtest.h                      |  2 +-
 tdeio/tdefile/tests/tdefiletreeviewtest.h          |  2 +-
 tdeio/tdeio/chmodjob.h                             |  2 +-
 tdeio/tdeio/connection.h                           |  2 +-
 tdeio/tdeio/dataslave.h                            |  2 +-
 tdeio/tdeio/davjob.h                               |  2 +-
 tdeio/tdeio/defaultprogress.h                      |  2 +-
 tdeio/tdeio/forwardingslavebase.h                  |  2 +-
 tdeio/tdeio/jobclasses.h                           | 28 +++++++++++-----------
 tdeio/tdeio/kautomount.h                           |  4 ++--
 tdeio/tdeio/kdatatool.h                            |  4 ++--
 tdeio/tdeio/kdirlister.h                           |  2 +-
 tdeio/tdeio/kdirlister_p.h                         |  2 +-
 tdeio/tdeio/kdirwatch.h                            |  2 +-
 tdeio/tdeio/kdirwatch_p.h                          |  2 +-
 tdeio/tdeio/kfilterbase.h                          |  2 +-
 tdeio/tdeio/kmimetypechooser.h                     |  2 +-
 tdeio/tdeio/kmimetyperesolver.h                    |  2 +-
 tdeio/tdeio/knfsshare.h                            |  2 +-
 tdeio/tdeio/krun.h                                 |  4 ++--
 tdeio/tdeio/ksambashare.h                          |  2 +-
 tdeio/tdeio/kscan.h                                |  4 ++--
 tdeio/tdeio/kservice_p.h                           |  2 +-
 tdeio/tdeio/kshellcompletion.h                     |  2 +-
 tdeio/tdeio/kshred.h                               |  2 +-
 tdeio/tdeio/ktrader.h                              |  2 +-
 tdeio/tdeio/kurifilter.h                           |  2 +-
 tdeio/tdeio/kurlcompletion.h                       |  2 +-
 tdeio/tdeio/metainfojob.h                          |  2 +-
 tdeio/tdeio/netaccess.h                            |  2 +-
 tdeio/tdeio/observer.h                             |  2 +-
 tdeio/tdeio/passdlg.h                              |  2 +-
 tdeio/tdeio/pastedialog.h                          |  2 +-
 tdeio/tdeio/previewjob.h                           |  2 +-
 tdeio/tdeio/progressbase.h                         |  2 +-
 tdeio/tdeio/renamedlg.h                            |  2 +-
 tdeio/tdeio/scheduler.h                            |  2 +-
 tdeio/tdeio/sessiondata.h                          |  2 +-
 tdeio/tdeio/skipdlg.h                              |  2 +-
 tdeio/tdeio/slave.h                                |  2 +-
 tdeio/tdeio/slaveconfig.h                          |  2 +-
 tdeio/tdeio/slaveinterface.h                       |  2 +-
 tdeio/tdeio/statusbarprogress.h                    |  2 +-
 tdeio/tdeio/tdefilemetainfo.h                      |  4 ++--
 tdeio/tdeio/tdefileshare.h                         |  2 +-
 tdeio/tdeioexec/main.h                             |  2 +-
 tdeio/tests/dummymeta.h                            |  2 +-
 tdeio/tests/jobtest.h                              |  2 +-
 tdeio/tests/kdcopcheck.h                           |  2 +-
 tdeio/tests/kdirlistertest.h                       |  4 ++--
 tdeio/tests/kdirwatchtest.h                        |  2 +-
 tdeio/tests/kdirwatchunittest.h                    |  2 +-
 tdeio/tests/kruntest.h                             |  4 ++--
 tdeio/tests/previewtest.h                          |  2 +-
 tdeio/tests/speed.h                                |  2 +-
 tdeio/tests/tdeioslavetest.h                       |  2 +-
 tdeioslave/file/file.h                             |  2 +-
 tdeioslave/http/http.h                             |  2 +-
 tdeioslave/http/kcookiejar/kcookieserver.h         |  2 +-
 tdeioslave/http/kcookiejar/kcookiewin.h            |  4 ++--
 tdemdi/tdemdi/dockcontainer.h                      |  2 +-
 tdemdi/tdemdi/guiclient.h                          |  4 ++--
 tdemdi/tdemdi/mainwindow.h                         |  2 +-
 tdemdi/tdemdi/tabwidget.h                          |  2 +-
 tdemdi/tdemdi/toolviewaccessor.h                   |  2 +-
 tdemdi/tdemdichildarea.h                           |  2 +-
 tdemdi/tdemdichildfrm.h                            |  4 ++--
 tdemdi/tdemdichildfrmcaption.h                     |  2 +-
 tdemdi/tdemdichildview.h                           |  2 +-
 tdemdi/tdemdidockcontainer.h                       |  2 +-
 tdemdi/tdemdidocumentviewtabwidget.h               |  2 +-
 tdemdi/tdemdifocuslist.h                           |  2 +-
 tdemdi/tdemdiguiclient.h                           |  4 ++--
 tdemdi/tdemdimainfrm.h                             |  2 +-
 tdemdi/tdemditaskbar.h                             |  4 ++--
 tdemdi/tdemditoolviewaccessor.h                    |  2 +-
 tdemdi/test/hello.h                                |  2 +-
 tdemdi/test/mainwidget.h                           |  4 ++--
 tdenewstuff/downloaddialog.h                       |  2 +-
 tdenewstuff/engine.h                               |  2 +-
 tdenewstuff/ghns.h                                 |  2 +-
 tdenewstuff/knewstuffbutton.h                      |  2 +-
 tdenewstuff/knewstuffsecure.h                      |  2 +-
 tdenewstuff/provider.h                             |  4 ++--
 tdenewstuff/providerdialog.h                       |  2 +-
 tdenewstuff/security.h                             |  2 +-
 tdenewstuff/testnewstuff.h                         |  2 +-
 tdenewstuff/uploaddialog.h                         |  2 +-
 tdeparts/browserextension.h                        |  6 ++---
 tdeparts/browserinterface.h                        |  2 +-
 tdeparts/browserrun.h                              |  2 +-
 tdeparts/dockmainwindow.h                          |  2 +-
 tdeparts/factory.h                                 |  2 +-
 tdeparts/historyprovider.h                         |  2 +-
 tdeparts/mainwindow.h                              |  2 +-
 tdeparts/part.h                                    |  6 ++---
 tdeparts/partmanager.h                             |  2 +-
 tdeparts/plugin.h                                  |  2 +-
 tdeparts/statusbarextension.h                      |  2 +-
 tdeparts/tests/example.h                           |  2 +-
 tdeparts/tests/ghostview.h                         |  2 +-
 tdeparts/tests/normalktm.h                         |  2 +-
 tdeparts/tests/notepad.h                           |  2 +-
 tdeparts/tests/parts.h                             |  4 ++--
 tdeparts/tests/plugin_spellcheck.h                 |  2 +-
 tdeprint/cups/cupsaddsmb2.h                        |  2 +-
 tdeprint/cups/cupsdconf2/browsedialog.h            |  2 +-
 tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h       |  2 +-
 tdeprint/cups/cupsdconf2/cupsddialog.h             |  2 +-
 tdeprint/cups/cupsdconf2/cupsdjobspage.h           |  2 +-
 tdeprint/cups/cupsdconf2/cupsdnetworkpage.h        |  2 +-
 tdeprint/cups/cupsdconf2/cupsdpage.h               |  2 +-
 tdeprint/cups/cupsdconf2/cupsdsecuritypage.h       |  2 +-
 tdeprint/cups/cupsdconf2/cupsdserverpage.h         |  2 +-
 tdeprint/cups/cupsdconf2/editlist.h                |  2 +-
 tdeprint/cups/cupsdconf2/locationdialog.h          |  2 +-
 tdeprint/cups/cupsdconf2/qdirlineedit.h            |  2 +-
 tdeprint/cups/cupsdconf2/qdirmultilineedit.h       |  2 +-
 tdeprint/cups/ippreportdlg.h                       |  2 +-
 tdeprint/cups/kmcupsjobmanager.h                   |  2 +-
 tdeprint/cups/kmcupsmanager.h                      |  2 +-
 tdeprint/cups/kmwippprinter.h                      |  2 +-
 tdeprint/cups/kmwother.h                           |  2 +-
 tdeprint/cups/kmwquota.h                           |  2 +-
 tdeprint/cups/kmwusers.h                           |  2 +-
 tdeprint/cups/kpimagepage.h                        |  2 +-
 tdeprint/cups/kpschedulepage.h                     |  2 +-
 tdeprint/cups/kptextpage.h                         |  2 +-
 tdeprint/driverview.h                              |  2 +-
 tdeprint/droptionview.h                            | 10 ++++----
 tdeprint/kmfactory.h                               |  2 +-
 tdeprint/kmjobmanager.h                            |  2 +-
 tdeprint/kmmanager.h                               |  2 +-
 tdeprint/kmuimanager.h                             |  2 +-
 tdeprint/kpcopiespage.h                            |  2 +-
 tdeprint/kpfilterpage.h                            |  2 +-
 tdeprint/kpgeneralpage.h                           |  2 +-
 tdeprint/kpposterpage.h                            |  2 +-
 tdeprint/kpqtpage.h                                |  2 +-
 tdeprint/kprintaction.h                            |  2 +-
 tdeprint/kprintdialog.h                            |  2 +-
 tdeprint/kprintdialogpage.h                        |  2 +-
 tdeprint/kprinterimpl.h                            |  2 +-
 tdeprint/kprinterpropertydialog.h                  |  2 +-
 tdeprint/kprintpreview.h                           |  4 ++--
 tdeprint/kprintprocess.h                           |  2 +-
 tdeprint/lpr/editentrydialog.h                     |  2 +-
 tdeprint/lpr/kmlprmanager.h                        |  2 +-
 tdeprint/management/cjanuswidget.h                 |  2 +-
 tdeprint/management/kiconselectaction.h            |  2 +-
 tdeprint/management/kmconfigdialog.h               |  2 +-
 tdeprint/management/kmconfigfilter.h               |  2 +-
 tdeprint/management/kmconfigfonts.h                |  2 +-
 tdeprint/management/kmconfiggeneral.h              |  2 +-
 tdeprint/management/kmconfigjobs.h                 |  2 +-
 tdeprint/management/kmconfigpage.h                 |  2 +-
 tdeprint/management/kmdbcreator.h                  |  2 +-
 tdeprint/management/kmdriverdb.h                   |  2 +-
 tdeprint/management/kmdriverdbwidget.h             |  2 +-
 tdeprint/management/kmdriverdialog.h               |  2 +-
 tdeprint/management/kmiconview.h                   |  2 +-
 tdeprint/management/kminstancepage.h               |  2 +-
 tdeprint/management/kmjobviewer.h                  |  2 +-
 tdeprint/management/kmlistview.h                   |  2 +-
 tdeprint/management/kmmainview.h                   |  2 +-
 tdeprint/management/kmprinterview.h                |  2 +-
 tdeprint/management/kmpropcontainer.h              |  2 +-
 tdeprint/management/kmpropertypage.h               |  2 +-
 tdeprint/management/kmpropwidget.h                 |  2 +-
 tdeprint/management/kmspecialprinterdlg.h          |  2 +-
 tdeprint/management/kmtimer.h                      |  2 +-
 tdeprint/management/kmwclass.h                     |  2 +-
 tdeprint/management/kmwdriverselect.h              |  2 +-
 tdeprint/management/kmwdrivertest.h                |  2 +-
 tdeprint/management/kmwizard.h                     |  2 +-
 tdeprint/management/kmwizardpage.h                 |  2 +-
 tdeprint/management/kmwlocal.h                     |  2 +-
 tdeprint/management/kmwsmb.h                       |  2 +-
 tdeprint/management/kmwsocket.h                    |  2 +-
 tdeprint/management/kmwsocketutil.h                |  2 +-
 tdeprint/management/kxmlcommanddlg.h               |  4 ++--
 tdeprint/management/kxmlcommandselector.h          |  2 +-
 tdeprint/management/networkscanner.h               |  4 ++--
 tdeprint/management/pluginaction.h                 |  2 +-
 tdeprint/management/smbview.h                      |  2 +-
 tdeprint/marginpreview.h                           |  2 +-
 tdeprint/marginvaluewidget.h                       |  2 +-
 tdeprint/marginwidget.h                            |  2 +-
 tdeprint/messagewindow.h                           |  2 +-
 tdeprint/plugincombobox.h                          |  2 +-
 tdeprint/posterpreview.h                           |  2 +-
 tdeprint/rlpr/kmwrlpr.h                            |  2 +-
 tdeprint/tdefilelist.h                             |  2 +-
 tdeprint/tdeprintd.h                               |  2 +-
 tdeprint/tests/drawdemo.h                          |  2 +-
 tdeprint/tests/helpwindow.h                        |  2 +-
 tdeprint/tools/escputil/escpwidget.h               |  2 +-
 tderandr/ktimerdialog.h                            |  2 +-
 tderandr/randr.h                                   |  2 +-
 tderesources/configdialog.h                        |  2 +-
 tderesources/configpage.h                          |  2 +-
 tderesources/configwidget.h                        |  2 +-
 tderesources/kcmtderesources.h                     |  2 +-
 tderesources/resource.h                            |  4 ++--
 tdersync/rsyncconfigdialog.h                       |  2 +-
 tdersync/tdersync.h                                |  2 +-
 tdespell2/backgroundchecker.h                      |  2 +-
 tdespell2/backgroundengine.h                       |  2 +-
 tdespell2/broker.h                                 |  2 +-
 tdespell2/client.h                                 |  2 +-
 tdespell2/defaultdictionary.h                      |  2 +-
 tdespell2/plugins/aspell/tdespell_aspellclient.h   |  2 +-
 tdespell2/plugins/hspell/tdespell_hspellclient.h   |  2 +-
 tdespell2/plugins/ispell/tdespell_ispellclient.h   |  2 +-
 tdespell2/tests/backgroundtest.h                   |  2 +-
 tdespell2/tests/test_dialog.h                      |  2 +-
 tdespell2/ui/configdialog.h                        |  2 +-
 tdespell2/ui/configwidget.h                        |  2 +-
 tdespell2/ui/dialog.h                              |  2 +-
 tdestyles/asteroid/asteroid.h                      |  2 +-
 tdestyles/highcolor/highcolor.h                    |  2 +-
 tdestyles/highcontrast/config/highcontrastconfig.h |  2 +-
 tdestyles/highcontrast/highcontrast.h              |  2 +-
 tdestyles/keramik/keramik.h                        |  2 +-
 tdestyles/klegacy/klegacystyle.h                   |  2 +-
 tdestyles/kthemestyle/kthemebase.h                 |  4 ++--
 tdestyles/kthemestyle/kthemestyle.h                |  2 +-
 tdestyles/light/lightstyle-v2.h                    |  2 +-
 tdestyles/light/lightstyle-v3.h                    |  2 +-
 tdestyles/plastik/config/plastikconf.h             |  2 +-
 tdestyles/plastik/plastik.h                        |  2 +-
 tdeui/kaboutdialog_private.h                       |  4 ++--
 tdeui/kactivelabel.h                               |  2 +-
 tdeui/kanimwidget.h                                |  2 +-
 tdeui/karrowbutton.h                               |  2 +-
 tdeui/kauthicon.h                                  |  6 ++---
 tdeui/kbugreport.h                                 |  2 +-
 tdeui/kbuttonbox.h                                 |  2 +-
 tdeui/kcharselect.h                                |  4 ++--
 tdeui/kcmenumngr.h                                 |  2 +-
 tdeui/kcolorbutton.h                               |  2 +-
 tdeui/kcolorcombo.h                                |  2 +-
 tdeui/kcolordialog.h                               | 12 +++++-----
 tdeui/kcolordrag.h                                 |  2 +-
 tdeui/kcombobox.h                                  |  6 ++---
 tdeui/kcommand.h                                   |  2 +-
 tdeui/kcursor_private.h                            |  4 ++--
 tdeui/kdatepicker.h                                |  2 +-
 tdeui/kdatetbl.h                                   | 10 ++++----
 tdeui/kdatetimewidget.h                            |  2 +-
 tdeui/kdatewidget.h                                |  2 +-
 tdeui/kdetrayproxy/kdetrayproxy.h                  |  2 +-
 tdeui/kdetrayproxy/module.h                        |  2 +-
 tdeui/kdialog.h                                    |  8 +++----
 tdeui/kdialogbase.h                                |  2 +-
 tdeui/kdialogbase_priv.h                           |  4 ++--
 tdeui/kdockwidget.h                                | 18 +++++++-------
 tdeui/kdockwidget_private.h                        |  6 ++---
 tdeui/kdockwindow.h                                |  2 +-
 tdeui/kdualcolorbutton.h                           |  2 +-
 tdeui/keditcl.h                                    |  8 +++----
 tdeui/keditlistbox.h                               |  2 +-
 tdeui/kedittoolbar.h                               |  4 ++--
 tdeui/khelpmenu.h                                  |  2 +-
 tdeui/kiconview.h                                  |  2 +-
 tdeui/kiconviewsearchline.h                        |  2 +-
 tdeui/kinputdialog.h                               |  2 +-
 tdeui/kjanuswidget.cpp                             |  4 ++--
 tdeui/kjanuswidget.h                               |  2 +-
 tdeui/kkeybutton.h                                 |  2 +-
 tdeui/kkeydialog.h                                 |  4 ++--
 tdeui/klanguagebutton.h                            |  2 +-
 tdeui/kled.h                                       |  2 +-
 tdeui/klineedit.h                                  |  2 +-
 tdeui/klineeditdlg.h                               |  2 +-
 tdeui/knuminput.h                                  | 10 ++++----
 tdeui/knumvalidator.h                              |  2 +-
 tdeui/kpanelapplet.h                               |  2 +-
 tdeui/kpanelappmenu.h                              |  2 +-
 tdeui/kpanelextension.h                            |  2 +-
 tdeui/kpanelmenu.h                                 |  2 +-
 tdeui/kpassdlg.h                                   |  4 ++--
 tdeui/kpassivepopup.h                              |  2 +-
 tdeui/kpixmapregionselectorwidget.h                |  2 +-
 tdeui/kprogress.h                                  |  4 ++--
 tdeui/kprogressbox.h                               |  2 +-
 tdeui/kpushbutton.h                                |  2 +-
 tdeui/krestrictedline.h                            |  2 +-
 tdeui/krootpixmap.h                                |  2 +-
 tdeui/kruler.h                                     |  2 +-
 tdeui/ksconfig.h                                   |  2 +-
 tdeui/kscrollview.h                                |  2 +-
 tdeui/kseparator.h                                 |  2 +-
 tdeui/ksharedpixmap.h                              |  2 +-
 tdeui/ksplashscreen.h                              |  2 +-
 tdeui/ksqueezedtextlabel.h                         |  2 +-
 tdeui/kstatusbar.h                                 |  4 ++--
 tdeui/kstringvalidator.h                           |  4 ++--
 tdeui/kswitchlanguagedialog.h                      |  2 +-
 tdeui/ksyntaxhighlighter.h                         |  2 +-
 tdeui/ksystemtray.h                                |  2 +-
 tdeui/ktabbar.h                                    |  2 +-
 tdeui/ktabctl.h                                    |  2 +-
 tdeui/ktabwidget.h                                 |  2 +-
 tdeui/ktextbrowser.h                               |  2 +-
 tdeui/ktextedit.h                                  |  2 +-
 tdeui/ktimewidget.h                                |  2 +-
 tdeui/ktimezonewidget.h                            |  2 +-
 tdeui/ktip.h                                       |  2 +-
 tdeui/kurllabel.h                                  |  2 +-
 tdeui/kwhatsthismanager_p.h                        |  2 +-
 tdeui/kwizard.h                                    |  2 +-
 tdeui/kxmlguifactory.h                             |  2 +-
 tdeui/qxembed.h                                    |  2 +-
 tdeui/tdeaboutdialog.cpp                           |  2 +-
 tdeui/tdeaboutdialog.h                             |  8 +++----
 tdeui/tdeaction.h                                  |  2 +-
 tdeui/tdeactionclasses.h                           | 28 +++++++++++-----------
 tdeui/tdeactioncollection.h                        |  2 +-
 tdeui/tdeactionselector.h                          |  2 +-
 tdeui/tdecmodule.h                                 |  2 +-
 tdeui/tdecompletionbox.h                           |  2 +-
 tdeui/tdeconfigdialog.h                            |  2 +-
 tdeui/tdefontcombo.h                               |  2 +-
 tdeui/tdefontdialog.h                              |  4 ++--
 tdeui/tdefontrequester.h                           |  2 +-
 tdeui/tdelistbox.h                                 |  2 +-
 tdeui/tdelistview.h                                |  2 +-
 tdeui/tdelistviewlineedit.h                        |  2 +-
 tdeui/tdelistviewsearchline.h                      |  4 ++--
 tdeui/tdemainwindow.h                              |  2 +-
 tdeui/tdemenubar.h                                 |  2 +-
 tdeui/tdepassivepopupstack.h                       |  2 +-
 tdeui/tdepopupmenu.h                               |  4 ++--
 tdeui/tdeselect.h                                  |  6 ++---
 tdeui/tdeshortcutdialog.h                          |  2 +-
 tdeui/tdespell.h                                   |  2 +-
 tdeui/tdespelldlg.h                                |  2 +-
 tdeui/tdetoolbar.h                                 |  4 ++--
 tdeui/tdetoolbarbutton.h                           |  2 +-
 tdeui/tdetoolbarhandler.h                          |  2 +-
 tdeui/tdetoolbarradiogroup.h                       |  2 +-
 tdeui/tests/itemcontainertest.h                    |  2 +-
 tdeui/tests/kcomboboxtest.h                        |  2 +-
 tdeui/tests/kcompletiontest.h                      |  2 +-
 tdeui/tests/kdesattest.h                           |  2 +-
 tdeui/tests/kdocktest.h                            |  2 +-
 tdeui/tests/kdockwidgetdemo.h                      | 10 ++++----
 tdeui/tests/kdockwidgettest.h                      |  4 ++--
 tdeui/tests/kdualcolortest.h                       |  2 +-
 tdeui/tests/khashtest.h                            |  2 +-
 tdeui/tests/kledtest.h                             |  2 +-
 tdeui/tests/klineedittest.h                        |  2 +-
 tdeui/tests/knuminputtest.h                        |  2 +-
 tdeui/tests/kpanelmenutest.h                       |  2 +-
 tdeui/tests/krulertest.h                           |  4 ++--
 tdeui/tests/kstatusbartest.h                       |  2 +-
 tdeui/tests/ktabctltest.h                          |  2 +-
 tdeui/tests/ktabwidgettest.h                       |  2 +-
 tdeui/tests/kunbalancedgrdtest.h                   |  2 +-
 tdeui/tests/kxmlguitest.h                          |  2 +-
 tdeui/tests/tdemainwindowrestoretest.h             | 12 +++++-----
 tdeui/tests/tdemainwindowtest.h                    |  2 +-
 tdeui/tests/twindowtest.h                          |  2 +-
 tdeui/twindowinfo.h                                |  2 +-
 tdeui/twindowlistmenu.h                            |  2 +-
 tdeunittest/runner.h                               |  2 +-
 tdeunittest/tester.h                               |  2 +-
 tdeutils/kcmultidialog.h                           |  2 +-
 tdeutils/kfind.h                                   |  2 +-
 tdeutils/kfinddialog.h                             |  2 +-
 tdeutils/kpluginselector.h                         |  2 +-
 tdeutils/kpluginselector_p.h                       |  2 +-
 tdeutils/kreplace.h                                |  2 +-
 tdeutils/kreplacedialog.h                          |  2 +-
 tdeutils/ksettings/README.dox                      |  2 +-
 tdeutils/ksettings/componentsdialog.h              |  2 +-
 tdeutils/ksettings/dialog.h                        |  2 +-
 tdeutils/ksettings/dispatcher.h                    |  2 +-
 tdeutils/ksettings/pluginpage.h                    |  2 +-
 tdeutils/tdecmodulecontainer.h                     |  2 +-
 tdeutils/tdecmoduleproxy.h                         |  2 +-
 tdeutils/tdecmoduleproxyIfaceImpl.h                |  4 ++--
 tdeutils/tdemultitabbar.h                          |  6 ++---
 tdeutils/tdemultitabbar_p.h                        |  2 +-
 tdeutils/tests/kfindtest.h                         |  2 +-
 tdeutils/tests/kreplacetest.h                      |  2 +-
 tdewallet/client/tdewallet.h                       |  2 +-
 tdewallet/tests/tdewallettest.h                    |  2 +-
 win/qeventloopex.h                                 |  2 +-
 win/tools/kmoc                                     |  2 +-
 657 files changed, 915 insertions(+), 921 deletions(-)

diff --git a/arts/kde/kartsdispatcher.h b/arts/kde/kartsdispatcher.h
index b25085a78..ea2e1e66a 100644
--- a/arts/kde/kartsdispatcher.h
+++ b/arts/kde/kartsdispatcher.h
@@ -63,7 +63,7 @@ namespace Arts
  */
 class KDE_EXPORT KArtsDispatcher : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	/**
 	 * Constructor.
diff --git a/arts/kde/kartsfloatwatch.h b/arts/kde/kartsfloatwatch.h
index cc6671556..d8c177ee6 100644
--- a/arts/kde/kartsfloatwatch.h
+++ b/arts/kde/kartsfloatwatch.h
@@ -48,7 +48,7 @@ namespace Arts { class KFloatWatchProxy_impl; }
  * \endcode
  */
 class KArtsFloatWatch : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 private:
 	KArtsFloatWatchPrivate *d;
 	friend class Arts::KFloatWatchProxy_impl;
diff --git a/arts/kde/kartsserver.h b/arts/kde/kartsserver.h
index c0c04e66d..a5346aa06 100644
--- a/arts/kde/kartsserver.h
+++ b/arts/kde/kartsserver.h
@@ -36,7 +36,7 @@
  */
 class KDE_ARTS_EXPORT KArtsServer : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/**
diff --git a/arts/kde/kaudioconverter.h b/arts/kde/kaudioconverter.h
index 0022d9bba..773018021 100644
--- a/arts/kde/kaudioconverter.h
+++ b/arts/kde/kaudioconverter.h
@@ -31,7 +31,7 @@ class TQString;
 
 class KAudioConverter : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KAudioConverter();
 	~KAudioConverter();
diff --git a/arts/kde/kaudioplaystream.h b/arts/kde/kaudioplaystream.h
index 6bcbd20ce..106112b6a 100644
--- a/arts/kde/kaudioplaystream.h
+++ b/arts/kde/kaudioplaystream.h
@@ -40,7 +40,7 @@ class KAudioPlayStreamPrivate;
 */
 
 class KDE_ARTS_EXPORT KAudioPlayStream : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	/**
 	 * Creates a KAudioPlayStream on server with a title. You should pass the KArtsServer also
diff --git a/arts/kde/kaudioplaystream_p.h b/arts/kde/kaudioplaystream_p.h
index a790a8c33..93cb92429 100644
--- a/arts/kde/kaudioplaystream_p.h
+++ b/arts/kde/kaudioplaystream_p.h
@@ -37,7 +37,7 @@ class KAudioPlayStream;
 class KByteSoundProducer;
 
 class KAudioPlayStreamPrivate : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	KAudioPlayStreamPrivate( KArtsServer*, const TQString title, TQObject*, const char* =0 );
 	~KAudioPlayStreamPrivate();
diff --git a/arts/kde/kaudiorecordstream.h b/arts/kde/kaudiorecordstream.h
index bbdb6d736..a1e4f1931 100644
--- a/arts/kde/kaudiorecordstream.h
+++ b/arts/kde/kaudiorecordstream.h
@@ -40,7 +40,7 @@ namespace Arts { class StereoEffectStack; }
 */
 class KDE_ARTS_EXPORT KAudioRecordStream : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/arts/kde/kaudiorecordstream_p.h b/arts/kde/kaudiorecordstream_p.h
index 1d38b2278..727f384ec 100644
--- a/arts/kde/kaudiorecordstream_p.h
+++ b/arts/kde/kaudiorecordstream_p.h
@@ -32,7 +32,7 @@ class KByteSoundReceiver : public TQObject,
                            public Arts::ByteSoundReceiver_skel,
                            public Arts::StdSynthModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KByteSoundReceiver( int rate, int bits, int channels, const char * title );
diff --git a/arts/kde/kconverttest.h b/arts/kde/kconverttest.h
index 7e7cc6c50..f74b62859 100644
--- a/arts/kde/kconverttest.h
+++ b/arts/kde/kconverttest.h
@@ -26,7 +26,7 @@
 
 class KConvertTest : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KConvertTest();
 
diff --git a/arts/kde/kdatarequest_impl.h b/arts/kde/kdatarequest_impl.h
index 7d90c8b73..4abe72c03 100644
--- a/arts/kde/kdatarequest_impl.h
+++ b/arts/kde/kdatarequest_impl.h
@@ -32,7 +32,7 @@ namespace Arts
 class KDataRequest_impl : public TQObject, virtual public KDataRequest_skel,
 						  virtual public StdSynthModule
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KDataRequest_impl();
 	~KDataRequest_impl();
diff --git a/arts/kde/kioinputstream_impl.h b/arts/kde/kioinputstream_impl.h
index 1d18f6421..45bb34cd1 100644
--- a/arts/kde/kioinputstream_impl.h
+++ b/arts/kde/kioinputstream_impl.h
@@ -35,7 +35,7 @@ class TDEIOInputStream_impl : public TQObject, virtual public TDEIOInputStream_s
 					    virtual public InputStream_skel,
 					    virtual public StdSynthModule
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	TDEIOInputStream_impl();
 	~TDEIOInputStream_impl();
diff --git a/arts/kde/kplayobject.h b/arts/kde/kplayobject.h
index f5bd849be..8626405f0 100644
--- a/arts/kde/kplayobject.h
+++ b/arts/kde/kplayobject.h
@@ -29,7 +29,7 @@
 
 class KDE_EXPORT KPlayObject : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	KPlayObject();
 	KPlayObject(Arts::PlayObject playobject, bool isStream);
@@ -187,7 +187,7 @@ class PlayObjectFactory;
   */
 class KDE_EXPORT PlayObject : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	~PlayObject();
 
diff --git a/arts/kde/kplayobjectcreator.h b/arts/kde/kplayobjectcreator.h
index 74e571c8e..e0935ed22 100644
--- a/arts/kde/kplayobjectcreator.h
+++ b/arts/kde/kplayobjectcreator.h
@@ -31,7 +31,7 @@ namespace KDE {
 
 class PlayObjectCreator : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	PlayObjectCreator(Arts::SoundServerV2 server);
 	~PlayObjectCreator();
diff --git a/arts/kde/kplayobjectfactory_p.h b/arts/kde/kplayobjectfactory_p.h
index d1eb32a3c..9f4586e18 100644
--- a/arts/kde/kplayobjectfactory_p.h
+++ b/arts/kde/kplayobjectfactory_p.h
@@ -32,7 +32,7 @@ namespace KDE
 class POFHelper : public TQObject
 {
 	friend class PlayObjectFactory;
-	Q_OBJECT
+	TQ_OBJECT
 private slots:
 	void connectAmanPlay();
 private:
diff --git a/arts/kde/kvideowidget.h b/arts/kde/kvideowidget.h
index 0e3881a93..9cd8239a9 100644
--- a/arts/kde/kvideowidget.h
+++ b/arts/kde/kvideowidget.h
@@ -20,7 +20,7 @@
 
 class KDE_ARTS_EXPORT KVideoWidget : public TQWidget, virtual public KXMLGUIClient
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KVideoWidget( KXMLGUIClient *clientParent, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/arts/kde/mcop-dcop/kmcop.h b/arts/kde/mcop-dcop/kmcop.h
index 5ffa57bcd..aae0792b3 100644
--- a/arts/kde/mcop-dcop/kmcop.h
+++ b/arts/kde/mcop-dcop/kmcop.h
@@ -29,7 +29,7 @@ class KMCOPPrivate;
 class KMCOP : public TQObject,
 			  public DCOPObject
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 
 public:
diff --git a/arts/knotify/knotify.h b/arts/knotify/knotify.h
index 8348f3d40..b74fca3b2 100644
--- a/arts/knotify/knotify.h
+++ b/arts/knotify/knotify.h
@@ -30,7 +30,7 @@ class TDEConfig;
 
 class KNotify : public TQObject, public DCOPObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 	
 	public:
diff --git a/dcop/HOWTO b/dcop/HOWTO
index dedcf97dd..0fa520e1e 100644
--- a/dcop/HOWTO
+++ b/dcop/HOWTO
@@ -387,7 +387,7 @@ Example:
 
 class MyClass: public QObject, virtual public MyInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   public:
     MyClass(); 
@@ -431,7 +431,7 @@ just as well have defined a k_dcop section directly within MyClass:
 
 class MyClass: public QObject, virtual public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
diff --git a/dcop/Mainpage.dox b/dcop/Mainpage.dox
index 62fd3cf44..266f2d9fe 100644
--- a/dcop/Mainpage.dox
+++ b/dcop/Mainpage.dox
@@ -291,7 +291,7 @@ Example:
 \code
 class MyClass: public QObject, virtual public MyInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     MyClass();
@@ -340,7 +340,7 @@ just as well have defined a k_dcop section directly within MyClass:
 \code
 class MyClass: public QObject, virtual public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
   public:
diff --git a/dcop/dcop_deadlock_test.h b/dcop/dcop_deadlock_test.h
index 461c53cba..a0ee25f19 100644
--- a/dcop/dcop_deadlock_test.h
+++ b/dcop/dcop_deadlock_test.h
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class MyDCOPObject : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MyDCOPObject(const TQCString &name, const TQCString &remoteName);
   bool process(const TQCString &fun, const TQByteArray &data,
diff --git a/dcop/dcopclient.h b/dcop/dcopclient.h
index 4cb4b2f6e..7035e3c72 100644
--- a/dcop/dcopclient.h
+++ b/dcop/dcopclient.h
@@ -67,7 +67,7 @@ typedef TQValueList<TQCString> QCStringList;
  */
 class DCOP_EXPORT DCOPClient : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
  public:
diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll
index 302da3e14..710cbc3f4 100644
--- a/dcop/dcopidl/scanner.ll
+++ b/dcop/dcopidl/scanner.ll
@@ -235,7 +235,6 @@ FALSE			return T_FALSE;
 "k_dcop_signals"		return T_DCOP_SIGNAL_AREA;
 typedef			return T_TYPEDEF;
 K_DCOP			return T_DCOP;
-Q_OBJECT		;
 TQ_OBJECT		;
 ("0"|"0L")		return T_NULL;
 "extern "[A-Za-z0-9_ \t*]+	return T_EXTERN;
diff --git a/dcop/dcopidl2cpp/dcopidl_test.h b/dcop/dcopidl2cpp/dcopidl_test.h
index 66f18f92f..1d6d95a36 100644
--- a/dcop/dcopidl2cpp/dcopidl_test.h
+++ b/dcop/dcopidl2cpp/dcopidl_test.h
@@ -10,7 +10,7 @@
 
 class TDEUI_EXPORT DefaultTest : public TQObject, virtual public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    DefaultTest();
@@ -70,7 +70,7 @@ public:
 
 class NonHashingTest : public TQObject, virtual public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    NonHashingTest();
@@ -80,7 +80,7 @@ k_dcop:
 
 class HashingTest : public TQObject, virtual public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    HashingTest();
diff --git a/dcop/dcopidlng/kalyptus b/dcop/dcopidlng/kalyptus
index 38b38a013..312a62eb1 100644
--- a/dcop/dcopidlng/kalyptus
+++ b/dcop/dcopidlng/kalyptus
@@ -113,7 +113,6 @@ $allowed_k_dcop_accesors_re = join("|", @allowed_k_dcop_accesors);
     TQ_DISABLE_COPY => 'TQ_DISABLE_COPY',
     Q_WS_QWS => 'undef',
     Q_WS_MAC => 'undef',
-    Q_OBJECT => <<'CODE',
     TQ_OBJECT => <<'CODE',
 public:
     virtual QMetaObject *metaObject() const;
@@ -373,7 +372,7 @@ sub readSourceLine
 =head2 readCxxLine
 
 	Reads a C++ source line, skipping comments, blank lines,
-	preprocessor tokens and the Q_OBJECT/TQ_OBJECT macros
+	preprocessor tokens and the TQ_OBJECT macros
 
 =cut
 
@@ -401,10 +400,6 @@ LOOP:
 			}
 		}
 
-		if ( $p =~ /^\s*Q_OBJECT/ ) {
-			push @inputqueue, @codeqobject;
-			next;
-		}
 		if ( $p =~ /^\s*TQ_OBJECT/ ) {
 			push @inputqueue, @codeqobject;
 			next;
@@ -423,7 +418,7 @@ LOOP:
 		}
 
 		next if ( $p =~ /^\s*$/s ); 		# blank lines
-#			|| $p =~ /^\s*Q_OBJECT/		# QObject macro
+#			|| $p =~ /^\s*TQ_OBJECT/		# QObject macro
 #			);
 #
 
diff --git a/dcop/dcopserver.h b/dcop/dcopserver.h
index f0f5d1137..77c88f62e 100644
--- a/dcop/dcopserver.h
+++ b/dcop/dcopserver.h
@@ -116,7 +116,7 @@ public:
  */
 class DCOPServer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DCOPServer(bool _suicide);
     ~DCOPServer();
diff --git a/dcop/testdcop.h b/dcop/testdcop.h
index 3cb81372f..c3288bce9 100644
--- a/dcop/testdcop.h
+++ b/dcop/testdcop.h
@@ -43,7 +43,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 class TestObject : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TestObject(const TQCString &app);
 
@@ -58,7 +58,7 @@ private:
 
 class MyDCOPObject : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MyDCOPObject(const TQCString &name) : DCOPObject(name) {}
   bool process(const TQCString &fun, const TQByteArray &data,
diff --git a/dcop/tests/driver.h b/dcop/tests/driver.h
index 3565d88ab..654707c4f 100644
--- a/dcop/tests/driver.h
+++ b/dcop/tests/driver.h
@@ -7,7 +7,7 @@
 
 class Driver : public TQObject, public Test_stub
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		Driver(const char*);
diff --git a/dnssd/domainbrowser.h b/dnssd/domainbrowser.h
index 24cf53078..abe93507f 100644
--- a/dnssd/domainbrowser.h
+++ b/dnssd/domainbrowser.h
@@ -40,7 +40,7 @@ class DomainBrowserPrivate;
 */
 class TDEDNSSD_EXPORT DomainBrowser : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	Standard constructor. It takes all parameters from global configuration.
diff --git a/dnssd/publicservice.h b/dnssd/publicservice.h
index 30fbe8466..56c3aeb87 100644
--- a/dnssd/publicservice.h
+++ b/dnssd/publicservice.h
@@ -60,7 +60,7 @@ service->publishAsync();
 
 class TDEDNSSD_EXPORT PublicService : public TQObject, public ServiceBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	@param name Service name. If set to TQString::null, computer name will be used and will be
diff --git a/dnssd/query.h b/dnssd/query.h
index 037fb9fde..21ab9b166 100644
--- a/dnssd/query.h
+++ b/dnssd/query.h
@@ -38,7 +38,7 @@ name, either multicast or unicast DNS will be used.
  */
 class TDEDNSSD_EXPORT Query : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	Creates new query. 
diff --git a/dnssd/remoteservice.h b/dnssd/remoteservice.h
index b5ef4dcd9..8324f1bdc 100644
--- a/dnssd/remoteservice.h
+++ b/dnssd/remoteservice.h
@@ -41,7 +41,7 @@ service is resolved are name, type.and domain.
  */
 class TDEDNSSD_EXPORT RemoteService : public TQObject, public ServiceBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	typedef TDESharedPtr<RemoteService> Ptr;
 	
diff --git a/dnssd/responder.h b/dnssd/responder.h
index 187683c7b..5a9a41596 100644
--- a/dnssd/responder.h
+++ b/dnssd/responder.h
@@ -43,7 +43,7 @@ This class should not be used directly.
  */
 class Responder : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	Responder();
diff --git a/dnssd/servicebrowser.h b/dnssd/servicebrowser.h
index be2b6213b..04f2592ed 100644
--- a/dnssd/servicebrowser.h
+++ b/dnssd/servicebrowser.h
@@ -53,7 +53,7 @@ to constructor, domains configured by user will be searched.
  */
 class TDEDNSSD_EXPORT ServiceBrowser : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	@li AutoDelete -  DomainBrowser object passes in constructor should be deleted when ServiceBrowser is deleted
diff --git a/interfaces/tdeimproxy/interface/kimiface.h b/interfaces/tdeimproxy/interface/kimiface.h
index 2591c3ce0..aacb4217b 100644
--- a/interfaces/tdeimproxy/interface/kimiface.h
+++ b/interfaces/tdeimproxy/interface/kimiface.h
@@ -57,12 +57,12 @@
  * @endcode
  * and the class implementing KIMIface must pass "KIMIface" to the DCOPObject constructor:
  * @code
- * // just need TQObject inheritance and Q_OBJECT if you want signals and slots
+ * // just need TQObject inheritance and TQ_OBJECT if you want signals and slots
  * // no need to use K_DCOP macro again
  *
  * class MyIMIface : public TQObject, public KIMIface
  * {
- *     Q_OBJECT
+ *     TQ_OBJECT
  * public:
  *    MyIMIface(TQObject* parent = 0, const char* name) :
  *        DCOPObject("KIMIface"), // <-- passing the interface name as required
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.h b/interfaces/tdeimproxy/library/tdeimproxy.h
index 293d1f723..5a7ff87e9 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.h
+++ b/interfaces/tdeimproxy/library/tdeimproxy.h
@@ -106,7 +106,7 @@ typedef TQMap<TQString, ContactPresenceListCurrent> PresenceStringMap;
  */
 class TDEIMPROXY_EXPORT KIMProxy : public TQObject, virtual public KIMProxyIface
 {
-	Q_OBJECT
+	TQ_OBJECT
 	struct Private;
 
 	template<class> friend class KStaticDeleter;
diff --git a/interfaces/tdemediaplayer/player.h b/interfaces/tdemediaplayer/player.h
index 05582ca07..5302c721a 100644
--- a/interfaces/tdemediaplayer/player.h
+++ b/interfaces/tdemediaplayer/player.h
@@ -45,7 +45,7 @@ namespace KMediaPlayer
  */
 class KDE_EXPORT Player : public KParts::ReadOnlyPart, public PlayerDCOPObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/** This constructor is what to use when no GUI is required, as in the
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
index 6eae52cf7..f67533df2 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.h
@@ -36,7 +36,7 @@ class KFileItem;
  */
 class KFileAudioPreview : public KPreviewWidgetBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileAudioPreview(TQWidget *parent = 0, const char *name = 0 );
diff --git a/interfaces/tdemediaplayer/view.h b/interfaces/tdemediaplayer/view.h
index c1d9dbe41..69fce7b5f 100644
--- a/interfaces/tdemediaplayer/view.h
+++ b/interfaces/tdemediaplayer/view.h
@@ -33,7 +33,7 @@ namespace KMediaPlayer
 /** View is part of the user interface of a Player. */
 class KDE_EXPORT View : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
 	/** Your typical TQWidget constructor. */
diff --git a/interfaces/tdescript/sample/shellscript.h b/interfaces/tdescript/sample/shellscript.h
index 2cdaf7e5a..f03e17ba3 100644
--- a/interfaces/tdescript/sample/shellscript.h
+++ b/interfaces/tdescript/sample/shellscript.h
@@ -26,7 +26,7 @@
 //using namespace KScriptInterface;
 class ShellScript :  public KScriptInterface
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	ShellScript(KScriptClientInterface *parent, const char *name, const TQStringList &args);
 	virtual ~ShellScript();
diff --git a/interfaces/tdescript/scriptclientinterface.h b/interfaces/tdescript/scriptclientinterface.h
index 0f07d34b2..e1c345e10 100644
--- a/interfaces/tdescript/scriptclientinterface.h
+++ b/interfaces/tdescript/scriptclientinterface.h
@@ -33,7 +33,7 @@ class TQString;
 	*	interfaces with this class.
 	* @code
 	*	class MyScript : public TQObject, public KScriptClientInterface {
-	*	Q_OBJECT
+	*	TQ_OBJECT
 	*	public:
 	*
 	*	MyScript(TQObject *parent)
diff --git a/interfaces/tdescript/scriptinterface.h b/interfaces/tdescript/scriptinterface.h
index 1c37b7f71..78e6ba960 100644
--- a/interfaces/tdescript/scriptinterface.h
+++ b/interfaces/tdescript/scriptinterface.h
@@ -46,7 +46,7 @@ class KScriptClientInterface;
 	**/
 	class KDE_EXPORT KScriptInterface : public TQObject
 	{
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		/**
 		*	Return the current script code data
diff --git a/interfaces/tdescript/scriptloader.h b/interfaces/tdescript/scriptloader.h
index 7fa4fa93f..e575fb5c7 100644
--- a/interfaces/tdescript/scriptloader.h
+++ b/interfaces/tdescript/scriptloader.h
@@ -28,7 +28,7 @@
  */
 class ScriptLoader : virtual public QObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		/** 
 		* Default Constructor
diff --git a/interfaces/tdescript/scriptmanager.h b/interfaces/tdescript/scriptmanager.h
index d21219901..ed9db2d95 100644
--- a/interfaces/tdescript/scriptmanager.h
+++ b/interfaces/tdescript/scriptmanager.h
@@ -38,7 +38,7 @@ class ScriptInfo;
 	**/
 	class KDE_EXPORT KScriptManager : public TQObject, public KScriptClientInterface
 	{
-	Q_OBJECT
+	TQ_OBJECT
 	friend class KScriptInterface;
 	public:
 		/**
diff --git a/interfaces/tdetexteditor/configinterfaceextension.h b/interfaces/tdetexteditor/configinterfaceextension.h
index 23fa5bb38..f640ab0c5 100644
--- a/interfaces/tdetexteditor/configinterfaceextension.h
+++ b/interfaces/tdetexteditor/configinterfaceextension.h
@@ -28,7 +28,7 @@ namespace KTextEditor
 
 class KTEXTEDITOR_EXPORT ConfigPage : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ConfigPage ( TQWidget *parent=0, const char *name=0 );
diff --git a/interfaces/tdetexteditor/document.h b/interfaces/tdetexteditor/document.h
index 83d8b7cf6..817389ba3 100644
--- a/interfaces/tdetexteditor/document.h
+++ b/interfaces/tdetexteditor/document.h
@@ -32,7 +32,7 @@ class KTEXTEDITOR_EXPORT Document : public KTextEditor::Editor
 {
   friend class PrivateDocument;
 
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/interfaces/tdetexteditor/editor.h b/interfaces/tdetexteditor/editor.h
index 8b6699f9f..475711a9d 100644
--- a/interfaces/tdetexteditor/editor.h
+++ b/interfaces/tdetexteditor/editor.h
@@ -40,7 +40,7 @@ class KTEXTEDITOR_EXPORT Editor : public KParts::ReadWritePart
 {
   friend class PrivateEditor;
 
-  Q_OBJECT
+  TQ_OBJECT
   
 
   public:
diff --git a/interfaces/tdetexteditor/editorchooser.h b/interfaces/tdetexteditor/editorchooser.h
index 251776c10..62feda5c6 100644
--- a/interfaces/tdetexteditor/editorchooser.h
+++ b/interfaces/tdetexteditor/editorchooser.h
@@ -16,7 +16,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget
 {                    
   friend class PrivateEditorChooser;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     EditorChooser(TQWidget *parent=0,const char *name=0);
@@ -36,7 +36,7 @@ class KTEXTEDITOR_EXPORT EditorChooser: public TQWidget
 /*
 class EditorChooserBackEnd: public ComponentChooserPlugin {
 
-Q_OBJECT
+TQ_OBJECT
 public:
 	EditorChooserBackEnd(TQObject *parent=0, const char *name=0);
 	virtual ~EditorChooserBackEnd();
diff --git a/interfaces/tdetexteditor/plugin.h b/interfaces/tdetexteditor/plugin.h
index 68416bf78..b13dc37e9 100644
--- a/interfaces/tdetexteditor/plugin.h
+++ b/interfaces/tdetexteditor/plugin.h
@@ -37,7 +37,7 @@ class KTEXTEDITOR_EXPORT Plugin : public TQObject
 {
   friend class PrivatePlugin;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     Plugin ( Document *document = 0, const char *name = 0 );
diff --git a/interfaces/tdetexteditor/view.h b/interfaces/tdetexteditor/view.h
index 0a807d6b3..c8cf586b8 100644
--- a/interfaces/tdetexteditor/view.h
+++ b/interfaces/tdetexteditor/view.h
@@ -33,7 +33,7 @@ class KTEXTEDITOR_EXPORT View : public TQWidget, public KXMLGUIClient
 {
   friend class PrivateView;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/interfaces/terminal/test/main.h b/interfaces/terminal/test/main.h
index 256b0840a..bf87cb041 100644
--- a/interfaces/terminal/test/main.h
+++ b/interfaces/terminal/test/main.h
@@ -5,7 +5,7 @@
 class Win
     : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
     KParts::Part* p;
 public:
     Win();
diff --git a/kab/addressbook.h b/kab/addressbook.h
index 8aa78411e..1137407b3 100644
--- a/kab/addressbook.h
+++ b/kab/addressbook.h
@@ -183,7 +183,7 @@ class CategoriesMap : public TQMap<int, TQString>
 class AddressBook : public TQFrame
 {
   // ############################################################################
-  Q_OBJECT
+  TQ_OBJECT
   // ----------------------------------------------------------------------------
 public:
   /**
diff --git a/kab/kabapi.h b/kab/kabapi.h
index 98cae1320..b2585760a 100644
--- a/kab/kabapi.h
+++ b/kab/kabapi.h
@@ -68,7 +68,7 @@ class TDEListBox;
 class KabAPI : public KDialogBase
 {
   // ############################################################################
-  Q_OBJECT
+  TQ_OBJECT
   // ----------------------------------------------------------------------------
 public:
   /**
diff --git a/kab/qconfigDB.h b/kab/qconfigDB.h
index 36fcd369d..94a211527 100644
--- a/kab/qconfigDB.h
+++ b/kab/qconfigDB.h
@@ -550,7 +550,7 @@ public:
 class QConfigDB : public TQWidget
 {
   // ############################################################################
-  Q_OBJECT
+  TQ_OBJECT
   // ----------------------------------------------------------------------------
 protected:
   /**
diff --git a/kate/interfaces/document.h b/kate/interfaces/document.h
index 381e32fa2..c30a6d320 100644
--- a/kate/interfaces/document.h
+++ b/kate/interfaces/document.h
@@ -61,7 +61,7 @@ class KATEPARTINTERFACES_EXPORT Cursor : public KTextEditor::Cursor
 
 class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ConfigPage ( TQWidget *parent=0, const char *name=0 ) : KTextEditor::ConfigPage (parent, name) { ; };
@@ -79,7 +79,7 @@ class KATEPARTINTERFACES_EXPORT ConfigPage : public KTextEditor::ConfigPage
 
 class KATEPARTINTERFACES_EXPORT ActionMenu : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ActionMenu ( const TQString& text, TQObject* parent = 0, const char* name = 0 )
@@ -188,7 +188,7 @@ class KATEPARTINTERFACES_EXPORT Document : public KTextEditor::Document, public
                      public KTextEditor::MarkInterfaceExtension,
                      public KTextEditor::SelectionInterfaceExt
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     Document ();
diff --git a/kate/interfaces/view.h b/kate/interfaces/view.h
index 3b2b8a4e1..fcaf43110 100644
--- a/kate/interfaces/view.h
+++ b/kate/interfaces/view.h
@@ -43,7 +43,7 @@ class KATEPARTINTERFACES_EXPORT View : public KTextEditor::View, public KTextEdi
               public KTextEditor::PopupMenuInterface, public KTextEditor::ViewCursorInterface,
               public KTextEditor::CodeCompletionInterface, public KTextEditor::DynWordWrapInterface
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/part/katearbitraryhighlight.h b/kate/part/katearbitraryhighlight.h
index 1bea4891f..222c82c2e 100644
--- a/kate/part/katearbitraryhighlight.h
+++ b/kate/part/katearbitraryhighlight.h
@@ -31,7 +31,7 @@ class KateView;
 
 class KateArbitraryHighlightRange : public KateSuperRange, public KateAttribute
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KateArbitraryHighlightRange(KateSuperCursor* start, KateSuperCursor* end, TQObject* parent = 0L, const char* name = 0L);
@@ -59,7 +59,7 @@ public:
  */
 class KateArbitraryHighlight : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KateArbitraryHighlight(KateDocument* parent = 0L, const char* name = 0L);
diff --git a/kate/part/kateautoindent.h b/kate/part/kateautoindent.h
index fe8980d15..6a499df8e 100644
--- a/kate/part/kateautoindent.h
+++ b/kate/part/kateautoindent.h
@@ -43,7 +43,7 @@ class KateDocument;
  */
 class IndenterConfigPage : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -69,7 +69,7 @@ class IndenterConfigPage : public TQWidget
  */
 class KateAutoIndent : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   /**
    * Static methods to create and list indention modes
@@ -194,7 +194,7 @@ class KateAutoIndent : public TQObject
  */
 class KateViewIndentationAction : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent = 0, const char* name = 0);
@@ -216,7 +216,7 @@ class KateViewIndentationAction : public TDEActionMenu
  */
 class KateNormalIndent : public KateAutoIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
@@ -347,7 +347,7 @@ protected:
 
 class KateCSmartIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCSmartIndent (KateDocument *doc);
@@ -378,7 +378,7 @@ class KateCSmartIndent : public KateNormalIndent
 
 class KatePythonIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KatePythonIndent (KateDocument *doc);
@@ -399,7 +399,7 @@ class KatePythonIndent : public KateNormalIndent
 
 class KateXmlIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateXmlIndent (KateDocument *doc);
@@ -428,7 +428,7 @@ class KateXmlIndent : public KateNormalIndent
 
 class KateCSAndSIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCSAndSIndent (KateDocument *doc);
@@ -491,7 +491,7 @@ class KateCSAndSIndent : public KateNormalIndent
  */
 class KateVarIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
@@ -542,7 +542,7 @@ class KateVarIndent : public KateNormalIndent
 
 class KateScriptIndent : public KateNormalIndent
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateScriptIndent( KateDocument *doc );
@@ -563,7 +563,7 @@ class KateScriptIndent : public KateNormalIndent
 
 class ScriptIndentConfigPage : public IndenterConfigPage
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     ScriptIndentConfigPage ( TQWidget *parent=0, const char *name=0 );
diff --git a/kate/part/katebookmarks.h b/kate/part/katebookmarks.h
index 3295141f7..05215b66a 100644
--- a/kate/part/katebookmarks.h
+++ b/kate/part/katebookmarks.h
@@ -37,7 +37,7 @@ class TQMenuData;
 
 class KateBookmarks : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum Sorting { Position, Creation };
diff --git a/kate/part/katebuffer.h b/kate/part/katebuffer.h
index 2be23cbdb..96765ceba 100644
--- a/kate/part/katebuffer.h
+++ b/kate/part/katebuffer.h
@@ -340,7 +340,7 @@ class KateBufBlockList
  */
 class KateBuffer : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateBufBlock;
 
diff --git a/kate/part/katecodecompletion.h b/kate/part/katecodecompletion.h
index d2c9ca636..78c68a759 100644
--- a/kate/part/katecodecompletion.h
+++ b/kate/part/katecodecompletion.h
@@ -46,7 +46,7 @@ class TQVBox;
 
 class KateCodeCompletionCommentLabel : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCodeCompletionCommentLabel( TQWidget* parent, const TQString& text) : TQLabel( parent, "toolTipTip",
@@ -66,7 +66,7 @@ class KateCodeCompletionCommentLabel : public TQLabel
 
 class KateCodeCompletion : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateViewInternal;
 
@@ -116,7 +116,7 @@ class KateCodeCompletion : public TQObject
 
 class KateArgHint: public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
       KateArgHint( KateView* =0, const char* =0 );
diff --git a/kate/part/katecodefoldinghelpers.h b/kate/part/katecodefoldinghelpers.h
index 3f6d18b27..21faeeb0d 100644
--- a/kate/part/katecodefoldinghelpers.h
+++ b/kate/part/katecodefoldinghelpers.h
@@ -117,7 +117,7 @@ class KateCodeFoldingTree : public TQObject
 {
   friend class KateCodeFoldingNode;
 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCodeFoldingTree (KateBuffer *buffer);
diff --git a/kate/part/katedialogs.h b/kate/part/katedialogs.h
index 0f865fcea..b4b4eb137 100644
--- a/kate/part/katedialogs.h
+++ b/kate/part/katedialogs.h
@@ -79,7 +79,7 @@ class TQCheckBox;
 
 class KateConfigPage : public Kate::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateConfigPage ( TQWidget *parent=0, const char *name=0 );
@@ -97,7 +97,7 @@ class KateConfigPage : public Kate::ConfigPage
 
 class KateGotoLineDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -112,7 +112,7 @@ class KateGotoLineDialog : public KDialogBase
 
 class KateIndentConfigTab : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateIndentConfigTab(TQWidget *parent);
@@ -141,7 +141,7 @@ class KateIndentConfigTab : public KateConfigPage
 
 class KateSelectConfigTab : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSelectConfigTab(TQWidget *parent);
@@ -164,7 +164,7 @@ class KateSelectConfigTab : public KateConfigPage
 
 class KateEditConfigTab : public KateConfigPage
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     KateEditConfigTab(TQWidget *parent);
@@ -189,7 +189,7 @@ class KateEditConfigTab : public KateConfigPage
 
 class KateViewDefaultsConfig : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewDefaultsConfig( TQWidget *parent );
@@ -217,7 +217,7 @@ class KateViewDefaultsConfig : public KateConfigPage
 
 class KateEditKeyConfiguration: public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateEditKeyConfiguration( TQWidget* parent, KateDocument* doc );
@@ -240,7 +240,7 @@ class KateEditKeyConfiguration: public KateConfigPage
 
 class KateSaveConfigTab : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
   KateSaveConfigTab( TQWidget *parent );
 
@@ -265,7 +265,7 @@ class KatePartPluginListItem;
 
 class KatePartPluginListView : public TDEListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KatePartPluginListItem;
 
@@ -282,7 +282,7 @@ class KatePartPluginListView : public TDEListView
 class TQListViewItem;
 class KatePartPluginConfigPage : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KatePartPluginConfigPage (TQWidget *parent);
@@ -307,7 +307,7 @@ class KatePartPluginConfigPage : public KateConfigPage
 
 class KateHlConfigPage : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateHlConfigPage (TQWidget *parent, KateDocument *doc);
@@ -341,7 +341,7 @@ class KateHlConfigPage : public KateConfigPage
 
 class KateHlDownloadDialog: public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateHlDownloadDialog(TQWidget *parent, const char *name, bool modal);
@@ -369,7 +369,7 @@ class TDEProcess;
  */
 class KateModOnHdPrompt : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     enum Status {
       Reload=1, // 0 is KDialogBase::Cancel
diff --git a/kate/part/katedocument.h b/kate/part/katedocument.h
index b417c6d7d..c16a86840 100644
--- a/kate/part/katedocument.h
+++ b/kate/part/katedocument.h
@@ -84,7 +84,7 @@ class KateDocument : public Kate::Document,
                      public DCOPObject
 {
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateViewInternal;
   friend class KateRenderer;
diff --git a/kate/part/katedocumenthelpers.h b/kate/part/katedocumenthelpers.h
index b604d47ce..0609f6841 100644
--- a/kate/part/katedocumenthelpers.h
+++ b/kate/part/katedocumenthelpers.h
@@ -35,7 +35,7 @@ class KateDocument;
  */
 class KateBrowserExtension : public KParts::BrowserExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/part/katefiletype.h b/kate/part/katefiletype.h
index 7a927636b..c85682249 100644
--- a/kate/part/katefiletype.h
+++ b/kate/part/katefiletype.h
@@ -78,7 +78,7 @@ class KateFileTypeManager
 
 class KateFileTypeConfigTab : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateFileTypeConfigTab( TQWidget *parent );
@@ -114,7 +114,7 @@ class KateFileTypeConfigTab : public KateConfigPage
 
 class KateViewFileTypeAction : public Kate::ActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewFileTypeAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
diff --git a/kate/part/katehighlight.h b/kate/part/katehighlight.h
index 207d9a245..3ab7a7042 100644
--- a/kate/part/katehighlight.h
+++ b/kate/part/katehighlight.h
@@ -340,7 +340,7 @@ class KateHighlighting
 
 class KateHlManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   private:
     KateHlManager();
@@ -408,7 +408,7 @@ class KateHlManager : public TQObject
 
 class KateViewHighlightAction: public Kate::ActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewHighlightAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
diff --git a/kate/part/kateprinter.h b/kate/part/kateprinter.h
index 283c2b58e..b24691102 100644
--- a/kate/part/kateprinter.h
+++ b/kate/part/kateprinter.h
@@ -50,7 +50,7 @@ class KatePrinter
 */
 class KatePrintTextSettings : public KPrintDialogPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KatePrintTextSettings( KPrinter *printer, TQWidget *parent=0, const char *name=0 );
     ~KatePrintTextSettings(){};
@@ -77,7 +77,7 @@ class KatePrintTextSettings : public KPrintDialogPage
 
 class KatePrintHeaderFooter : public KPrintDialogPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KatePrintHeaderFooter( KPrinter *printer, TQWidget *parent=0, const char *name=0 );
     ~KatePrintHeaderFooter(){};
@@ -115,7 +115,7 @@ class KatePrintHeaderFooter : public KPrintDialogPage
 */
 class KatePrintLayout : public KPrintDialogPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     KatePrintLayout( KPrinter *printer, TQWidget *parent=0, const char *name=0 );
     ~KatePrintLayout(){};
diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h
index cf503be68..55f03ebee 100644
--- a/kate/part/kateschema.h
+++ b/kate/part/kateschema.h
@@ -92,7 +92,7 @@ class KateSchemaManager
 
 class KateViewSchemaAction : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewSchemaAction(const TQString& text, TQObject* parent = 0, const char* name = 0)
@@ -127,7 +127,7 @@ class KateViewSchemaAction : public TDEActionMenu
 */
 class KateStyleListView : public TQListView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateStyleListItem;
 
@@ -162,7 +162,7 @@ class KateStyleListView : public TQListView
 
 class KateSchemaConfigColorTab : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigColorTab( TQWidget *parent = 0, const char *name = 0 );
@@ -209,7 +209,7 @@ typedef TQMap<int,TQFont> FontMap; // ### remove it
 
 class KateSchemaConfigFontTab : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigFontTab( TQWidget *parent = 0, const char *name = 0 );
@@ -236,7 +236,7 @@ class KateSchemaConfigFontTab : public TQWidget
 
 class KateSchemaConfigFontColorTab : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigFontColorTab( TQWidget *parent = 0, const char *name = 0 );
@@ -256,7 +256,7 @@ class KateSchemaConfigFontColorTab : public TQWidget
 
 class KateSchemaConfigHighlightTab : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigHighlightTab( TQWidget *parent = 0, const char *name = 0, KateSchemaConfigFontColorTab *page = 0, uint hl = 0 );
@@ -284,7 +284,7 @@ class KateSchemaConfigHighlightTab : public TQWidget
 
 class KateSchemaConfigPage : public KateConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSchemaConfigPage ( TQWidget *parent, class KateDocument *doc=0 );
diff --git a/kate/part/katesearch.h b/kate/part/katesearch.h
index 139cd3ff9..7ff798325 100644
--- a/kate/part/katesearch.h
+++ b/kate/part/katesearch.h
@@ -41,7 +41,7 @@ class TDEActionCollection;
 
 class KateSearch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KateDocument;
 
@@ -167,7 +167,7 @@ class KateSearch : public TQObject
  */
 class KateReplacePrompt : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/kate/part/katespell.h b/kate/part/katespell.h
index 6119d0ea4..6a5e3ad52 100644
--- a/kate/part/katespell.h
+++ b/kate/part/katespell.h
@@ -32,7 +32,7 @@ class KSpell;
 
 class KateSpell : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateSpell( KateView* );
diff --git a/kate/part/katesupercursor.h b/kate/part/katesupercursor.h
index 74baf07df..270227925 100644
--- a/kate/part/katesupercursor.h
+++ b/kate/part/katesupercursor.h
@@ -44,7 +44,7 @@ class KateView;
  **/
 class KateSuperCursor : public TQObject, public KateDocCursor, public Kate::Cursor
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
@@ -169,7 +169,7 @@ class KateSuperRange : public TQObject, public KateRange
 {
 			  friend class KateSuperRangeList;
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /// Determine how the range reacts to characters inserted immediately outside the range.
@@ -338,7 +338,7 @@ protected:
 
 class KateSuperRangeList : public TQObject, public TQPtrList<KateSuperRange>
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/kate/part/katetemplatehandler.h b/kate/part/katetemplatehandler.h
index d7d56e074..f50023f46 100644
--- a/kate/part/katetemplatehandler.h
+++ b/kate/part/katetemplatehandler.h
@@ -29,7 +29,7 @@
 class KateDocument;
 
 class KateTemplateHandler: public TQObject, public KateKeyInterceptorFunctor {
-		Q_OBJECT
+		TQ_OBJECT
 	public:
 		KateTemplateHandler(KateDocument *doc,uint line,uint column, const TQString &templateString, const TQMap<TQString,TQString> &initialValues);
 		virtual ~KateTemplateHandler();
diff --git a/kate/part/kateview.h b/kate/part/kateview.h
index 0a00ab1fc..1e113618e 100644
--- a/kate/part/kateview.h
+++ b/kate/part/kateview.h
@@ -62,7 +62,7 @@ class KateView : public Kate::View,
                  public KTextEditor::SelectionInterfaceExt,
                  public KTextEditor::BlockSelectionInterface
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KateViewInternal;
     friend class KateIconBorder;
diff --git a/kate/part/kateviewhelpers.h b/kate/part/kateviewhelpers.h
index ecaec3303..1e162af18 100644
--- a/kate/part/kateviewhelpers.h
+++ b/kate/part/kateviewhelpers.h
@@ -47,7 +47,7 @@ namespace Kate {
  */
 class KateScrollBar : public TQScrollBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateScrollBar(Orientation orientation, class KateViewInternal *parent, const char* name = 0L);
@@ -94,7 +94,7 @@ class KateScrollBar : public TQScrollBar
 
 class KateCmdLine : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateCmdLine (KateView *view);
@@ -121,7 +121,7 @@ class KateCmdLine : public KLineEdit
 
 class KateIconBorder : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateIconBorder( KateViewInternal* internalView, TQWidget *parent );
@@ -184,7 +184,7 @@ class KateIconBorder : public TQWidget
 
 class KateViewEncodingAction : public TDEActionMenu
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent = 0, const char* name = 0);
diff --git a/kate/part/kateviewinternal.h b/kate/part/kateviewinternal.h
index 0d9aa7c55..77fb81e7a 100644
--- a/kate/part/kateviewinternal.h
+++ b/kate/part/kateviewinternal.h
@@ -52,7 +52,7 @@ enum Bias
 
 class KateViewInternal : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class KateView;
     friend class KateIconBorder;
diff --git a/kate/part/test_regression.h b/kate/part/test_regression.h
index 2128ce25d..7ef1b9ee1 100644
--- a/kate/part/test_regression.h
+++ b/kate/part/test_regression.h
@@ -162,7 +162,7 @@ class OutputFunction : public KJS::ObjectImp
  */
 class RegressionTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
     RegressionTest(KateDocument *part, TDEConfig *baseConfig,
diff --git a/kate/plugins/autobookmarker/autobookmarker.h b/kate/plugins/autobookmarker/autobookmarker.h
index 9687d8ceb..1f6d1daeb 100644
--- a/kate/plugins/autobookmarker/autobookmarker.h
+++ b/kate/plugins/autobookmarker/autobookmarker.h
@@ -50,7 +50,7 @@ class AutoBookmarker
   : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface,
     public KTextEditor::ConfigInterfaceExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     AutoBookmarker( TQObject *parent = 0,
                         const char* name = 0,
@@ -96,7 +96,7 @@ class ABGlobal
 
 class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     AutoBookmarkerConfigPage( TQWidget *parent, const char *name );
     virtual ~AutoBookmarkerConfigPage() {};
@@ -118,7 +118,7 @@ class AutoBookmarkerConfigPage : public KTextEditor::ConfigPage
 
 class AutoBookmarkerEntEditor : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmarkEnt *e );
     ~AutoBookmarkerEntEditor(){};
diff --git a/kate/plugins/insertfile/insertfileplugin.h b/kate/plugins/insertfile/insertfileplugin.h
index da08a02c7..0f7bfc2c9 100644
--- a/kate/plugins/insertfile/insertfileplugin.h
+++ b/kate/plugins/insertfile/insertfileplugin.h
@@ -32,7 +32,7 @@
 
 class InsertFilePlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface
 {             
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     InsertFilePlugin( TQObject *parent = 0, 
@@ -50,7 +50,7 @@ class InsertFilePlugin : public KTextEditor::Plugin, public KTextEditor::PluginV
 
 class InsertFilePluginView : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     InsertFilePluginView( KTextEditor::View *view, const char *name=0 );
     ~InsertFilePluginView() {};
diff --git a/kate/plugins/isearch/ISearchPlugin.h b/kate/plugins/isearch/ISearchPlugin.h
index b11b2a8b6..e1893c516 100644
--- a/kate/plugins/isearch/ISearchPlugin.h
+++ b/kate/plugins/isearch/ISearchPlugin.h
@@ -34,7 +34,7 @@ class TQLabel;
 
 class ISearchPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	ISearchPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() );
@@ -49,7 +49,7 @@ private:
 
 class ISearchPluginView : public TQObject, public KXMLGUIClient
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	ISearchPluginView( KTextEditor::View *view );
diff --git a/kate/plugins/kdatatool/kate_kdatatool.h b/kate/plugins/kdatatool/kate_kdatatool.h
index a217c6f27..b3ef86767 100644
--- a/kate/plugins/kdatatool/kate_kdatatool.h
+++ b/kate/plugins/kdatatool/kate_kdatatool.h
@@ -36,7 +36,7 @@ class View;
 
 class KDataToolPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KDataToolPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() );
@@ -51,7 +51,7 @@ public:
 
 class KDataToolPluginView : public TQObject, public KXMLGUIClient
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KDataToolPluginView( KTextEditor::View *view );
diff --git a/kate/plugins/wordcompletion/docwordcompletion.h b/kate/plugins/wordcompletion/docwordcompletion.h
index f22f99d4e..e2ff3cfb2 100644
--- a/kate/plugins/wordcompletion/docwordcompletion.h
+++ b/kate/plugins/wordcompletion/docwordcompletion.h
@@ -44,7 +44,7 @@ class DocWordCompletionPlugin
   , public KTextEditor::PluginViewInterface
   , public KTextEditor::ConfigInterfaceExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DocWordCompletionPlugin( TQObject *parent = 0,
@@ -81,7 +81,7 @@ class DocWordCompletionPlugin
 class DocWordCompletionPluginView
    : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DocWordCompletionPluginView( uint treshold=3, bool autopopup=true, KTextEditor::View *view=0,
@@ -113,7 +113,7 @@ class DocWordCompletionPluginView
 
 class DocWordCompletionConfigPage : public KTextEditor::ConfigPage
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     DocWordCompletionConfigPage( DocWordCompletionPlugin *completion, TQWidget *parent, const char *name );
     virtual ~DocWordCompletionConfigPage() {};
diff --git a/kded/kded.h b/kded/kded.h
index a4968624a..ad6a8353c 100644
--- a/kded/kded.h
+++ b/kded/kded.h
@@ -40,7 +40,7 @@ class KService;
 // No need for this in libtdeio - apps only get readonly access
 class Kded : public TQObject, public DCOPObject, public DCOPObjectProxy
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
    Kded(bool checkUpdates, bool new_startup);
    virtual ~Kded();
@@ -175,7 +175,7 @@ private:
 
 class KUpdateD : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KUpdateD();
    ~KUpdateD();
@@ -202,7 +202,7 @@ private:
 
 class KHostnameD : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KHostnameD(int pollInterval);
    ~KHostnameD();
diff --git a/kded/kdedmodule.h b/kded/kdedmodule.h
index f3954e842..bdc9cb6d2 100644
--- a/kded/kdedmodule.h
+++ b/kded/kdedmodule.h
@@ -54,7 +54,7 @@ class Kded;
 
 class KDE_EXPORT KDEDModule : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 // For inclusion in KDE4 (since it's BIC) long-needed fix for allowing
 // DCOP-based kdedmodules -- Gav <gav@kde.org>.
 //  K_DCOP
diff --git a/kded/tdebuildsycoca.h b/kded/tdebuildsycoca.h
index 51e7af337..77b685a41 100644
--- a/kded/tdebuildsycoca.h
+++ b/kded/tdebuildsycoca.h
@@ -37,7 +37,7 @@ class TQDataStream;
 // No need for this in libtdeio - apps only get readonly access
 class KBuildSycoca : public KSycoca
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KBuildSycoca();
    virtual ~KBuildSycoca();
diff --git a/kded/test/test.h b/kded/test/test.h
index 9382a6fba..5ce672e0d 100644
--- a/kded/test/test.h
+++ b/kded/test/test.h
@@ -8,7 +8,7 @@
 
 class TestModule : public KDEDModule
 {
-   Q_OBJECT
+   TQ_OBJECT
    K_DCOP
 public:
    TestModule(const TQCString &obj);
diff --git a/kded/vfolder_menu.h b/kded/vfolder_menu.h
index a2536af7d..98f09702c 100644
--- a/kded/vfolder_menu.h
+++ b/kded/vfolder_menu.h
@@ -31,7 +31,7 @@
 
 class VFolderMenu : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   class appsInfo;
   class SubMenu {
diff --git a/libtdescreensaver/tdescreensaver.h b/libtdescreensaver/tdescreensaver.h
index 0dbb0e5d2..bfca411cd 100644
--- a/libtdescreensaver/tdescreensaver.h
+++ b/libtdescreensaver/tdescreensaver.h
@@ -58,7 +58,7 @@ class KBlankEffectPrivate;
 */
 class KDE_EXPORT KScreenSaver : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
     /**
      * @param id The winId() of the widget to draw the screensaver into.
@@ -93,7 +93,7 @@ private:
 */
 class KBlankEffect : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KBlankEffect( TQObject *parent=0 );
 	~KBlankEffect();
diff --git a/networkstatus/connectionmanager.h b/networkstatus/connectionmanager.h
index 00ca4e35c..540fef443 100644
--- a/networkstatus/connectionmanager.h
+++ b/networkstatus/connectionmanager.h
@@ -24,7 +24,7 @@ class ConnectionManagerPrivate;
 
 class ConnectionManager : public TQObject, virtual public DCOPObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 	public:
 		static ConnectionManager* self();
diff --git a/networkstatus/networkstatus.h b/networkstatus/networkstatus.h
index 4ff615ef8..cd0ab42ae 100644
--- a/networkstatus/networkstatus.h
+++ b/networkstatus/networkstatus.h
@@ -34,7 +34,7 @@ struct NetworkStatusStruct;
 
 class NetworkStatusModule : virtual public KDEDModule/*, public ClientIface, ServiceIface*/ // <-spot the multiple inheritance pb
 {
-Q_OBJECT
+TQ_OBJECT
 K_DCOP
 public:
 	NetworkStatusModule( const TQCString & obj );
diff --git a/networkstatus/networkstatusindicator.h b/networkstatus/networkstatusindicator.h
index f1cfa966a..e88a41f17 100644
--- a/networkstatus/networkstatusindicator.h
+++ b/networkstatus/networkstatusindicator.h
@@ -29,7 +29,7 @@
 
 class StatusBarNetworkStatusIndicator : public TQHBox
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   StatusBarNetworkStatusIndicator( TQWidget * parent, const char * name );
   virtual ~StatusBarNetworkStatusIndicator();
diff --git a/networkstatus/testservice.h b/networkstatus/testservice.h
index 9a7ef127d..e893ec6ea 100644
--- a/networkstatus/testservice.h
+++ b/networkstatus/testservice.h
@@ -29,7 +29,7 @@ class ServiceIface_stub;
 
 class TestService : virtual public TQObject, ProviderIface
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	TestService();
 	virtual ~TestService();
diff --git a/tdeabc/addressbook.h b/tdeabc/addressbook.h
index 5a3d1a45a..f2fa1e0e1 100644
--- a/tdeabc/addressbook.h
+++ b/tdeabc/addressbook.h
@@ -42,7 +42,7 @@ class Ticket;
  */
 class KABC_EXPORT AddressBook : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend KABC_EXPORT TQDataStream &operator<<( TQDataStream &, const AddressBook & );
   friend KABC_EXPORT TQDataStream &operator>>( TQDataStream &, AddressBook & );
diff --git a/tdeabc/addresseedialog.h b/tdeabc/addresseedialog.h
index f94b49b71..4623abdb1 100644
--- a/tdeabc/addresseedialog.h
+++ b/tdeabc/addresseedialog.h
@@ -82,7 +82,7 @@ class KABC_EXPORT AddresseeItem : public TQListViewItem
 */
 class KABC_EXPORT AddresseeDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     /**
diff --git a/tdeabc/addresslineedit.h b/tdeabc/addresslineedit.h
index b8f83ceab..d42e35533 100644
--- a/tdeabc/addresslineedit.h
+++ b/tdeabc/addresslineedit.h
@@ -49,7 +49,7 @@ class LdapSearch;
  */
 class KABC_EXPORT AddressLineEdit : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   AddressLineEdit(TQWidget* parent, bool useCompletion = true,
 		const char *name = 0L);
diff --git a/tdeabc/distributionlist.h b/tdeabc/distributionlist.h
index 44de7f0d3..acd4ee22b 100644
--- a/tdeabc/distributionlist.h
+++ b/tdeabc/distributionlist.h
@@ -188,7 +188,7 @@ class KABC_EXPORT DistributionListManager
 
 class KABC_EXPORT DistributionListWatcher : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeabc/distributionlistdialog.h b/tdeabc/distributionlistdialog.h
index 0270c3605..3fd97243d 100644
--- a/tdeabc/distributionlistdialog.h
+++ b/tdeabc/distributionlistdialog.h
@@ -54,7 +54,7 @@ class DistributionListManager;
 */
 class KABC_EXPORT DistributionListDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     /**
@@ -100,7 +100,7 @@ class KABC_EXPORT EmailSelector : public KDialogBase
 */
 class KABC_EXPORT DistributionListEditorWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     DistributionListEditorWidget( AddressBook *, TQWidget *parent );
diff --git a/tdeabc/distributionlisteditor.h b/tdeabc/distributionlisteditor.h
index 5c0b4c03a..e82d8961f 100644
--- a/tdeabc/distributionlisteditor.h
+++ b/tdeabc/distributionlisteditor.h
@@ -53,7 +53,7 @@ class KABC_EXPORT EmailSelectDialog : public KDialogBase
 */
 class KABC_EXPORT DistributionListEditor : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     DistributionListEditor( AddressBook *, TQWidget *parent );
     virtual ~DistributionListEditor();
diff --git a/tdeabc/ldapclient.h b/tdeabc/ldapclient.h
index a4a5747a6..c05162a22 100644
--- a/tdeabc/ldapclient.h
+++ b/tdeabc/ldapclient.h
@@ -84,7 +84,7 @@ class KABC_EXPORT LdapObject
   */
 class KABC_EXPORT LdapClient : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     LdapClient( TQObject* parent = 0, const char* name = 0 );
@@ -206,7 +206,7 @@ typedef TQValueList<LdapResult> LdapResultList;
   */
 class KABC_EXPORT LdapSearch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     LdapSearch();
diff --git a/tdeabc/ldapconfigwidget.h b/tdeabc/ldapconfigwidget.h
index ed39bb776..9f053bfd9 100644
--- a/tdeabc/ldapconfigwidget.h
+++ b/tdeabc/ldapconfigwidget.h
@@ -49,7 +49,7 @@ namespace TDEABC {
 
   class KABC_EXPORT LdapConfigWidget : public TQWidget
   {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( LCW_Flags flags READ flagsProp WRITE setFlagsProp )
     TQ_PROPERTY( TQString user READ user WRITE setUser )
diff --git a/tdeabc/lock.h b/tdeabc/lock.h
index d4d04532a..6b96d9fe7 100644
--- a/tdeabc/lock.h
+++ b/tdeabc/lock.h
@@ -34,7 +34,7 @@ namespace TDEABC {
 */
 class KABC_EXPORT Lock : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     /**
       Constructor.
diff --git a/tdeabc/plugins/dir/resourcedir.h b/tdeabc/plugins/dir/resourcedir.h
index dc9d1d06a..8c9eb66a4 100644
--- a/tdeabc/plugins/dir/resourcedir.h
+++ b/tdeabc/plugins/dir/resourcedir.h
@@ -40,7 +40,7 @@ class Lock;
 */
 class KABC_EXPORT ResourceDir : public Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceDir( const TDEConfig* );
diff --git a/tdeabc/plugins/dir/resourcedirconfig.h b/tdeabc/plugins/dir/resourcedirconfig.h
index 51fac5812..9ba2ec492 100644
--- a/tdeabc/plugins/dir/resourcedirconfig.h
+++ b/tdeabc/plugins/dir/resourcedirconfig.h
@@ -30,7 +30,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceDirConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceDirConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeabc/plugins/file/resourcefile.h b/tdeabc/plugins/file/resourcefile.h
index ffa19a4bf..2f38254a2 100644
--- a/tdeabc/plugins/file/resourcefile.h
+++ b/tdeabc/plugins/file/resourcefile.h
@@ -39,7 +39,7 @@ class Lock;
 */
 class KABC_EXPORT ResourceFile : public Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeabc/plugins/file/resourcefileconfig.h b/tdeabc/plugins/file/resourcefileconfig.h
index 3be4cca49..0f3c12cd5 100644
--- a/tdeabc/plugins/file/resourcefileconfig.h
+++ b/tdeabc/plugins/file/resourcefileconfig.h
@@ -30,7 +30,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceFileConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceFileConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
index 8f0565c3e..e82e94c83 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.h
@@ -32,7 +32,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceLDAPTDEIO : public Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum CachePolicy{ Cache_No, Cache_NoConnection, Cache_Always };
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
index d56b4de31..2d3f3571f 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.h
@@ -44,7 +44,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceLDAPTDEIOConfig( TQWidget* parent = 0, const char* name = 0 );
@@ -68,7 +68,7 @@ class KABC_EXPORT ResourceLDAPTDEIOConfig : public KRES::ConfigWidget
 
 class AttributesDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     AttributesDialog( const TQMap<TQString, TQString> &attributes, int rdnprefix,
@@ -93,7 +93,7 @@ class AttributesDialog : public KDialogBase
 
 class OfflineDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, 
diff --git a/tdeabc/plugins/net/resourcenet.h b/tdeabc/plugins/net/resourcenet.h
index e190c63c8..0ce7bf862 100644
--- a/tdeabc/plugins/net/resourcenet.h
+++ b/tdeabc/plugins/net/resourcenet.h
@@ -44,7 +44,7 @@ class FormatPlugin;
 */
 class KABC_EXPORT ResourceNet : public Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceNet( const TDEConfig* );
diff --git a/tdeabc/plugins/net/resourcenetconfig.h b/tdeabc/plugins/net/resourcenetconfig.h
index 513c77de2..df1a73ba6 100644
--- a/tdeabc/plugins/net/resourcenetconfig.h
+++ b/tdeabc/plugins/net/resourcenetconfig.h
@@ -30,7 +30,7 @@ namespace TDEABC {
 
 class KABC_EXPORT ResourceNetConfig : public KRES::ConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceNetConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeabc/plugins/sql/resourcesqlconfig.h b/tdeabc/plugins/sql/resourcesqlconfig.h
index e0c08880c..116248809 100644
--- a/tdeabc/plugins/sql/resourcesqlconfig.h
+++ b/tdeabc/plugins/sql/resourcesqlconfig.h
@@ -30,7 +30,7 @@ namespace TDEABC {
 
 class ResourceSqlConfig : public ResourceConfigWidget
 { 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceSqlConfig( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeabc/resource.h b/tdeabc/resource.h
index 5e9d9cb0d..d18c551d3 100644
--- a/tdeabc/resource.h
+++ b/tdeabc/resource.h
@@ -54,7 +54,7 @@ class KABC_EXPORT Ticket
  */
 class KABC_EXPORT Resource : public KRES::Resource
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/tdeabc/resourceselectdialog.h b/tdeabc/resourceselectdialog.h
index 1d820ece1..b8df436ac 100644
--- a/tdeabc/resourceselectdialog.h
+++ b/tdeabc/resourceselectdialog.h
@@ -38,7 +38,7 @@ class Resource;
  */
 class KABC_EXPORT_DEPRECATED ResourceSelectDialog : KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ResourceSelectDialog( AddressBook *ab, TQWidget *parent = 0,
diff --git a/tdeabc/tests/testldapclient.h b/tdeabc/tests/testldapclient.h
index 502115b07..8b1a9bda4 100644
--- a/tdeabc/tests/testldapclient.h
+++ b/tdeabc/tests/testldapclient.h
@@ -26,7 +26,7 @@ typedef TDEABC::LdapClient LdapClient;
 
 class TestLDAPClient : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TestLDAPClient() {}
diff --git a/tdeabc/tests/testlock.h b/tdeabc/tests/testlock.h
index 62466b89a..a093a9ecb 100644
--- a/tdeabc/tests/testlock.h
+++ b/tdeabc/tests/testlock.h
@@ -30,7 +30,7 @@ class TQListView;
 
 class KABC_EXPORT LockWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     LockWidget( const TQString &identifier );
     ~LockWidget();
diff --git a/tdecert/tdecertpart.h b/tdecert/tdecertpart.h
index 45edb168c..5d363f78d 100644
--- a/tdecert/tdecertpart.h
+++ b/tdecert/tdecertpart.h
@@ -66,7 +66,7 @@ class KPKCS12Item : public TDEListViewItem {
 
 
 class KCertPart : public KParts::ReadWritePart {
-Q_OBJECT
+TQ_OBJECT
 public:
   KCertPart(TQWidget *parentWidget, const char *widgetName,
             TQObject *parent = 0L, const char *name = 0L,
diff --git a/tdecmshell/main.h b/tdecmshell/main.h
index 01f7d84c4..6f1ee1bda 100644
--- a/tdecmshell/main.h
+++ b/tdecmshell/main.h
@@ -32,7 +32,7 @@
  */
 class KCMShell : public TDEApplication
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -81,7 +81,7 @@ private:
  */
 class KCMShellMultiDialog : public KCMultiDialog, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 
 public:
diff --git a/tdecore/kasyncio.h b/tdecore/kasyncio.h
index 88b904a55..46c51c10c 100644
--- a/tdecore/kasyncio.h
+++ b/tdecore/kasyncio.h
@@ -46,7 +46,7 @@ public TQObject,
 #endif // USE_QT4
 public TQIODevice
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 protected:
   KAsyncIO()			// cannot be accessed externally
diff --git a/tdecore/kaudioplayer.h b/tdecore/kaudioplayer.h
index 327713e6d..6e011e246 100644
--- a/tdecore/kaudioplayer.h
+++ b/tdecore/kaudioplayer.h
@@ -54,7 +54,7 @@ class KAudioPlayerPrivate;
  */
 //REVISED: hausmann
 class TDECORE_EXPORT KAudioPlayer : public TQObject {
-Q_OBJECT
+TQ_OBJECT
 public:
 	/**
 	 * Constructor.
diff --git a/tdecore/kbufferedio.h b/tdecore/kbufferedio.h
index f00ab52b6..1b272eb0a 100644
--- a/tdecore/kbufferedio.h
+++ b/tdecore/kbufferedio.h
@@ -55,7 +55,7 @@ class TDEBufferedIOPrivate;
  */
 class TDECORE_EXPORT TDEBufferedIO: public KAsyncIO
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 protected:
diff --git a/tdecore/kcheckaccelerators.h b/tdecore/kcheckaccelerators.h
index 00adf4fd1..d16286c26 100644
--- a/tdecore/kcheckaccelerators.h
+++ b/tdecore/kcheckaccelerators.h
@@ -65,7 +65,7 @@ class TQTextView;
 */
 class TDECORE_EXPORT KCheckAccelerators : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Creates a KCheckAccelerators instance for the given object.
diff --git a/tdecore/kclipboard.h b/tdecore/kclipboard.h
index 8ed8dcc91..df45027f1 100644
--- a/tdecore/kclipboard.h
+++ b/tdecore/kclipboard.h
@@ -35,7 +35,7 @@
  */
 class TDECORE_EXPORT TDEClipboardSynchronizer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /** Systray widget for manipulating the clipboard. */
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h
index 2bce648fb..9adf2f91a 100644
--- a/tdecore/kcompletion.h
+++ b/tdecore/kcompletion.h
@@ -135,7 +135,7 @@ class TDECORE_EXPORT TDECompletion : public TQObject
     TQ_PROPERTY( CompOrder order READ order WRITE setOrder )
     TQ_PROPERTY( bool ignoreCase READ ignoreCase WRITE setIgnoreCase )
     TQ_PROPERTY( TQStringList items READ items WRITE setItems )
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdecore/kdesktopfile.h b/tdecore/kdesktopfile.h
index cfdc5488c..12cf85225 100644
--- a/tdecore/kdesktopfile.h
+++ b/tdecore/kdesktopfile.h
@@ -33,7 +33,7 @@ class KDesktopFilePrivate;
  */
 class TDECORE_EXPORT KDesktopFile : public TDEConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdecore/kextsock.h b/tdecore/kextsock.h
index fad502c04..f9edb033e 100644
--- a/tdecore/kextsock.h
+++ b/tdecore/kextsock.h
@@ -94,7 +94,7 @@ class KExtendedSocketPrivate;
  */
 class TDECORE_EXPORT KExtendedSocket: public TDEBufferedIO // public TQObject, public QIODevice
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index a8ed8a955..98a38e645 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -44,7 +44,7 @@ class TDEGlobalAccelPrivate;
 */
 class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	/**
 	 * Creates a new TDEGlobalAccel object with the given pParent and
diff --git a/tdecore/kglobalaccel_win.h b/tdecore/kglobalaccel_win.h
index e60fed8ee..45943b071 100644
--- a/tdecore/kglobalaccel_win.h
+++ b/tdecore/kglobalaccel_win.h
@@ -33,7 +33,7 @@
 class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
 {
 	friend class TDEGlobalAccel;
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	TDEGlobalAccelPrivate();
 	virtual ~TDEGlobalAccelPrivate();
diff --git a/tdecore/kglobalaccel_x11.h b/tdecore/kglobalaccel_x11.h
index b22363926..1502d89cb 100644
--- a/tdecore/kglobalaccel_x11.h
+++ b/tdecore/kglobalaccel_x11.h
@@ -33,7 +33,7 @@
 class TDEGlobalAccelPrivate : public TQWidget, public TDEAccelBase
 {
 	friend class TDEGlobalAccel;
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	TDEGlobalAccelPrivate();
 	virtual ~TDEGlobalAccelPrivate();
diff --git a/tdecore/kiconloader_p.h b/tdecore/kiconloader_p.h
index 1e5d5f75c..dacf40ade 100644
--- a/tdecore/kiconloader_p.h
+++ b/tdecore/kiconloader_p.h
@@ -35,7 +35,7 @@ public:
 
 class TDEIconLoaderPrivate : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQStringList mThemesInTree;
     TDEIconGroup *mpGroups;
diff --git a/tdecore/klibloader.h b/tdecore/klibloader.h
index 9cde81816..f23b8cccd 100644
--- a/tdecore/klibloader.h
+++ b/tdecore/klibloader.h
@@ -52,7 +52,7 @@ class TDECORE_EXPORT KLibrary : public TQObject
     friend class KLibLoader;
     friend class TQAsciiDict<KLibrary>;
 
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Don't create KLibrary objects on your own. Instead use KLibLoader.
@@ -143,7 +143,7 @@ class TDECORE_EXPORT KLibLoader : public TQObject
 {
     friend class KLibrary;
 
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * You should NEVER destruct an instance of KLibLoader
@@ -332,7 +332,7 @@ private:
  */
 class TDECORE_EXPORT KLibFactory : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Create a new factory.
diff --git a/tdecore/kmanagerselection.h b/tdecore/kmanagerselection.h
index de294187d..31ea43ce9 100644
--- a/tdecore/kmanagerselection.h
+++ b/tdecore/kmanagerselection.h
@@ -50,7 +50,7 @@ class TDESelectionOwnerPrivate;
 class TDECORE_EXPORT TDESelectionOwner
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * This constructor initializes the object, but doesn't perform any
@@ -173,7 +173,7 @@ class TDESelectionWatcherPrivate;
 class TDECORE_EXPORT TDESelectionWatcher
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * This constructor initializes the object, but doesn't perform any
diff --git a/tdecore/kprocctrl.h b/tdecore/kprocctrl.h
index 1cb6cc302..ac5700753 100644
--- a/tdecore/kprocctrl.h
+++ b/tdecore/kprocctrl.h
@@ -38,7 +38,7 @@ class TQSocketNotifier;
  */
 class TDECORE_EXPORT TDEProcessController : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h
index ae4a25af6..e7414874e 100644
--- a/tdecore/kprocess.h
+++ b/tdecore/kprocess.h
@@ -129,7 +129,7 @@ class KPty;
  **/
 class TDECORE_EXPORT TDEProcess : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -903,7 +903,7 @@ class KShellProcessPrivate;
 */
 class TDECORE_EXPORT KShellProcess: public TDEProcess
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdecore/kprocio.h b/tdecore/kprocio.h
index 4e42ee533..e58e0972c 100644
--- a/tdecore/kprocio.h
+++ b/tdecore/kprocio.h
@@ -49,7 +49,7 @@ class TQTextCodec;
 
 class TDECORE_EXPORT KProcIO : public TDEProcess
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdecore/ksimpleconfig.h b/tdecore/ksimpleconfig.h
index 541117500..0ef703208 100644
--- a/tdecore/ksimpleconfig.h
+++ b/tdecore/ksimpleconfig.h
@@ -40,7 +40,7 @@ class KSimpleConfigPrivate;
  */
 class TDECORE_EXPORT KSimpleConfig : public TDEConfig
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdecore/ksimpledirwatch.h b/tdecore/ksimpledirwatch.h
index dd6ccf2ec..41934aa26 100644
--- a/tdecore/ksimpledirwatch.h
+++ b/tdecore/ksimpledirwatch.h
@@ -65,7 +65,7 @@ class KSimpleDirWatchPrivate;
   */
 class TDEIO_EXPORT KSimpleDirWatch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
     
   public:
    /**
diff --git a/tdecore/ksimpledirwatch_p.h b/tdecore/ksimpledirwatch_p.h
index cf1288064..7c6986d1a 100644
--- a/tdecore/ksimpledirwatch_p.h
+++ b/tdecore/ksimpledirwatch_p.h
@@ -23,7 +23,7 @@
  */
 class KSimpleDirWatchPrivate : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   enum entryStatus { Normal = 0, NonExistent };
diff --git a/tdecore/ksock.h b/tdecore/ksock.h
index 31ca099e6..8ec9eb2e8 100644
--- a/tdecore/ksock.h
+++ b/tdecore/ksock.h
@@ -90,7 +90,7 @@ class TDEServerSocketPrivate;
  */
 class TDECORE_EXPORT TDESocket : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a TDESocket with the provided file descriptor.
@@ -253,7 +253,7 @@ private:
 */
 class TDECORE_EXPORT TDEServerSocket : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructor.
diff --git a/tdecore/ksockaddr.h b/tdecore/ksockaddr.h
index d3eb62d0d..f523fd980 100644
--- a/tdecore/ksockaddr.h
+++ b/tdecore/ksockaddr.h
@@ -45,7 +45,7 @@ class TDESocketAddressPrivate;
  */
 class TDECORE_EXPORT TDESocketAddress: public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   /**
    * Creates an empty class
@@ -232,7 +232,7 @@ class KInetSocketAddressPrivate;
  */
 class TDECORE_EXPORT KInetSocketAddress: public ::TDESocketAddress
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Default constructor. Does nothing
@@ -583,7 +583,7 @@ class KUnixSocketAddressPrivate;
  */
 class TDECORE_EXPORT KUnixSocketAddress: public ::TDESocketAddress
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Default constructor
diff --git a/tdecore/kuniqueapplication.h b/tdecore/kuniqueapplication.h
index 3b7bd8d6e..97dc6a6bf 100644
--- a/tdecore/kuniqueapplication.h
+++ b/tdecore/kuniqueapplication.h
@@ -47,7 +47,7 @@ class KUniqueApplicationPrivate;
  */
 class TDECORE_EXPORT KUniqueApplication : public TDEApplication, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor. Takes command line arguments from TDECmdLineArgs
diff --git a/tdecore/kxmessages.h b/tdecore/kxmessages.h
index 5caec19fc..97fdbe26f 100644
--- a/tdecore/kxmessages.h
+++ b/tdecore/kxmessages.h
@@ -52,7 +52,7 @@ class KXMessagesPrivate;
 class TDECORE_EXPORT KXMessages
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
 	/**
 	 * Creates an instance which will receive X messages.
diff --git a/tdecore/network/kbufferedsocket.h b/tdecore/network/kbufferedsocket.h
index bd172330b..180314525 100644
--- a/tdecore/network/kbufferedsocket.h
+++ b/tdecore/network/kbufferedsocket.h
@@ -57,7 +57,7 @@ class TDEBufferedSocketPrivate;
  */
 class TDECORE_EXPORT TDEBufferedSocket: public KStreamSocket
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   /**
diff --git a/tdecore/network/kclientsocketbase.h b/tdecore/network/kclientsocketbase.h
index 65c852ddb..647a86c90 100644
--- a/tdecore/network/kclientsocketbase.h
+++ b/tdecore/network/kclientsocketbase.h
@@ -57,7 +57,7 @@ public TQObject,
 #endif // USE_QT4
 public KActiveSocketBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdecore/network/kdatagramsocket.h b/tdecore/network/kdatagramsocket.h
index ae88fda29..3f0285148 100644
--- a/tdecore/network/kdatagramsocket.h
+++ b/tdecore/network/kdatagramsocket.h
@@ -179,7 +179,7 @@ class KDatagramSocketPrivate;
  */
 class TDECORE_EXPORT KDatagramSocket: public KClientSocketBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h
index dbcf0d102..fd0636417 100644
--- a/tdecore/network/kresolver.h
+++ b/tdecore/network/kresolver.h
@@ -294,7 +294,7 @@ class KResolverPrivate;
  */
 class TDECORE_EXPORT KResolver: public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdecore/network/kreverseresolver.h b/tdecore/network/kreverseresolver.h
index 47a99e3ac..41dc38e90 100644
--- a/tdecore/network/kreverseresolver.h
+++ b/tdecore/network/kreverseresolver.h
@@ -49,7 +49,7 @@ class KReverseResolverPrivate;
  */
 class TDECORE_EXPORT KReverseResolver: public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index beb43aeb7..1455dcb08 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -106,7 +106,7 @@ class TDEServerSocketPrivate;
  */
 class TDECORE_EXPORT TDEServerSocket: public TQObject, public KPassiveSocketBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   /**
diff --git a/tdecore/network/ksrvresolverworker_p.h b/tdecore/network/ksrvresolverworker_p.h
index 5080c4a59..efb4c45f9 100644
--- a/tdecore/network/ksrvresolverworker_p.h
+++ b/tdecore/network/ksrvresolverworker_p.h
@@ -41,7 +41,7 @@ namespace KNetwork
     class KSrvResolverWorker: public TQObject,
 			      public KNetwork::KResolverWorkerBase
     {
-      Q_OBJECT
+      TQ_OBJECT
       
 
     public:
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index 94396b38d..72d176fa3 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -96,7 +96,7 @@ class KStreamSocketPrivate;
  */
 class TDECORE_EXPORT KStreamSocket: public KClientSocketBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h
index 2d205885c..86366491f 100644
--- a/tdecore/tdeaccel.h
+++ b/tdecore/tdeaccel.h
@@ -92,7 +92,7 @@ class TDEAccelPrivate;
 
 class TDECORE_EXPORT TDEAccel : public TQAccel
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	/**
 	 * Creates a new TDEAccel that watches @p pParent, which is also
diff --git a/tdecore/tdeaccelmanager_private.h b/tdecore/tdeaccelmanager_private.h
index d9227e8da..fe071c982 100644
--- a/tdecore/tdeaccelmanager_private.h
+++ b/tdecore/tdeaccelmanager_private.h
@@ -133,7 +133,7 @@ class TQPopupMenu;
 
 class TDEPopupAccelManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -166,7 +166,7 @@ private:
 
 class QWidgetStackAccelManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdecore/tdeaccelprivate.h b/tdecore/tdeaccelprivate.h
index c91e01f42..1d297094d 100644
--- a/tdecore/tdeaccelprivate.h
+++ b/tdecore/tdeaccelprivate.h
@@ -11,7 +11,7 @@ class TDEAccelAction;
  */
 class TDECORE_EXPORT TDEAccelPrivate : public TQObject, public TDEAccelBase
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	TDEAccel* m_pAccel;
 	TQWidget* m_pWatch;
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index 1b4fbe097..7b0ea8012 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -96,7 +96,7 @@ class TDEApplicationPrivate;
 class TDECORE_EXPORT TDEApplication : public TQApplication, public TDEInstance
 {
 
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /** Position of the caption (presumably in the application window's
   *   title bar). This enum appears to be unused.
@@ -660,7 +660,7 @@ public slots:
    *
    * \code
    * class MyListView : public TDEListView {
-   *   Q_OBJECT
+   *   TQ_OBJECT
    * public:
    *   MyListView( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ) : TDEListView( parent, name, f ) {}
    *   virtual ~MyListView() {}
diff --git a/tdecore/tdeconfig.h b/tdecore/tdeconfig.h
index 2ae0549de..0c23525af 100644
--- a/tdecore/tdeconfig.h
+++ b/tdecore/tdeconfig.h
@@ -42,7 +42,7 @@ class TDEConfigPrivate;
 */
 class TDECORE_EXPORT TDEConfig : public TDEConfigBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdecore/tdeconfigbase.h b/tdecore/tdeconfigbase.h
index a891409e7..79e53dcc6 100644
--- a/tdecore/tdeconfigbase.h
+++ b/tdecore/tdeconfigbase.h
@@ -69,7 +69,7 @@ class TDEConfigGroup;
  */
 class TDECORE_EXPORT TDEConfigBase : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
   friend class TDEConfigBackEnd;
diff --git a/tdecore/tdeconfigdialogmanager.h b/tdecore/tdeconfigdialogmanager.h
index ecb3640ea..d3d9644a6 100644
--- a/tdecore/tdeconfigdialogmanager.h
+++ b/tdecore/tdeconfigdialogmanager.h
@@ -77,7 +77,7 @@ class TQSqlPropertyMap;
  */
 class TDECORE_EXPORT TDEConfigDialogManager : public TQObject {
 
-Q_OBJECT
+TQ_OBJECT
 
 signals:
   /**
diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.h b/tdecore/tdehw/networkbackends/network-manager/network-manager.h
index f14e4992e..8af99e846 100644
--- a/tdecore/tdehw/networkbackends/network-manager/network-manager.h
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.h
@@ -211,7 +211,7 @@ class TDENetworkConnectionManager_BackendNMPrivate;
 
 class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkConnectionManager
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TDENetworkConnectionManager_BackendNM(TDENetworkDevice* networkDevice);
diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h
index 61ce31329..43cafda25 100644
--- a/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager_p.h
@@ -71,7 +71,7 @@ class TDENetworkConnectionManager_BackendNMPrivate;
 
 class TDENetworkConnectionManager_BackendNM_DBusSignalReceiver : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TDENetworkConnectionManager_BackendNM_DBusSignalReceiver(TDENetworkConnectionManager_BackendNMPrivate*);
@@ -86,7 +86,7 @@ class TDENetworkConnectionManager_BackendNM_DBusSignalReceiver : public TQObject
 
 class TDENetworkConnectionManager_BackendNMPrivate : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		TDENetworkConnectionManager_BackendNMPrivate(TDENetworkConnectionManager_BackendNM*);
diff --git a/tdecore/tdehw/tdecryptographiccarddevice.h b/tdecore/tdehw/tdecryptographiccarddevice.h
index 0907322d7..8b3bd211a 100644
--- a/tdecore/tdehw/tdecryptographiccarddevice.h
+++ b/tdecore/tdehw/tdecryptographiccarddevice.h
@@ -38,7 +38,7 @@ typedef TQValueListIterator<X509*> X509CertificatePtrListIterator;
 
 class TDECORE_EXPORT TDECryptographicCardDevice : public TDEGenericDevice
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/tdecore/tdehw/tdeeventdevice.h b/tdecore/tdehw/tdeeventdevice.h
index 64130508c..a1f1af6a6 100644
--- a/tdecore/tdehw/tdeeventdevice.h
+++ b/tdecore/tdehw/tdeeventdevice.h
@@ -79,7 +79,7 @@ class TQSocketNotifier;
 
 class TDECORE_EXPORT TDEEventDevice : public TDEGenericDevice
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/tdecore/tdehw/tdegenericdevice.h b/tdecore/tdehw/tdegenericdevice.h
index 91e9ac79e..53804cf96 100644
--- a/tdecore/tdehw/tdegenericdevice.h
+++ b/tdecore/tdehw/tdegenericdevice.h
@@ -30,7 +30,7 @@
 
 class TDECORE_EXPORT TDEGenericDevice : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/tdecore/tdehw/tdehardwaredevices.h b/tdecore/tdehw/tdehardwaredevices.h
index db63e9d34..4e4259dfc 100644
--- a/tdecore/tdehw/tdehardwaredevices.h
+++ b/tdecore/tdehw/tdehardwaredevices.h
@@ -81,7 +81,7 @@ typedef TQDict<TDECPUDevice> TDECPUDeviceCache;
 
 class TDECORE_EXPORT TDEHardwareDevices : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:	
 		/**
diff --git a/tdecore/tdehw/tdenetworkconnections.h b/tdecore/tdehw/tdenetworkconnections.h
index 806c162a8..aa44e8edb 100644
--- a/tdecore/tdehw/tdenetworkconnections.h
+++ b/tdecore/tdehw/tdenetworkconnections.h
@@ -1015,7 +1015,7 @@ class TQTimer;
 
 class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
@@ -1364,7 +1364,7 @@ class TDECORE_EXPORT TDENetworkConnectionManager : public TQObject
 
 class TDECORE_EXPORT TDEGlobalNetworkManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		/**
diff --git a/tdecore/tdemultipledrag.h b/tdecore/tdemultipledrag.h
index bfc408019..631959bc0 100644
--- a/tdecore/tdemultipledrag.h
+++ b/tdecore/tdemultipledrag.h
@@ -53,7 +53,7 @@ class KMultipleDragPrivate;
  */
 class TDECORE_EXPORT KMultipleDrag : public TQDragObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdecore/tdeshortcutmenu.h b/tdecore/tdeshortcutmenu.h
index ece721942..0387bdbae 100644
--- a/tdecore/tdeshortcutmenu.h
+++ b/tdecore/tdeshortcutmenu.h
@@ -34,7 +34,7 @@ class TDEAccelActions;
  */
 class TDECORE_EXPORT TDEShortcutMenu : public TQPopupMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	TDEShortcutMenu( TQWidget* pParent, TDEAccelActions* pActions, KKeySequence seq );
 
diff --git a/tdecore/tdestartupinfo.h b/tdecore/tdestartupinfo.h
index 9fa57cd4b..0d953b48d 100644
--- a/tdecore/tdestartupinfo.h
+++ b/tdecore/tdestartupinfo.h
@@ -67,7 +67,7 @@ class TDEStartupInfoPrivate;
 class TDECORE_EXPORT TDEStartupInfo
     : public TQObject
     {
-    Q_OBJECT
+    TQ_OBJECT
     
     public:
         /**
diff --git a/tdecore/tdesycoca.h b/tdecore/tdesycoca.h
index f8e2274e0..a96bd9d9f 100644
--- a/tdecore/tdesycoca.h
+++ b/tdecore/tdesycoca.h
@@ -43,7 +43,7 @@ class KSycocaFactoryList;
  */
 class TDECORE_EXPORT KSycoca : public TQObject, public DCOPObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
 protected:
diff --git a/tdecore/tests/kipctest.h b/tdecore/tests/kipctest.h
index 17122fbd8..1f71843f6 100644
--- a/tdecore/tests/kipctest.h
+++ b/tdecore/tests/kipctest.h
@@ -5,7 +5,7 @@
 
 class MyObject: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MyObject();
 
diff --git a/tdecore/tests/klocaletest.h b/tdecore/tests/klocaletest.h
index 6634b6107..433807b78 100644
--- a/tdecore/tests/klocaletest.h
+++ b/tdecore/tests/klocaletest.h
@@ -11,7 +11,7 @@ class TQLabel;
     */
 class Test : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   /**@name methods */
diff --git a/tdecore/tests/kprocesstest.h b/tdecore/tests/kprocesstest.h
index 5817af438..4bd4ab71e 100644
--- a/tdecore/tests/kprocesstest.h
+++ b/tdecore/tests/kprocesstest.h
@@ -17,7 +17,7 @@
 
 class Dummy : public TQObject
 {
- Q_OBJECT
+ TQ_OBJECT
 
  public slots:
    void printMessage(TDEProcess *proc)
diff --git a/tdecore/tests/kprociotest.h b/tdecore/tests/kprociotest.h
index fd60bb87b..78b5ad926 100644
--- a/tdecore/tests/kprociotest.h
+++ b/tdecore/tests/kprociotest.h
@@ -17,7 +17,7 @@
 
 class Dummy : public TQObject
 {
- Q_OBJECT
+ TQ_OBJECT
 
  public slots:
    void printMessage(TDEProcess *proc)
diff --git a/tdecore/tests/tdeconfigtestgui.h b/tdecore/tests/tdeconfigtestgui.h
index a7cfd1356..4c3384d90 100644
--- a/tdecore/tests/tdeconfigtestgui.h
+++ b/tdecore/tests/tdeconfigtestgui.h
@@ -41,7 +41,7 @@
 
 class TDEConfigTestView : public TQDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TDEConfigTestView( TQWidget *parent=0, const char *name=0 );
   ~TDEConfigTestView();
diff --git a/tdecore/twinmodule.h b/tdecore/twinmodule.h
index 0357c1c66..52ea17c90 100644
--- a/tdecore/twinmodule.h
+++ b/tdecore/twinmodule.h
@@ -55,7 +55,7 @@ class KWinModulePrivate;
  */
 class TDECORE_EXPORT KWinModule : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdefile-plugins/elf/tdefile_elf.h b/tdefile-plugins/elf/tdefile_elf.h
index cd72afc87..d7898f10d 100644
--- a/tdefile-plugins/elf/tdefile_elf.h
+++ b/tdefile-plugins/elf/tdefile_elf.h
@@ -38,7 +38,7 @@ class TQStringList;
 
 class KElfPlugin: public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
   
     
 public:
diff --git a/tdefx/tdestyle.h b/tdefx/tdestyle.h
index 505682b32..013dab1ea 100644
--- a/tdefx/tdestyle.h
+++ b/tdefx/tdestyle.h
@@ -56,7 +56,7 @@ struct TDEStylePrivate;
  */
 class TDEFX_EXPORT TDEStyle: public TQCommonStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 
 	public:
diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h
index 4156f083a..b79938b1a 100644
--- a/tdehtml/domtreeview.h
+++ b/tdehtml/domtreeview.h
@@ -26,7 +26,7 @@
 
 class DOMTreeView : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
     public: 
 	DOMTreeView(TQWidget *parent, TDEHTMLPart *part, const char * name = 0);
 	~DOMTreeView();
diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h
index be6b31dda..a40b20c2f 100644
--- a/tdehtml/ecma/kjs_debugwin.h
+++ b/tdehtml/ecma/kjs_debugwin.h
@@ -94,7 +94,7 @@ namespace KJS {
   };
 
   class KJSErrorDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     KJSErrorDialog(TQWidget *parent, const TQString& errorMessage, bool showDebug);
     virtual ~KJSErrorDialog();
@@ -111,7 +111,7 @@ namespace KJS {
   };
 
   class EvalMultiLineEdit : public TQMultiLineEdit {
-    Q_OBJECT
+    TQ_OBJECT
   public:
       EvalMultiLineEdit(TQWidget *parent);
       const TQString & code() const { return m_code; }
@@ -122,7 +122,7 @@ namespace KJS {
   };
 
   class SourceDisplay : public TQScrollView {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     SourceDisplay(KJSDebugWin *debugWin, TQWidget *parent, const char *name = 0);
     ~SourceDisplay();
@@ -159,7 +159,7 @@ namespace KJS {
    */
   class KJSDebugWin : public TDEMainWindow, public Debugger, public TDEInstance
   {
-    Q_OBJECT
+    TQ_OBJECT
     friend class SourceDisplay;
   public:
     KJSDebugWin(TQWidget *parent=0, const char *name=0);
diff --git a/tdehtml/ecma/kjs_window.h b/tdehtml/ecma/kjs_window.h
index 3af34d87b..2fa2e2dda 100644
--- a/tdehtml/ecma/kjs_window.h
+++ b/tdehtml/ecma/kjs_window.h
@@ -246,7 +246,7 @@ namespace KJS {
   };
 
   class KDE_EXPORT WindowQObject : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     WindowQObject(Window *w);
     ~WindowQObject();
diff --git a/tdehtml/ecma/xmlhttprequest.h b/tdehtml/ecma/xmlhttprequest.h
index d1b304f30..7d3934152 100644
--- a/tdehtml/ecma/xmlhttprequest.h
+++ b/tdehtml/ecma/xmlhttprequest.h
@@ -122,7 +122,7 @@ namespace KJS {
 
 
   class XMLHttpRequestQObject : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
   public:
     XMLHttpRequestQObject(XMLHttpRequest *_jsObject);
diff --git a/tdehtml/html/html_documentimpl.h b/tdehtml/html/html_documentimpl.h
index 92f163076..f7191f31a 100644
--- a/tdehtml/html/html_documentimpl.h
+++ b/tdehtml/html/html_documentimpl.h
@@ -43,7 +43,7 @@ namespace DOM {
 
 class HTMLDocumentImpl : public DOM::DocumentImpl
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v = 0);
     ~HTMLDocumentImpl();
diff --git a/tdehtml/html/html_objectimpl.h b/tdehtml/html/html_objectimpl.h
index d10e66356..2818330e0 100644
--- a/tdehtml/html/html_objectimpl.h
+++ b/tdehtml/html/html_objectimpl.h
@@ -38,7 +38,7 @@ class DOMStringImpl;
 
 class HTMLObjectBaseElementImpl : public TQObject, public HTMLElementImpl
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTMLObjectBaseElementImpl(DocumentImpl *doc);
 
diff --git a/tdehtml/java/kjavaapplet.h b/tdehtml/java/kjavaapplet.h
index bb4b20890..dd13100f7 100644
--- a/tdehtml/java/kjavaapplet.h
+++ b/tdehtml/java/kjavaapplet.h
@@ -48,7 +48,7 @@ class KJavaAppletPrivate;
 
 class KJavaApplet : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     // states describing the life cycle of an applet.
diff --git a/tdehtml/java/kjavaappletcontext.h b/tdehtml/java/kjavaappletcontext.h
index 166c00f15..2ce7585ee 100644
--- a/tdehtml/java/kjavaappletcontext.h
+++ b/tdehtml/java/kjavaappletcontext.h
@@ -42,7 +42,7 @@ class KJavaAppletContextPrivate;
 
 class KJavaAppletContext : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KJavaAppletContext();
diff --git a/tdehtml/java/kjavaappletserver.h b/tdehtml/java/kjavaappletserver.h
index 5b82e01a1..ec8a7ed01 100644
--- a/tdehtml/java/kjavaappletserver.h
+++ b/tdehtml/java/kjavaappletserver.h
@@ -39,7 +39,7 @@ class JSStackFrame;
 
 class KJavaAppletServer : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     /**
@@ -161,7 +161,7 @@ private:
 
 class PermissionDialog : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PermissionDialog( TQWidget* );
     ~PermissionDialog();
diff --git a/tdehtml/java/kjavaappletviewer.h b/tdehtml/java/kjavaappletviewer.h
index bb1d6e921..e00839d49 100644
--- a/tdehtml/java/kjavaappletviewer.h
+++ b/tdehtml/java/kjavaappletviewer.h
@@ -43,7 +43,7 @@ class TDEConfig;
 class CoverWidget;
 
 class KJavaAppletViewerBrowserExtension : public KParts::BrowserExtension {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KJavaAppletViewerBrowserExtension (KJavaAppletViewer *parent);
     void urlChanged (const TQString & url);
@@ -57,7 +57,7 @@ public slots:
 };
 
 class KJavaAppletViewerLiveConnectExtension : public KParts::LiveConnectExtension {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KJavaAppletViewerLiveConnectExtension(KJavaAppletViewer * parent);
 
@@ -78,7 +78,7 @@ private:
 };
 
 class KJavaAppletViewer : public KParts::ReadOnlyPart {
-    Q_OBJECT
+    TQ_OBJECT
 public: 
     KJavaAppletViewer (TQWidget * wparent, const char * wname,
               TQObject * parent, const char * name, const TQStringList &args);
@@ -116,7 +116,7 @@ private:
 };
 
 class KJavaAppletViewerFactory : public KParts::Factory {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KJavaAppletViewerFactory ();
     virtual ~KJavaAppletViewerFactory ();
@@ -130,7 +130,7 @@ private:
 };
 
 class AppletParameterDialog : public KDialogBase {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     AppletParameterDialog (KJavaAppletWidget * parent);
 protected slots:
diff --git a/tdehtml/java/kjavaappletwidget.h b/tdehtml/java/kjavaappletwidget.h
index 872188769..24db025b4 100644
--- a/tdehtml/java/kjavaappletwidget.h
+++ b/tdehtml/java/kjavaappletwidget.h
@@ -75,7 +75,7 @@ class KJavaAppletWidgetPrivate;
 
 class KJavaAppletWidget : public QXEmbed
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KJavaAppletWidget( TQWidget* parent=0, const char* name=0 );
 
diff --git a/tdehtml/java/kjavadownloader.h b/tdehtml/java/kjavadownloader.h
index 4e3b893e8..eb9765769 100644
--- a/tdehtml/java/kjavadownloader.h
+++ b/tdehtml/java/kjavadownloader.h
@@ -42,7 +42,7 @@ class KJavaUploaderPrivate;
 
 class KJavaTDEIOJob : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     virtual ~KJavaTDEIOJob();
     virtual void jobCommand( int cmd ) = 0;
@@ -51,7 +51,7 @@ public:
 
 class KJavaDownloader : public KJavaTDEIOJob
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KJavaDownloader( int ID, const TQString& url );
@@ -71,7 +71,7 @@ private:
 
 class KJavaUploader : public KJavaTDEIOJob
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KJavaUploader( int ID, const TQString& url );
diff --git a/tdehtml/java/kjavaprocess.h b/tdehtml/java/kjavaprocess.h
index a479b8128..53b9542e7 100644
--- a/tdehtml/java/kjavaprocess.h
+++ b/tdehtml/java/kjavaprocess.h
@@ -39,7 +39,7 @@
 class KJavaProcessPrivate;
 class KJavaProcess : public TDEProcess //QObject
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     /**
diff --git a/tdehtml/misc/knsplugininstaller.h b/tdehtml/misc/knsplugininstaller.h
index f8caedf92..a77630c19 100644
--- a/tdehtml/misc/knsplugininstaller.h
+++ b/tdehtml/misc/knsplugininstaller.h
@@ -89,7 +89,7 @@ private:
  */
 class KNSPluginInstallEngine : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /*
@@ -171,7 +171,7 @@ private slots:
  */
 class KNSPluginWizard : public KWizard
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
         
     /**
diff --git a/tdehtml/misc/loader.h b/tdehtml/misc/loader.h
index c60c13a98..2639f82f6 100644
--- a/tdehtml/misc/loader.h
+++ b/tdehtml/misc/loader.h
@@ -255,7 +255,7 @@ namespace tdehtml
      */
     class CachedImage : public TQObject, public CachedObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	CachedImage(DocLoader* dl, const DOM::DOMString &url, TDEIO::CacheControl cachePolicy, const char* accept);
 	virtual ~CachedImage();
@@ -407,7 +407,7 @@ namespace tdehtml
      */
     class Loader : public TQObject
     {
-	Q_OBJECT
+	TQ_OBJECT
 
     public:
 	Loader();
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index d6124528d..2ef4cafdb 100644
--- a/tdehtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -106,7 +106,7 @@ protected:
 // generic class for all buttons
 class RenderButton : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderButton(DOM::HTMLGenericFormElementImpl* node);
 
@@ -126,7 +126,7 @@ protected:
 
 class RenderCheckBox : public RenderButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderCheckBox(DOM::HTMLInputElementImpl* node);
 
@@ -146,7 +146,7 @@ public slots:
 
 class RenderRadioButton : public RenderButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderRadioButton(DOM::HTMLInputElementImpl* node);
 
@@ -216,7 +216,7 @@ public:
 
 class RenderLineEdit : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderLineEdit(DOM::HTMLInputElementImpl *element);
 
@@ -253,7 +253,7 @@ private:
 
 class LineEditWidget : public KLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     LineEditWidget(DOM::HTMLInputElementImpl* input,
                    TDEHTMLView* view, TQWidget* parent);
@@ -307,7 +307,7 @@ protected:
 
 class RenderFileButton : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderFileButton(DOM::HTMLInputElementImpl *element);
 
@@ -378,7 +378,7 @@ protected:
 
 class RenderSelect : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderSelect(DOM::HTMLSelectElementImpl *element);
 
@@ -417,7 +417,7 @@ protected slots:
 // -------------------------------------------------------------------------
 class TextAreaWidget : public KTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TextAreaWidget(int wrap, TQWidget* parent);
     virtual ~TextAreaWidget();
@@ -452,7 +452,7 @@ private:
 
 class RenderTextArea : public RenderFormElement
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderTextArea(DOM::HTMLTextAreaElementImpl *element);
     ~RenderTextArea();
diff --git a/tdehtml/rendering/render_frames.h b/tdehtml/rendering/render_frames.h
index 49d1e8dc1..578dabaab 100644
--- a/tdehtml/rendering/render_frames.h
+++ b/tdehtml/rendering/render_frames.h
@@ -93,7 +93,7 @@ private:
 
 class RenderPart : public tdehtml::RenderWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderPart(DOM::HTMLElementImpl* node);
 
@@ -123,7 +123,7 @@ public slots:
 
 class RenderFrame : public tdehtml::RenderPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderFrame( DOM::HTMLFrameElementImpl *frame );
 
@@ -146,7 +146,7 @@ public slots:
 // I can hardly call the class RenderObject ;-)
 class RenderPartObject : public tdehtml::RenderPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderPartObject( DOM::HTMLElementImpl * );
 
diff --git a/tdehtml/rendering/render_layer.h b/tdehtml/rendering/render_layer.h
index ae5ddff65..a71549cc5 100644
--- a/tdehtml/rendering/render_layer.h
+++ b/tdehtml/rendering/render_layer.h
@@ -65,7 +65,7 @@ namespace tdehtml {
 
 class RenderScrollMediator: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderScrollMediator(RenderLayer* layer)
     :m_layer(layer) {}
@@ -80,7 +80,7 @@ private:
 // This class handles the auto-scrolling of layers with overflow: marquee.
 class Marquee: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Marquee(RenderLayer* l);
diff --git a/tdehtml/rendering/render_replaced.h b/tdehtml/rendering/render_replaced.h
index 3d8a68f9c..7a5ec5353 100644
--- a/tdehtml/rendering/render_replaced.h
+++ b/tdehtml/rendering/render_replaced.h
@@ -83,7 +83,7 @@ protected:
 
 class RenderWidget : public TQObject, public RenderReplaced, public tdehtml::Shared<RenderWidget>
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     RenderWidget(DOM::NodeImpl* node);
     virtual ~RenderWidget();
diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h
index 7cea57956..ebdc886f9 100644
--- a/tdehtml/tdehtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -40,7 +40,7 @@
  */
 class TDEHTMLPartBrowserExtension : public KParts::BrowserExtension
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class TDEHTMLPart;
   friend class TDEHTMLView;
 public:
@@ -114,7 +114,7 @@ private:
  */
 class TDEHTMLPopupGUIClient : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQString &doc, const KURL &url );
   virtual ~TDEHTMLPopupGUIClient();
@@ -151,7 +151,7 @@ private:
 
 class TDEHTMLZoomFactorAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     //BCI: remove in KDE 4
     TDEHTMLZoomFactorAction( TDEHTMLPart *part, bool direction, const TQString &text, const TQString &icon, const TQObject *receiver, const char *slot, TQObject *parent, const char *name );
diff --git a/tdehtml/tdehtml_factory.h b/tdehtml/tdehtml_factory.h
index 3ad2aff8c..5d424282c 100644
--- a/tdehtml/tdehtml_factory.h
+++ b/tdehtml/tdehtml_factory.h
@@ -38,7 +38,7 @@ namespace DOM
 
 class KDE_EXPORT TDEHTMLFactory : public KParts::Factory
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class DOM::DocumentImpl;
   friend class TDEHTMLViewPrivate;
 public:
diff --git a/tdehtml/tdehtml_pagecache.h b/tdehtml/tdehtml_pagecache.h
index f648bd548..e16164771 100644
--- a/tdehtml/tdehtml_pagecache.h
+++ b/tdehtml/tdehtml_pagecache.h
@@ -40,7 +40,7 @@ class TDEHTMLPageCachePrivate;
  */
 class TDEHTMLPageCache : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * static "constructor".
@@ -116,7 +116,7 @@ private:
 class TDEHTMLPageCacheDelivery : public TQObject
 {
    friend class TDEHTMLPageCache;
-Q_OBJECT
+TQ_OBJECT
 public:
    TDEHTMLPageCacheDelivery(int _fd)
     : fd(_fd) { }
diff --git a/tdehtml/tdehtml_part.h b/tdehtml/tdehtml_part.h
index 20cdd68c8..7d3f01312 100644
--- a/tdehtml/tdehtml_part.h
+++ b/tdehtml/tdehtml_part.h
@@ -182,7 +182,7 @@ namespace TDEWallet
  */
 class TDEHTML_EXPORT TDEHTMLPart : public KParts::ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class TDEHTMLView;
   friend class DOM::HTMLTitleElementImpl;
   friend class DOM::HTMLFrameElementImpl;
diff --git a/tdehtml/tdehtml_printsettings.h b/tdehtml/tdehtml_printsettings.h
index 2a92d0e3c..1e1250824 100644
--- a/tdehtml/tdehtml_printsettings.h
+++ b/tdehtml/tdehtml_printsettings.h
@@ -26,7 +26,7 @@ class TQCheckBox;
 
 class TDEHTMLPrintSettings : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEHTMLPrintSettings(TQWidget *parent = 0, const char *name = 0);
 	~TDEHTMLPrintSettings();
diff --git a/tdehtml/tdehtml_run.h b/tdehtml/tdehtml_run.h
index 401bc7fd6..b4e11829a 100644
--- a/tdehtml/tdehtml_run.h
+++ b/tdehtml/tdehtml_run.h
@@ -37,7 +37,7 @@ namespace tdehtml
 
 class TDEHTMLRun : public KParts::BrowserRun
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   TDEHTMLRun( TDEHTMLPart *part, tdehtml::ChildFrame *child, const KURL &url,
             const KParts::URLArgs &args, bool hideErrorDialog );
diff --git a/tdehtml/tdehtmlimage.h b/tdehtml/tdehtmlimage.h
index 8b8b5893b..6fd3fd928 100644
--- a/tdehtml/tdehtmlimage.h
+++ b/tdehtml/tdehtmlimage.h
@@ -39,7 +39,7 @@ namespace tdehtml
  */
 class TDEHTMLImageFactory : public KParts::Factory
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDEHTMLImageFactory();
     virtual ~TDEHTMLImageFactory();
@@ -59,7 +59,7 @@ private:
  */
 class TDEHTMLImage : public KParts::ReadOnlyPart, public tdehtml::CachedObjectClient
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDEHTMLImage( TQWidget *parentWidget, const char *widgetName,
                 TQObject *parent, const char *name, TDEHTMLPart::GUIProfile prof );
@@ -100,7 +100,7 @@ private:
  */
 class TDEHTMLImageBrowserExtension : public KParts::BrowserExtension
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDEHTMLImageBrowserExtension( TDEHTMLImage *parent, const char *name = 0 );
 
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index 90be612b2..6306d1961 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -74,7 +74,7 @@ namespace tdehtml
 {
   class KDE_EXPORT ChildFrame : public TQObject
   {
-      Q_OBJECT
+      TQ_OBJECT
   public:
       enum Type { Frame, IFrame, Object };
 
@@ -129,7 +129,7 @@ static int tdehtml_part_dcop_counter = 0;
 
 class TDEHTMLWalletQueue : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   public:
     TDEHTMLWalletQueue(TQObject *parent) : TQObject(parent) {
 #ifndef TDEHTML_NO_WALLET
diff --git a/tdehtml/tdehtmlview.h b/tdehtml/tdehtmlview.h
index 797db99fa..6f3ad6684 100644
--- a/tdehtml/tdehtmlview.h
+++ b/tdehtml/tdehtmlview.h
@@ -77,7 +77,7 @@ class TDEHTMLViewPrivate;
  **/
 class TDEHTML_EXPORT TDEHTMLView : public TQScrollView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     friend class DOM::HTMLDocumentImpl;
     friend class DOM::HTMLTitleElementImpl;
diff --git a/tdehtml/tdemultipart/tdemultipart.h b/tdehtml/tdemultipart/tdemultipart.h
index de309eef1..75b7c18a3 100644
--- a/tdehtml/tdemultipart/tdemultipart.h
+++ b/tdehtml/tdemultipart/tdemultipart.h
@@ -38,7 +38,7 @@ class KLineParser;
  */
 class KMultiPart : public KParts::ReadOnlyPart
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KMultiPart( TQWidget *parentWidget, const char *widgetName,
                 TQObject *parent, const char *name, const TQStringList& );
@@ -99,7 +99,7 @@ private:
 #if 0
 class KMultiPartBrowserExtension : public KParts::BrowserExtension
 {
-    //Q_OBJECT
+    //TQ_OBJECT
 public:
     KMultiPartBrowserExtension( KMultiPart *parent, const char *name = 0 );
 
diff --git a/tdehtml/test_regression.h b/tdehtml/test_regression.h
index b6791bd32..9092f22e2 100644
--- a/tdehtml/test_regression.h
+++ b/tdehtml/test_regression.h
@@ -38,7 +38,7 @@ class TQTimer;
  */
 class PartMonitor : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
     PartMonitor(TDEHTMLPart *_part);
     ~PartMonitor();
@@ -124,7 +124,7 @@ class ScriptInterpreter;
  */
 class RegressionTest : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
     RegressionTest(TDEHTMLPart *part, const TQString &baseDir, const TQString &outputDir,
diff --git a/tdehtml/testtdehtml.h b/tdehtml/testtdehtml.h
index dcb4c1583..a6ce73675 100644
--- a/tdehtml/testtdehtml.h
+++ b/tdehtml/testtdehtml.h
@@ -10,7 +10,7 @@
  */
 class Dummy : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Dummy( TDEHTMLPart *part ) : TQObject( part ) { m_part = part; };
 
diff --git a/tdehtml/xml/dom_docimpl.h b/tdehtml/xml/dom_docimpl.h
index bcdc9500c..fc78a89b3 100644
--- a/tdehtml/xml/dom_docimpl.h
+++ b/tdehtml/xml/dom_docimpl.h
@@ -184,7 +184,7 @@ private:
  */
 class DocumentImpl : public TQObject, private tdehtml::CachedObjectClient, public NodeBaseImpl
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DocumentImpl(DOMImplementationImpl *_implementation, TDEHTMLView *v);
     ~DocumentImpl();
diff --git a/tdehtml/xml/xml_tokenizer.h b/tdehtml/xml/xml_tokenizer.h
index f89e5eb2f..d6b4dbe02 100644
--- a/tdehtml/xml/xml_tokenizer.h
+++ b/tdehtml/xml/xml_tokenizer.h
@@ -118,7 +118,7 @@ private:
 
 class Tokenizer : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     virtual void begin() = 0;
     // script output must be prepended, while new data
diff --git a/tdeinit/tdelauncher.h b/tdeinit/tdelauncher.h
index 1802cd6ba..aee6641b2 100644
--- a/tdeinit/tdelauncher.h
+++ b/tdeinit/tdelauncher.h
@@ -41,7 +41,7 @@
 
 class IdleSlave : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    IdleSlave(TDESocket *socket);
    bool match( const TQString &protocol, const TQString &host, bool connected);
@@ -107,7 +107,7 @@ struct serviceResult
 
 class TDELauncher : public TDEApplication, public DCOPObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 
 public:
    TDELauncher(int _tdeinitSocket, bool new_startup);
diff --git a/tdeio/bookmarks/kbookmarkbar.h b/tdeio/bookmarks/kbookmarkbar.h
index 2b63dff4a..7e8190d7b 100644
--- a/tdeio/bookmarks/kbookmarkbar.h
+++ b/tdeio/bookmarks/kbookmarkbar.h
@@ -39,7 +39,7 @@ class TQPopupMenu;
  */
 class TDEIO_EXPORT KBookmarkBar : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     friend class RMB;
 public:
diff --git a/tdeio/bookmarks/kbookmarkdombuilder.h b/tdeio/bookmarks/kbookmarkdombuilder.h
index 44fe7b170..185904c09 100644
--- a/tdeio/bookmarks/kbookmarkdombuilder.h
+++ b/tdeio/bookmarks/kbookmarkdombuilder.h
@@ -28,7 +28,7 @@
  * @since 3.2
  */
 class TDEIO_EXPORT KBookmarkDomBuilder : public TQObject {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KBookmarkDomBuilder(const KBookmarkGroup &group, KBookmarkManager *);
    virtual ~KBookmarkDomBuilder();
diff --git a/tdeio/bookmarks/kbookmarkimporter.h b/tdeio/bookmarks/kbookmarkimporter.h
index fab32801a..3e7158ecd 100644
--- a/tdeio/bookmarks/kbookmarkimporter.h
+++ b/tdeio/bookmarks/kbookmarkimporter.h
@@ -34,7 +34,7 @@
  */
 class TDEIO_EXPORT KBookmarkImporterBase : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KBookmarkImporterBase() {}
     virtual ~KBookmarkImporterBase() {}
@@ -84,7 +84,7 @@ private:
  */
 class TDEIO_EXPORT KXBELBookmarkImporterImpl : public KBookmarkImporterBase, protected KBookmarkGroupTraverser
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KXBELBookmarkImporterImpl() {}
     virtual void parse();
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.h b/tdeio/bookmarks/kbookmarkimporter_crash.h
index 74a4b9cd8..007dcf86a 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.h
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.h
@@ -34,7 +34,7 @@
  */
 class TDEIO_EXPORT_DEPRECATED TDECrashBookmarkImporter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDECrashBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
     ~TDECrashBookmarkImporter() {}
diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.h b/tdeio/bookmarks/kbookmarkimporter_ie.h
index 532b6f1b5..d0707cefb 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ie.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.h
@@ -33,7 +33,7 @@
  */
 class TDEIO_EXPORT_DEPRECATED KIEBookmarkImporter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KIEBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
     ~KIEBookmarkImporter() {}
diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.h b/tdeio/bookmarks/kbookmarkimporter_ns.h
index 18b1e195e..4ccee6fa3 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ns.h
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.h
@@ -34,7 +34,7 @@
  */
 class TDEIO_EXPORT_DEPRECATED KNSBookmarkImporter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KNSBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
     ~KNSBookmarkImporter() {}
diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.h b/tdeio/bookmarks/kbookmarkimporter_opera.h
index 4c34776e2..1235ac642 100644
--- a/tdeio/bookmarks/kbookmarkimporter_opera.h
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.h
@@ -32,7 +32,7 @@
  */
 class TDEIO_EXPORT_DEPRECATED KOperaBookmarkImporter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KOperaBookmarkImporter( const TQString & fileName ) : m_fileName(fileName) {}
     ~KOperaBookmarkImporter() {}
diff --git a/tdeio/bookmarks/kbookmarkmanager.h b/tdeio/bookmarks/kbookmarkmanager.h
index 5ed57280a..2834c86a2 100644
--- a/tdeio/bookmarks/kbookmarkmanager.h
+++ b/tdeio/bookmarks/kbookmarkmanager.h
@@ -50,7 +50,7 @@
  */
 class TDEIO_EXPORT KBookmarkManager : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
 protected:
     /**
@@ -350,7 +350,7 @@ protected:
  */
 class TDEIO_EXPORT KExtendedBookmarkOwner : public TQObject, virtual public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     typedef TQValueList<QPair<TQString,TQString> > QStringPairList;
 public slots:
diff --git a/tdeio/bookmarks/kbookmarkmenu.h b/tdeio/bookmarks/kbookmarkmenu.h
index 807df086f..77a5c19e4 100644
--- a/tdeio/bookmarks/kbookmarkmenu.h
+++ b/tdeio/bookmarks/kbookmarkmenu.h
@@ -76,7 +76,7 @@ namespace TDEIO { class Job; }
  */
 class TDEIO_EXPORT KBookmarkMenu : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class KBookmarkMenuNSImporter;
   friend class RMB;
 public:
@@ -238,7 +238,7 @@ protected:
  */
 class TDEIO_EXPORT KBookmarkMenuNSImporter : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KBookmarkMenuNSImporter( KBookmarkManager* mgr, KBookmarkMenu * menu, TDEActionCollection * act ) :
      m_menu(menu), m_actionCollection(act), m_pManager(mgr) {}
diff --git a/tdeio/bookmarks/kbookmarkmenu_p.h b/tdeio/bookmarks/kbookmarkmenu_p.h
index 31fb8cd72..7439a556b 100644
--- a/tdeio/bookmarks/kbookmarkmenu_p.h
+++ b/tdeio/bookmarks/kbookmarkmenu_p.h
@@ -51,7 +51,7 @@ class KBookmarkBar;
 class TDEPopupMenu;
 
 class KImportedBookmarksActionMenu : public TDEActionMenu {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString type READ type WRITE setType )
   TQ_PROPERTY( TQString location READ location WRITE setLocation )
 public:
@@ -72,7 +72,7 @@ public:
 };
 
 class KBookmarkActionMenu : public TDEActionMenu {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString url READ url WRITE setUrl )
   TQ_PROPERTY( TQString address READ address WRITE setAddress )
   TQ_PROPERTY( bool readOnly READ readOnly WRITE setReadOnly )
@@ -97,7 +97,7 @@ public:
 };
 
 class KBookmarkAction : public TDEAction {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString url READ url WRITE setUrl )
   TQ_PROPERTY( TQString address READ address WRITE setAddress )
 public:
@@ -135,7 +135,7 @@ public:
 
 class KBookmarkEditDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   typedef enum { ModifyMode, InsertionMode } BookmarkEditType;
diff --git a/tdeio/httpfilter/httpfilter.h b/tdeio/httpfilter/httpfilter.h
index 520a1c627..ee71a6ecd 100644
--- a/tdeio/httpfilter/httpfilter.h
+++ b/tdeio/httpfilter/httpfilter.h
@@ -35,7 +35,7 @@
 
 class HTTPFilterBase : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterBase();
     ~HTTPFilterBase();
@@ -55,7 +55,7 @@ protected:
 
 class HTTPFilterChain : public HTTPFilterBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterChain();
 
@@ -70,7 +70,7 @@ private:
 
 class HTTPFilterMD5 : public HTTPFilterBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterMD5();
 
@@ -86,7 +86,7 @@ private:
 
 class HTTPFilterGZip : public HTTPFilterBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterGZip();
     ~HTTPFilterGZip();
@@ -111,7 +111,7 @@ protected:
 
 class HTTPFilterDeflate : public HTTPFilterGZip
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HTTPFilterDeflate();
 };
diff --git a/tdeio/kpasswdserver/kpasswdserver.h b/tdeio/kpasswdserver/kpasswdserver.h
index 71aab3859..c31e64449 100644
--- a/tdeio/kpasswdserver/kpasswdserver.h
+++ b/tdeio/kpasswdserver/kpasswdserver.h
@@ -38,7 +38,7 @@ namespace TDEWallet {
 
 class KPasswdServer : public KDEDModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 public:
   KPasswdServer(const TQCString &);
diff --git a/tdeio/kssl/ksslcertdlg.h b/tdeio/kssl/ksslcertdlg.h
index 8d6f3d777..d4ec4412f 100644
--- a/tdeio/kssl/ksslcertdlg.h
+++ b/tdeio/kssl/ksslcertdlg.h
@@ -41,7 +41,7 @@ class TQPushButton;
  * @short KDE X.509 Certificate Dialog
  */
 class TDEIO_EXPORT KSSLCertDlg : public KDialog {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 *  Construct a KSSL certificate dialog
diff --git a/tdeio/kssl/ksslinfodlg.h b/tdeio/kssl/ksslinfodlg.h
index c73afbba1..9f8a731c0 100644
--- a/tdeio/kssl/ksslinfodlg.h
+++ b/tdeio/kssl/ksslinfodlg.h
@@ -48,7 +48,7 @@ class KSSLCertChain;
  * @short KDE SSL Information Dialog
  */
 class TDEIO_EXPORT KSSLInfoDlg : public KDialog {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 *  Construct a KSSL Information Dialog
diff --git a/tdeio/kssl/ksslkeygen.h b/tdeio/kssl/ksslkeygen.h
index 5bb99a593..13b38071a 100644
--- a/tdeio/kssl/ksslkeygen.h
+++ b/tdeio/kssl/ksslkeygen.h
@@ -42,7 +42,7 @@ class KGWizardPage2;
  * @short KDE Key Generation Dialog
  */
 class TDEIO_EXPORT KSSLKeyGen : public KWizard {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 *  Construct a keygen dialog.
diff --git a/tdeio/misc/kpac/discovery.h b/tdeio/misc/kpac/discovery.h
index 97f9cbc5c..b725fb469 100644
--- a/tdeio/misc/kpac/discovery.h
+++ b/tdeio/misc/kpac/discovery.h
@@ -31,7 +31,7 @@ namespace KPAC
 {
     class Discovery : public Downloader
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Discovery( TQObject* );
 
diff --git a/tdeio/misc/kpac/downloader.h b/tdeio/misc/kpac/downloader.h
index d64984446..d2264f8b2 100644
--- a/tdeio/misc/kpac/downloader.h
+++ b/tdeio/misc/kpac/downloader.h
@@ -31,7 +31,7 @@ namespace KPAC
 {
     class Downloader : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Downloader( TQObject* );
 
diff --git a/tdeio/misc/kpac/proxyscout.h b/tdeio/misc/kpac/proxyscout.h
index 237887c95..524ee5f43 100644
--- a/tdeio/misc/kpac/proxyscout.h
+++ b/tdeio/misc/kpac/proxyscout.h
@@ -38,7 +38,7 @@ namespace KPAC
 
     class ProxyScout : public KDEDModule
     {
-        Q_OBJECT
+        TQ_OBJECT
         K_DCOP
     public:
         ProxyScout( const TQCString& );
diff --git a/tdeio/misc/kssld/kssld.h b/tdeio/misc/kssld/kssld.h
index 028a30809..a20582ce2 100644
--- a/tdeio/misc/kssld/kssld.h
+++ b/tdeio/misc/kssld/kssld.h
@@ -38,7 +38,7 @@ class KOpenSSLProxy;
 
 class KSSLD : public KDEDModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 
 public:
diff --git a/tdeio/misc/tdesendbugmail/main.h b/tdeio/misc/tdesendbugmail/main.h
index 39d424bef..f06088694 100644
--- a/tdeio/misc/tdesendbugmail/main.h
+++ b/tdeio/misc/tdesendbugmail/main.h
@@ -6,7 +6,7 @@
 class SMTP;
 
 class BugMailer : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BugMailer(SMTP* s) : TQObject(0, "mailer"), sm(s) {}
 
diff --git a/tdeio/misc/tdesendbugmail/smtp.h b/tdeio/misc/tdesendbugmail/smtp.h
index acdb4a3c3..8c4ffcb30 100644
--- a/tdeio/misc/tdesendbugmail/smtp.h
+++ b/tdeio/misc/tdesendbugmail/smtp.h
@@ -39,7 +39,7 @@ int SMTPClientStatus[] = {
 
 class SMTP:public QObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     SMTP(char *serverhost = 0, unsigned short int port = 0, int timeout = DEFAULT_SMTP_TIMEOUT);
     ~SMTP();
diff --git a/tdeio/misc/tdewalletd/ktimeout.h b/tdeio/misc/tdewalletd/ktimeout.h
index 441e4ed77..0aced67ae 100644
--- a/tdeio/misc/tdewalletd/ktimeout.h
+++ b/tdeio/misc/tdewalletd/ktimeout.h
@@ -28,7 +28,7 @@
 
 // @internal
 class KTimeout : public TQObject {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		KTimeout(int size = 29);
 		virtual ~KTimeout();
diff --git a/tdeio/misc/tdewalletd/tdewalletd.h b/tdeio/misc/tdewalletd/tdewalletd.h
index c35ebc630..65e77771e 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.h
+++ b/tdeio/misc/tdewalletd/tdewalletd.h
@@ -40,7 +40,7 @@ class KTimeout;
 class TDEWalletTransaction;
 
 class TDEWalletD : public KDEDModule {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 	public:
 		TDEWalletD(const TQCString &name);
diff --git a/tdeio/misc/uiserver.h b/tdeio/misc/uiserver.h
index edb4531bc..8ba492da5 100644
--- a/tdeio/misc/uiserver.h
+++ b/tdeio/misc/uiserver.h
@@ -57,7 +57,7 @@ struct ListProgressColumnConfig
 */
 class TDEIO_EXPORT ListProgress : public TDEListView {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -105,7 +105,7 @@ protected:
 */
 class TDEIO_EXPORT ProgressItem : public TQObject, public TQListViewItem {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   ProgressItem( ListProgress* view, TQListViewItem *after, TQCString app_id, int job_id,
@@ -217,7 +217,7 @@ class UIServerSystemTray;
 class TDEIO_EXPORT UIServer : public TDEMainWindow, public DCOPObject {
 
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
   UIServer();
   virtual ~UIServer();
diff --git a/tdeio/tdefile/kacleditwidget.h b/tdeio/tdefile/kacleditwidget.h
index 43f4b2fca..6604c4503 100644
--- a/tdeio/tdefile/kacleditwidget.h
+++ b/tdeio/tdefile/kacleditwidget.h
@@ -40,7 +40,7 @@ class TQPushButton;
 
 class KACLEditWidget : TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   KACLEditWidget( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tdeio/tdefile/kacleditwidget_p.h b/tdeio/tdefile/kacleditwidget_p.h
index 41e265053..042efc1b5 100644
--- a/tdeio/tdefile/kacleditwidget_p.h
+++ b/tdeio/tdefile/kacleditwidget_p.h
@@ -49,7 +49,7 @@ class TQCheckBox;
 */
 class KACLListView : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     friend class KACLListViewItem;
 public:
@@ -133,7 +133,7 @@ private:
 
 class EditACLEntryDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     EditACLEntryDialog( KACLListView *listView, KACLListViewItem *item,
diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index ad72063e3..cf1736409 100644
--- a/tdeio/tdefile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -54,7 +54,7 @@ class TQIconViewItem;
 class TDEIO_EXPORT KCombiView : public TQSplitter,
 		   public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCombiView( TQWidget *parent, const char *name);
diff --git a/tdeio/tdefile/kcustommenueditor.h b/tdeio/tdefile/kcustommenueditor.h
index cb43c606f..c0f43343e 100644
--- a/tdeio/tdefile/kcustommenueditor.h
+++ b/tdeio/tdefile/kcustommenueditor.h
@@ -32,7 +32,7 @@ class TDEConfigBase;
   */
 class TDEIO_EXPORT KCustomMenuEditor : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Create a dialog for editing a custom menu
diff --git a/tdeio/tdefile/kdirselectdialog.h b/tdeio/tdefile/kdirselectdialog.h
index 400bd3232..fa71ab35f 100644
--- a/tdeio/tdefile/kdirselectdialog.h
+++ b/tdeio/tdefile/kdirselectdialog.h
@@ -38,7 +38,7 @@ class TDEToggleAction;
  */
 class TDEIO_EXPORT KDirSelectDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/kdirsize.h b/tdeio/tdefile/kdirsize.h
index 210080950..8526eeff6 100644
--- a/tdeio/tdefile/kdirsize.h
+++ b/tdeio/tdefile/kdirsize.h
@@ -29,7 +29,7 @@
  */
 class TDEIO_EXPORT KDirSize : public TDEIO::Job
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   KDirSize( const KURL & directory );
   KDirSize( const KFileItemList & lstItems );
diff --git a/tdeio/tdefile/kdiskfreesp.h b/tdeio/tdefile/kdiskfreesp.h
index 5ffa47d9a..f17a10372 100644
--- a/tdeio/tdefile/kdiskfreesp.h
+++ b/tdeio/tdefile/kdiskfreesp.h
@@ -38,7 +38,7 @@ class TDEProcess;
  * information for a given partition (mount point).
  */
 class TDEIO_EXPORT KDiskFreeSp : public TQObject
-{  Q_OBJECT
+{  TQ_OBJECT
 public:
    KDiskFreeSp( TQObject *parent=0, const char *name=0 );
    /**
diff --git a/tdeio/tdefile/kencodingfiledialog.h b/tdeio/tdefile/kencodingfiledialog.h
index b52edd629..607a19493 100644
--- a/tdeio/tdefile/kencodingfiledialog.h
+++ b/tdeio/tdefile/kencodingfiledialog.h
@@ -37,7 +37,7 @@ struct KEncodingFileDialogPrivate;
 
 class TDEIO_EXPORT KEncodingFileDialog : public KFileDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     class Result {
diff --git a/tdeio/tdefile/kicondialog.h b/tdeio/tdefile/kicondialog.h
index 7e7501eaf..1feb75dce 100644
--- a/tdeio/tdefile/kicondialog.h
+++ b/tdeio/tdefile/kicondialog.h
@@ -34,7 +34,7 @@ class TDEIconLoader;
  */
 class TDEIO_EXPORT TDEIconCanvas: public TDEIconView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     TDEIconCanvas(TQWidget *parent=0L, const char *name=0L);
@@ -90,7 +90,7 @@ private:
  */
 class TDEIO_EXPORT TDEIconDialog: public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -256,7 +256,7 @@ private:
  */
 class TDEIO_EXPORT TDEIconButton: public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString icon READ icon WRITE setIcon RESET resetIcon )
     TQ_PROPERTY( int iconSize READ iconSize WRITE setIconSize)
     TQ_PROPERTY( bool strictIconSize READ strictIconSize WRITE setStrictIconSize )
diff --git a/tdeio/tdefile/kimagefilepreview.h b/tdeio/tdefile/kimagefilepreview.h
index 0604e08f0..984c1b476 100644
--- a/tdeio/tdefile/kimagefilepreview.h
+++ b/tdeio/tdefile/kimagefilepreview.h
@@ -30,7 +30,7 @@ namespace TDEIO { class Job; class PreviewJob; }
  */
 class TDEIO_EXPORT KImageFilePreview : public KPreviewWidgetBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KImageFilePreview(TQWidget *parent);
diff --git a/tdeio/tdefile/kmetaprops.h b/tdeio/tdefile/kmetaprops.h
index c842499dd..f0b37ecff 100644
--- a/tdeio/tdefile/kmetaprops.h
+++ b/tdeio/tdefile/kmetaprops.h
@@ -30,7 +30,7 @@ class KFileMetaInfoItem;
  */
 class TDEIO_EXPORT KFileMetaPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index c8b5b21ac..fe6dcc6ba 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -51,7 +51,7 @@ namespace KNotify
  */
 class TDEIO_EXPORT KNotifyDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -188,7 +188,7 @@ namespace KNotify
      */
     class TDEIO_EXPORT KNotifyWidget : public KNotifyWidgetBase
     {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         KNotifyWidget( TQWidget* parent = 0, const char* name = 0,
diff --git a/tdeio/tdefile/kopenwith.h b/tdeio/tdefile/kopenwith.h
index e0482b87a..99a047082 100644
--- a/tdeio/tdefile/kopenwith.h
+++ b/tdeio/tdefile/kopenwith.h
@@ -45,7 +45,7 @@ class KOpenWithDlgPrivate;
  */
 class TDEIO_EXPORT KOpenWithDlg : public TQDialog //#TODO: Use KDialogBase for KDE4
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/tdeio/tdefile/kopenwith_p.h b/tdeio/tdefile/kopenwith_p.h
index 4f6d53107..ecdbdd6e6 100644
--- a/tdeio/tdefile/kopenwith_p.h
+++ b/tdeio/tdefile/kopenwith_p.h
@@ -73,7 +73,7 @@ protected:
  */
 class TDEApplicationTree : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TDEApplicationTree( TQWidget *parent );
 
diff --git a/tdeio/tdefile/kpreviewprops.h b/tdeio/tdefile/kpreviewprops.h
index d934af22a..4e7e5fbf3 100644
--- a/tdeio/tdefile/kpreviewprops.h
+++ b/tdeio/tdefile/kpreviewprops.h
@@ -31,7 +31,7 @@ class KFileMetaPreview;
  */
 class TDEIO_EXPORT KPreviewPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeio/tdefile/kpreviewwidgetbase.h b/tdeio/tdefile/kpreviewwidgetbase.h
index 3597070ee..ba3fed7dd 100644
--- a/tdeio/tdefile/kpreviewwidgetbase.h
+++ b/tdeio/tdefile/kpreviewwidgetbase.h
@@ -43,7 +43,7 @@ class KURL;
  */
 class TDEIO_EXPORT KPreviewWidgetBase : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/kpropertiesdialog.h b/tdeio/tdefile/kpropertiesdialog.h
index 2ff0c576d..cc1f75b86 100644
--- a/tdeio/tdefile/kpropertiesdialog.h
+++ b/tdeio/tdefile/kpropertiesdialog.h
@@ -69,7 +69,7 @@ namespace TDEIO { class Job; }
  */
 class TDEIO_EXPORT KPropertiesDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -436,7 +436,7 @@ private:
  */
 class TDEIO_EXPORT KPropsDlgPlugin : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -494,7 +494,7 @@ private:
  */
 class TDEIO_EXPORT KFilePropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -570,7 +570,7 @@ private:
  */
 class TDEIO_EXPORT KFilePermissionsPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   enum PermissionsMode {
     PermissionsOnlyFiles = 0,
@@ -656,7 +656,7 @@ private:
  */
 class TDEIO_EXPORT KURLPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -691,7 +691,7 @@ private:
  */
 class TDEIO_EXPORT KBindingPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -721,7 +721,7 @@ private:
  */
 class TDEIO_EXPORT KDevicePropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDevicePropsPlugin( KPropertiesDialog *_props );
   virtual ~KDevicePropsPlugin();
@@ -774,7 +774,7 @@ class KPropertiesDesktopBase;
  */
 class TDEIO_EXPORT KDesktopPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -825,7 +825,7 @@ private:
  /// Remove in KDE4
 class TDEIO_EXPORT_DEPRECATED KExecPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
@@ -881,7 +881,7 @@ private:
  /// Remove in KDE4
 class TDEIO_EXPORT_DEPRECATED TDEApplicationPropsPlugin : public KPropsDlgPlugin
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor
diff --git a/tdeio/tdefile/kurlbar.h b/tdeio/tdefile/kurlbar.h
index 4939fa830..a41366243 100644
--- a/tdeio/tdefile/kurlbar.h
+++ b/tdeio/tdefile/kurlbar.h
@@ -229,7 +229,7 @@ class KURLBarListBox;
  */
 class TDEIO_EXPORT KURLBar : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -492,7 +492,7 @@ class KURLBarToolTip;
  */
 class TDEIO_EXPORT KURLBarListBox : public TDEListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -566,7 +566,7 @@ class KURLRequester;
  */
 class TDEIO_EXPORT KURLBarItemDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/kurlcombobox.h b/tdeio/tdefile/kurlcombobox.h
index a1fd9182d..791d96a8e 100644
--- a/tdeio/tdefile/kurlcombobox.h
+++ b/tdeio/tdefile/kurlcombobox.h
@@ -40,7 +40,7 @@
  */
 class TDEIO_EXPORT KURLComboBox : public KComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY(TQStringList urls READ urls WRITE setURLs DESIGNABLE true)
     TQ_PROPERTY(int maxItems READ maxItems WRITE setMaxItems DESIGNABLE true)
 
diff --git a/tdeio/tdefile/kurlrequester.h b/tdeio/tdefile/kurlrequester.h
index 5655efa5b..6ed9e8d37 100644
--- a/tdeio/tdefile/kurlrequester.h
+++ b/tdeio/tdefile/kurlrequester.h
@@ -55,7 +55,7 @@ class TQTimer;
  */
 class TDEIO_EXPORT KURLRequester : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString url READ url WRITE setURL )
     TQ_PROPERTY( bool showLocalProtocol READ showLocalProtocol WRITE setShowLocalProtocol )
     TQ_PROPERTY( TQString filter READ filter WRITE setFilter )
@@ -289,7 +289,7 @@ private:
  */
 class TDEIO_EXPORT KURLComboRequester : public KURLRequester
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a KURLRequester widget with a combobox.
diff --git a/tdeio/tdefile/kurlrequesterdlg.h b/tdeio/tdefile/kurlrequesterdlg.h
index ef97ececf..5fdbe8315 100644
--- a/tdeio/tdefile/kurlrequesterdlg.h
+++ b/tdeio/tdefile/kurlrequesterdlg.h
@@ -37,7 +37,7 @@ class KFileDialog;
  */
 class TDEIO_EXPORT KURLRequesterDlg : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h
index 915b27c88..74abdd585 100644
--- a/tdeio/tdefile/tdediroperator.h
+++ b/tdeio/tdefile/tdediroperator.h
@@ -95,7 +95,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT KDirOperator : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
  public:
     /**
diff --git a/tdeio/tdefile/tdefilebookmarkhandler.h b/tdeio/tdefile/tdefilebookmarkhandler.h
index e13e0673b..092eba9de 100644
--- a/tdeio/tdefile/tdefilebookmarkhandler.h
+++ b/tdeio/tdefile/tdefilebookmarkhandler.h
@@ -28,7 +28,7 @@ class TDEPopupMenu;
 
 class TDEIO_EXPORT KFileBookmarkHandler : public TQObject, public KBookmarkOwner
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileBookmarkHandler( KFileDialog *dialog );
diff --git a/tdeio/tdefile/tdefiledetailview.h b/tdeio/tdefile/tdefiledetailview.h
index add8cd988..f40b5b374 100644
--- a/tdeio/tdefile/tdefiledetailview.h
+++ b/tdeio/tdefile/tdefiledetailview.h
@@ -107,7 +107,7 @@ private:
  */
 class TDEIO_EXPORT KFileDetailView : public TDEListView, public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileDetailView(TQWidget *parent, const char *name);
diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h
index cd94ebe51..a8b622fd5 100644
--- a/tdeio/tdefile/tdefiledialog.h
+++ b/tdeio/tdefile/tdefiledialog.h
@@ -75,7 +75,7 @@ struct KFileDialogPrivate;
  */
 class TDEIO_EXPORT KFileDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeio/tdefile/tdefilefiltercombo.h b/tdeio/tdefile/tdefilefiltercombo.h
index f448003bb..1f1f40db9 100644
--- a/tdeio/tdefile/tdefilefiltercombo.h
+++ b/tdeio/tdefile/tdefilefiltercombo.h
@@ -30,7 +30,7 @@ class KFileFilterComboPrivate;
 
 class TDEIO_EXPORT KFileFilterCombo : public KComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
  public:
     KFileFilterCombo(TQWidget *parent= 0, const char *name= 0);
diff --git a/tdeio/tdefile/tdefileiconview.h b/tdeio/tdefile/tdefileiconview.h
index c341d6048..8a03d4bc9 100644
--- a/tdeio/tdefile/tdefileiconview.h
+++ b/tdeio/tdefile/tdefileiconview.h
@@ -81,7 +81,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT KFileIconView : public TDEIconView, public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileIconView(TQWidget *parent, const char *name);
diff --git a/tdeio/tdefile/tdefilemetainfowidget.h b/tdeio/tdefile/tdefilemetainfowidget.h
index 5ba4d6eef..57ef4ce64 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.h
+++ b/tdeio/tdefile/tdefilemetainfowidget.h
@@ -29,7 +29,7 @@
  */
 class TDEIO_EXPORT KFileMetaInfoWidget: public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     enum Mode
     {
diff --git a/tdeio/tdefile/tdefilemetapreview.h b/tdeio/tdefile/tdefilemetapreview.h
index 443324da3..24fe415a2 100644
--- a/tdeio/tdefile/tdefilemetapreview.h
+++ b/tdeio/tdefile/tdefilemetapreview.h
@@ -17,7 +17,7 @@
 
 class TDEIO_EXPORT KFileMetaPreview : public KPreviewWidgetBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFileMetaPreview(TQWidget *parent, const char *name = 0);
diff --git a/tdeio/tdefile/tdefilepreview.h b/tdeio/tdefile/tdefilepreview.h
index 5d4014fe1..8ca2c6937 100644
--- a/tdeio/tdefile/tdefilepreview.h
+++ b/tdeio/tdefile/tdefilepreview.h
@@ -38,7 +38,7 @@
  */
 class TDEIO_EXPORT KFilePreview : public TQSplitter, public KFileView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFilePreview(TQWidget *parent, const char *name);
diff --git a/tdeio/tdefile/tdefilesharedlg.h b/tdeio/tdefile/tdefilesharedlg.h
index 4b817f714..e2ed6b194 100644
--- a/tdeio/tdefile/tdefilesharedlg.h
+++ b/tdeio/tdefile/tdefilesharedlg.h
@@ -32,7 +32,7 @@ class TQPushButton;
  */
 class TDEIO_EXPORT KFileSharePropsPlugin : public KPropsDlgPlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KFileSharePropsPlugin( KPropertiesDialog *_props );
     virtual ~KFileSharePropsPlugin();
diff --git a/tdeio/tdefile/tdefilespeedbar.h b/tdeio/tdefile/tdefilespeedbar.h
index 62415dadc..33c12c530 100644
--- a/tdeio/tdefile/tdefilespeedbar.h
+++ b/tdeio/tdefile/tdefilespeedbar.h
@@ -25,7 +25,7 @@ class TDEConfig;
 
 class TDEIO_EXPORT KFileSpeedBar : public KURLBar
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KFileSpeedBar( TQWidget *parent = 0, const char *name = 0 );
     ~KFileSpeedBar();
diff --git a/tdeio/tdefile/tdefiletreebranch.h b/tdeio/tdefile/tdefiletreebranch.h
index 8c9428de3..af5b323de 100644
--- a/tdeio/tdefile/tdefiletreebranch.h
+++ b/tdeio/tdefile/tdefiletreebranch.h
@@ -47,7 +47,7 @@ class KFileTreeView;
 
 class TDEIO_EXPORT KFileTreeBranch : public KDirLister
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    /**
     * constructs a branch for KFileTreeView. Does not yet start to list it.
diff --git a/tdeio/tdefile/tdefiletreeview.h b/tdeio/tdefile/tdefiletreeview.h
index 60f756dc2..b0dd9af36 100644
--- a/tdeio/tdefile/tdefiletreeview.h
+++ b/tdeio/tdefile/tdefiletreeview.h
@@ -65,7 +65,7 @@ private:
  */
 class TDEIO_EXPORT KFileTreeView : public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KFileTreeView( TQWidget *parent, const char *name = 0 );
     virtual ~KFileTreeView();
diff --git a/tdeio/tdefile/tdefileview.h b/tdeio/tdefile/tdefileview.h
index a747f393e..6703b8c82 100644
--- a/tdeio/tdefile/tdefileview.h
+++ b/tdeio/tdefile/tdefileview.h
@@ -35,7 +35,7 @@ class TDEActionCollection;
  **/
 class TDEIO_EXPORT KFileViewSignaler : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdefile/tests/kfdtest.h b/tdeio/tdefile/tests/kfdtest.h
index 6c59550b8..5a076460e 100644
--- a/tdeio/tdefile/tests/kfdtest.h
+++ b/tdeio/tdefile/tests/kfdtest.h
@@ -12,7 +12,7 @@
 
 class KFDTest : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KFDTest( const TQString& startDir, TQObject *parent = 0, const char *name = 0);
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.h b/tdeio/tdefile/tests/tdefiletreeviewtest.h
index 0375f8d11..246d769ef 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.h
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.h
@@ -22,7 +22,7 @@
 
 class testFrame: public TDEMainWindow
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    testFrame();
    void showPath( const KURL & );
diff --git a/tdeio/tdeio/chmodjob.h b/tdeio/tdeio/chmodjob.h
index 87ce89683..fec1fe18b 100644
--- a/tdeio/tdeio/chmodjob.h
+++ b/tdeio/tdeio/chmodjob.h
@@ -36,7 +36,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT ChmodJob : public TDEIO::Job
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
 	/**
 	 * Create new ChmodJobs using the TDEIO::chmod() function.
diff --git a/tdeio/tdeio/connection.h b/tdeio/tdeio/connection.h
index f573aafac..011928899 100644
--- a/tdeio/tdeio/connection.h
+++ b/tdeio/tdeio/connection.h
@@ -47,7 +47,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT Connection : public TQObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	/**
 	 * Creates a new connection.
diff --git a/tdeio/tdeio/dataslave.h b/tdeio/tdeio/dataslave.h
index f4ae32e66..9bd5bfc4f 100644
--- a/tdeio/tdeio/dataslave.h
+++ b/tdeio/tdeio/dataslave.h
@@ -46,7 +46,7 @@ namespace TDEIO {
      * @author Leo Savernik
      */
     class DataSlave : public TDEIO::Slave {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	DataSlave();
 
diff --git a/tdeio/tdeio/davjob.h b/tdeio/tdeio/davjob.h
index 4cf8edb97..a6a2f77bb 100644
--- a/tdeio/tdeio/davjob.h
+++ b/tdeio/tdeio/davjob.h
@@ -54,7 +54,7 @@ namespace TDEIO {
      * @since 3.1
      */
     class TDEIO_EXPORT DavJob : public TransferJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdeio/tdeio/defaultprogress.h b/tdeio/tdeio/defaultprogress.h
index de0dfd093..d3fdf785e 100644
--- a/tdeio/tdeio/defaultprogress.h
+++ b/tdeio/tdeio/defaultprogress.h
@@ -36,7 +36,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT DefaultProgress : public ProgressBase {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeio/tdeio/forwardingslavebase.h b/tdeio/tdeio/forwardingslavebase.h
index 5905fcf5e..00d38cdba 100644
--- a/tdeio/tdeio/forwardingslavebase.h
+++ b/tdeio/tdeio/forwardingslavebase.h
@@ -87,7 +87,7 @@ class ForwardingSlaveBasePrivate;
  */
 class TDEIO_EXPORT ForwardingSlaveBase : public TQObject, public SlaveBase
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     ForwardingSlaveBase(const TQCString &protocol,
                         const TQCString &poolSocket,
diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h
index cd078b842..b1da73bf1 100644
--- a/tdeio/tdeio/jobclasses.h
+++ b/tdeio/tdeio/jobclasses.h
@@ -65,7 +65,7 @@ namespace TDEIO {
      * @see TDEIO::Slave
      */
     class TDEIO_EXPORT Job : public TQObject {
-        Q_OBJECT
+        TQ_OBJECT
 
     protected:
         Job( bool showProgressInfo );
@@ -525,7 +525,7 @@ namespace TDEIO {
      * that manage subjobs but aren't scheduled directly.
      */
     class TDEIO_EXPORT SimpleJob : public TDEIO::Job {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -686,7 +686,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT StatJob : public SimpleJob {
 
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -778,7 +778,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT MkdirJob : public SimpleJob {
 
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -836,7 +836,7 @@ namespace TDEIO {
      * Used for direct copy from or to the local filesystem (i.e. SlaveBase::copy())
      */
     class TDEIO_EXPORT DirectCopyJob : public SimpleJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -872,7 +872,7 @@ namespace TDEIO {
      * reading of data from the slave should be suspended.
      */
     class TDEIO_EXPORT TransferJob : public SimpleJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
        /**
@@ -1072,7 +1072,7 @@ namespace TDEIO {
      * @since 3.3
      */
     class TDEIO_EXPORT StoredTransferJob : public TDEIO::TransferJob {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
        /**
@@ -1117,7 +1117,7 @@ namespace TDEIO {
      * @see TDEIO::multi_get()
      */
     class TDEIO_EXPORT MultiGetJob : public TransferJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
@@ -1205,7 +1205,7 @@ namespace TDEIO {
      * @see TDEIO::mimetype()
      */
     class TDEIO_EXPORT MimetypeJob : public TransferJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
        /**
@@ -1247,7 +1247,7 @@ namespace TDEIO {
      * @see TDEIO::file_move()
      */
     class TDEIO_EXPORT FileCopyJob : public Job {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 	/**
@@ -1389,7 +1389,7 @@ namespace TDEIO {
      * @see TDEIO::listDir()
      */
     class TDEIO_EXPORT ListJob : public SimpleJob {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
        /**
@@ -1505,7 +1505,7 @@ namespace TDEIO {
      * @see TDEIO::linkAs()
      */
     class TDEIO_EXPORT CopyJob : public Job {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 	/**
@@ -1760,7 +1760,7 @@ namespace TDEIO {
      * @see TDEIO::del()
      */
     class TDEIO_EXPORT DeleteJob : public Job {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 	/**
@@ -1864,7 +1864,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT LocalURLJob : public SimpleJob {
 
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdeio/tdeio/kautomount.h b/tdeio/tdeio/kautomount.h
index 203c037d9..d61395439 100644
--- a/tdeio/tdeio/kautomount.h
+++ b/tdeio/tdeio/kautomount.h
@@ -44,7 +44,7 @@ class Job;
  */
 class TDEIO_EXPORT KAutoMount : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class gcc_gives_a_warning_without_this;
 public:
   /**
@@ -89,7 +89,7 @@ private:
  */
 class TDEIO_EXPORT KAutoUnmount : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class gcc_gives_a_warning_without_this;
 public:
   /**
diff --git a/tdeio/tdeio/kdatatool.h b/tdeio/tdeio/kdatatool.h
index a77f8a9ea..d94acdc11 100644
--- a/tdeio/tdeio/kdatatool.h
+++ b/tdeio/tdeio/kdatatool.h
@@ -193,7 +193,7 @@ private:
  */
 class TDEIO_EXPORT KDataToolAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -253,7 +253,7 @@ private:
  */
 class TDEIO_EXPORT KDataTool : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
diff --git a/tdeio/tdeio/kdirlister.h b/tdeio/tdeio/kdirlister.h
index a48709b19..b69a51841 100644
--- a/tdeio/tdeio/kdirlister.h
+++ b/tdeio/tdeio/kdirlister.h
@@ -58,7 +58,7 @@ class TDEIO_EXPORT KDirLister : public TQObject
   friend class KDirListerPrivate;
   friend class KDirListerCache;
 
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool autoUpdate READ autoUpdate WRITE setAutoUpdate )
   TQ_PROPERTY( bool showingDotFiles READ showingDotFiles WRITE setShowingDotFiles )
   TQ_PROPERTY( bool dirOnlyMode READ dirOnlyMode WRITE setDirOnlyMode )
diff --git a/tdeio/tdeio/kdirlister_p.h b/tdeio/tdeio/kdirlister_p.h
index 0e1bfa259..3092e8e2e 100644
--- a/tdeio/tdeio/kdirlister_p.h
+++ b/tdeio/tdeio/kdirlister_p.h
@@ -133,7 +133,7 @@ public:
  */
 class KDirListerCache : public TQObject, KDirNotify
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDirListerCache( int maxCount = 10 );
   ~KDirListerCache();
diff --git a/tdeio/tdeio/kdirwatch.h b/tdeio/tdeio/kdirwatch.h
index 0ef3d1d34..ce7dae5cc 100644
--- a/tdeio/tdeio/kdirwatch.h
+++ b/tdeio/tdeio/kdirwatch.h
@@ -64,7 +64,7 @@ class KDirWatchPrivate;
   */
 class TDEIO_EXPORT KDirWatch : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
     
   public:
    /**
diff --git a/tdeio/tdeio/kdirwatch_p.h b/tdeio/tdeio/kdirwatch_p.h
index a0d87fee3..46c83cf72 100644
--- a/tdeio/tdeio/kdirwatch_p.h
+++ b/tdeio/tdeio/kdirwatch_p.h
@@ -21,7 +21,7 @@
  */
 class KDirWatchPrivate : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   enum entryStatus { Normal = 0, NonExistent };
diff --git a/tdeio/tdeio/kfilterbase.h b/tdeio/tdeio/kfilterbase.h
index 25613c101..203eb581d 100644
--- a/tdeio/tdeio/kfilterbase.h
+++ b/tdeio/tdeio/kfilterbase.h
@@ -37,7 +37,7 @@ class TQIODevice;
  */
 class TDEIO_EXPORT KFilterBase : public TQObject // needs to inherit TQObject for KLibFactory::create
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KFilterBase();
     virtual ~KFilterBase();
diff --git a/tdeio/tdeio/kmimetypechooser.h b/tdeio/tdeio/kmimetypechooser.h
index ad4c236c9..db3aa0c81 100644
--- a/tdeio/tdeio/kmimetypechooser.h
+++ b/tdeio/tdeio/kmimetypechooser.h
@@ -33,7 +33,7 @@
  */
 class TDEIO_EXPORT KMimeTypeChooser : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeio/tdeio/kmimetyperesolver.h b/tdeio/tdeio/kmimetyperesolver.h
index c8828a0da..655b1e3d1 100644
--- a/tdeio/tdeio/kmimetyperesolver.h
+++ b/tdeio/tdeio/kmimetyperesolver.h
@@ -48,7 +48,7 @@ protected:
  */
 class TDEIO_EXPORT KMimeTypeResolverHelper : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KMimeTypeResolverHelper( KMimeTypeResolverBase *resolver,
diff --git a/tdeio/tdeio/knfsshare.h b/tdeio/tdeio/knfsshare.h
index 64cd28dcf..1d2c306c7 100644
--- a/tdeio/tdeio/knfsshare.h
+++ b/tdeio/tdeio/knfsshare.h
@@ -34,7 +34,7 @@ class KNFSSharePrivate;
  */
 class TDEIO_EXPORT KNFSShare : public TQObject 
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   /**
    * Returns the one and only instance of KNFSShare
diff --git a/tdeio/tdeio/krun.h b/tdeio/tdeio/krun.h
index 6e5604f7a..e6c8a23ca 100644
--- a/tdeio/tdeio/krun.h
+++ b/tdeio/tdeio/krun.h
@@ -57,7 +57,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT KRun : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Create a KRun object to run the preferred application for a file/URL.
@@ -477,7 +477,7 @@ public:
  */
 class TDEIO_EXPORT TDEProcessRunner : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/tdeio/tdeio/ksambashare.h b/tdeio/tdeio/ksambashare.h
index ffd298588..d97a4a645 100644
--- a/tdeio/tdeio/ksambashare.h
+++ b/tdeio/tdeio/ksambashare.h
@@ -33,7 +33,7 @@ class KSambaSharePrivate;
  */
 class TDEIO_EXPORT KSambaShare : public TQObject 
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   /**
    * Returns the one and only instance of KSambaShare
diff --git a/tdeio/tdeio/kscan.h b/tdeio/tdeio/kscan.h
index 0ad71d51f..450a5ca45 100644
--- a/tdeio/tdeio/kscan.h
+++ b/tdeio/tdeio/kscan.h
@@ -62,7 +62,7 @@ class TQImage;
  */
 class TDEIO_EXPORT KScanDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -235,7 +235,7 @@ private:
  */
 class TDEIO_EXPORT KOCRDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdeio/kservice_p.h b/tdeio/tdeio/kservice_p.h
index 180ab8fc3..b0f0269ce 100644
--- a/tdeio/tdeio/kservice_p.h
+++ b/tdeio/tdeio/kservice_p.h
@@ -25,7 +25,7 @@
 
 class KServiceProgressDialog : public KProgressDialog
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KServiceProgressDialog(TQWidget *parent, const char *name, 
                           const TQString &caption, const TQString &text);
diff --git a/tdeio/tdeio/kshellcompletion.h b/tdeio/tdeio/kshellcompletion.h
index a23fbe78e..632aef7a6 100644
--- a/tdeio/tdeio/kshellcompletion.h
+++ b/tdeio/tdeio/kshellcompletion.h
@@ -39,7 +39,7 @@ class KShellCompletionPrivate;
  */
 class TDEIO_EXPORT KShellCompletion : public KURLCompletion 
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
         /**
diff --git a/tdeio/tdeio/kshred.h b/tdeio/tdeio/kshred.h
index 5fabcaa5b..dae5cc3df 100644
--- a/tdeio/tdeio/kshred.h
+++ b/tdeio/tdeio/kshred.h
@@ -44,7 +44,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class TDEIO_EXPORT_DEPRECATED KShred : public TQObject { // KDE4: remove
 
-  Q_OBJECT
+  TQ_OBJECT
 
     public:
 
diff --git a/tdeio/tdeio/ktrader.h b/tdeio/tdeio/ktrader.h
index 3703f5e60..bcbb2aaa9 100644
--- a/tdeio/tdeio/ktrader.h
+++ b/tdeio/tdeio/ktrader.h
@@ -84,7 +84,7 @@
  */
 class TDEIO_EXPORT TDETrader : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * A list of services.
diff --git a/tdeio/tdeio/kurifilter.h b/tdeio/tdeio/kurifilter.h
index cbd74d4e8..dfc686821 100644
--- a/tdeio/tdeio/kurifilter.h
+++ b/tdeio/tdeio/kurifilter.h
@@ -362,7 +362,7 @@ private:
  */
 class TDEIO_EXPORT KURIFilterPlugin : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/tdeio/tdeio/kurlcompletion.h b/tdeio/tdeio/kurlcompletion.h
index a6b68b1b4..6c0bada4f 100644
--- a/tdeio/tdeio/kurlcompletion.h
+++ b/tdeio/tdeio/kurlcompletion.h
@@ -40,7 +40,7 @@ class KURLCompletionPrivate;
  */
 class TDEIO_EXPORT KURLCompletion : public TDECompletion
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	/**
diff --git a/tdeio/tdeio/metainfojob.h b/tdeio/tdeio/metainfojob.h
index 44a80de1e..61f944260 100644
--- a/tdeio/tdeio/metainfojob.h
+++ b/tdeio/tdeio/metainfojob.h
@@ -32,7 +32,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT MetaInfoJob : public TDEIO::Job
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         /**
          * Creates a new MetaInfoJob.
diff --git a/tdeio/tdeio/netaccess.h b/tdeio/tdeio/netaccess.h
index 7dde61385..b5e126086 100644
--- a/tdeio/tdeio/netaccess.h
+++ b/tdeio/tdeio/netaccess.h
@@ -58,7 +58,7 @@ namespace TDEIO {
    */
 class TDEIO_EXPORT NetAccess : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdeio/observer.h b/tdeio/tdeio/observer.h
index 1864f9977..31e0feda0 100644
--- a/tdeio/tdeio/observer.h
+++ b/tdeio/tdeio/observer.h
@@ -55,7 +55,7 @@ namespace TDEIO {
 class TDEIO_EXPORT Observer : public TQObject, public DCOPObject {
 
   K_DCOP
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeio/tdeio/passdlg.h b/tdeio/tdeio/passdlg.h
index 929fa1014..c1e3606b4 100644
--- a/tdeio/tdeio/passdlg.h
+++ b/tdeio/tdeio/passdlg.h
@@ -35,7 +35,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT PasswordDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeio/tdeio/pastedialog.h b/tdeio/tdeio/pastedialog.h
index 2e7bdfda1..07b4dfce5 100644
--- a/tdeio/tdeio/pastedialog.h
+++ b/tdeio/tdeio/pastedialog.h
@@ -34,7 +34,7 @@ namespace TDEIO {
  */
 class PasteDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PasteDialog( const TQString &caption, const TQString &label,
                  const TQString &value, const TQStringList& items,
diff --git a/tdeio/tdeio/previewjob.h b/tdeio/tdeio/previewjob.h
index a1b9550ba..b4cecf412 100644
--- a/tdeio/tdeio/previewjob.h
+++ b/tdeio/tdeio/previewjob.h
@@ -34,7 +34,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT PreviewJob : public TDEIO::Job
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
 	/**
 	 * Creates a new PreviewJob.
diff --git a/tdeio/tdeio/progressbase.h b/tdeio/tdeio/progressbase.h
index 655edeee5..9dcad7c13 100644
--- a/tdeio/tdeio/progressbase.h
+++ b/tdeio/tdeio/progressbase.h
@@ -69,7 +69,7 @@ namespace TDEIO
 */
 class TDEIO_EXPORT ProgressBase : public TQWidget {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeio/tdeio/renamedlg.h b/tdeio/tdeio/renamedlg.h
index 2183d05b6..2550f63f6 100644
--- a/tdeio/tdeio/renamedlg.h
+++ b/tdeio/tdeio/renamedlg.h
@@ -47,7 +47,7 @@ enum RenameDlg_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERW
  */
 class TDEIO_EXPORT RenameDlg : public TQDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Construct a "rename" dialog.
diff --git a/tdeio/tdeio/scheduler.h b/tdeio/tdeio/scheduler.h
index fe0d050e4..f7f7bb1a7 100644
--- a/tdeio/tdeio/scheduler.h
+++ b/tdeio/tdeio/scheduler.h
@@ -108,7 +108,7 @@ namespace TDEIO {
      **/
 
     class TDEIO_EXPORT Scheduler : public TQObject, virtual public DCOPObject {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         typedef TQPtrList<SimpleJob> JobList;
diff --git a/tdeio/tdeio/sessiondata.h b/tdeio/tdeio/sessiondata.h
index 4aee40497..48595c68e 100644
--- a/tdeio/tdeio/sessiondata.h
+++ b/tdeio/tdeio/sessiondata.h
@@ -34,7 +34,7 @@ class SlaveConfig;
  */
 class TDEIO_EXPORT SessionData : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SessionData();
diff --git a/tdeio/tdeio/skipdlg.h b/tdeio/tdeio/skipdlg.h
index c07086463..a63eb062b 100644
--- a/tdeio/tdeio/skipdlg.h
+++ b/tdeio/tdeio/skipdlg.h
@@ -36,7 +36,7 @@ namespace TDEIO {
  */
 class TDEIO_EXPORT SkipDlg : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   SkipDlg( TQWidget *parent, bool _multi, const TQString& _error_text, bool _modal = false );
   ~SkipDlg();
diff --git a/tdeio/tdeio/slave.h b/tdeio/tdeio/slave.h
index ae4eb00db..2f8138dc9 100644
--- a/tdeio/tdeio/slave.h
+++ b/tdeio/tdeio/slave.h
@@ -42,7 +42,7 @@ namespace TDEIO {
     */
     class TDEIO_EXPORT Slave : public TDEIO::SlaveInterface
     {
-	Q_OBJECT
+	TQ_OBJECT
 	
 
     protected:
diff --git a/tdeio/tdeio/slaveconfig.h b/tdeio/tdeio/slaveconfig.h
index a21965040..9f8562649 100644
--- a/tdeio/tdeio/slaveconfig.h
+++ b/tdeio/tdeio/slaveconfig.h
@@ -45,7 +45,7 @@ namespace TDEIO {
      */
     class TDEIO_EXPORT SlaveConfig : public TQObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
         static SlaveConfig *self();
         ~SlaveConfig();
diff --git a/tdeio/tdeio/slaveinterface.h b/tdeio/tdeio/slaveinterface.h
index 584a4f606..2f9fdbd5a 100644
--- a/tdeio/tdeio/slaveinterface.h
+++ b/tdeio/tdeio/slaveinterface.h
@@ -92,7 +92,7 @@ class SlaveInterfacePrivate;
  */
 class TDEIO_EXPORT SlaveInterface : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SlaveInterface( Connection *connection );
diff --git a/tdeio/tdeio/statusbarprogress.h b/tdeio/tdeio/statusbarprogress.h
index d1d591fbe..ff235e9ab 100644
--- a/tdeio/tdeio/statusbarprogress.h
+++ b/tdeio/tdeio/statusbarprogress.h
@@ -59,7 +59,7 @@ class Job;
 */
 class TDEIO_EXPORT StatusbarProgress : public ProgressBase {
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeio/tdeio/tdefilemetainfo.h b/tdeio/tdeio/tdefilemetainfo.h
index 2266690e8..08649ae1d 100644
--- a/tdeio/tdeio/tdefilemetainfo.h
+++ b/tdeio/tdeio/tdefilemetainfo.h
@@ -1393,7 +1393,7 @@ private:
  **/
 class TDEIO_EXPORT KFilePlugin : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -1647,7 +1647,7 @@ class TDEIO_EXPORT KFileMetaInfoProvider: private QObject
 {
     friend class KFilePlugin;
 
-  Q_OBJECT
+  TQ_OBJECT
 public:
     virtual ~KFileMetaInfoProvider();
 
diff --git a/tdeio/tdeio/tdefileshare.h b/tdeio/tdeio/tdefileshare.h
index b909a8e2f..7ef2b67a9 100644
--- a/tdeio/tdeio/tdefileshare.h
+++ b/tdeio/tdeio/tdefileshare.h
@@ -31,7 +31,7 @@ class KDirWatch;
  */
 class KFileSharePrivate : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KFileSharePrivate();
diff --git a/tdeio/tdeioexec/main.h b/tdeio/tdeioexec/main.h
index beb6a2297..863da887a 100644
--- a/tdeio/tdeioexec/main.h
+++ b/tdeio/tdeioexec/main.h
@@ -10,7 +10,7 @@ namespace TDEIO { class Job; }
 
 class KIOExec : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KIOExec();
 
diff --git a/tdeio/tests/dummymeta.h b/tdeio/tests/dummymeta.h
index 4cefcc01d..20c9fec54 100644
--- a/tdeio/tests/dummymeta.h
+++ b/tdeio/tests/dummymeta.h
@@ -7,7 +7,7 @@ class KFileMetaInfo;
 
 class DummyMeta : public KFilePlugin
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     DummyMeta( TQObject *parent, const char *name, const TQStringList &args );
diff --git a/tdeio/tests/jobtest.h b/tdeio/tests/jobtest.h
index 5bff6d0e3..bcf1af5ac 100644
--- a/tdeio/tests/jobtest.h
+++ b/tdeio/tests/jobtest.h
@@ -26,7 +26,7 @@
 
 class JobTest : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     JobTest() {}
diff --git a/tdeio/tests/kdcopcheck.h b/tdeio/tests/kdcopcheck.h
index 593dbba1e..07236909c 100644
--- a/tdeio/tests/kdcopcheck.h
+++ b/tdeio/tests/kdcopcheck.h
@@ -7,7 +7,7 @@
 
 class TestService : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TestService(const TQString &exec);
 
diff --git a/tdeio/tests/kdirlistertest.h b/tdeio/tests/kdirlistertest.h
index 484121eef..550b5c1ce 100644
--- a/tdeio/tests/kdirlistertest.h
+++ b/tdeio/tests/kdirlistertest.h
@@ -33,7 +33,7 @@ using namespace std;
 
 class PrintSignals : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    PrintSignals() : TQObject() { }
 
@@ -100,7 +100,7 @@ public slots:
 
 class KDirListerTest : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    KDirListerTest( TQWidget *parent=0, const char *name=0 );
    ~KDirListerTest();
diff --git a/tdeio/tests/kdirwatchtest.h b/tdeio/tests/kdirwatchtest.h
index 493043c01..ee7974f6f 100644
--- a/tdeio/tests/kdirwatchtest.h
+++ b/tdeio/tests/kdirwatchtest.h
@@ -21,7 +21,7 @@
 
 class myTest : public TQObject 
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    myTest() { };
 public slots:
diff --git a/tdeio/tests/kdirwatchunittest.h b/tdeio/tests/kdirwatchunittest.h
index 416aeecfe..99c7f73c3 100644
--- a/tdeio/tests/kdirwatchunittest.h
+++ b/tdeio/tests/kdirwatchunittest.h
@@ -24,7 +24,7 @@
 
 class KDirWatchTest : public KUnitTest::Tester
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   enum { sigDirty, sigCreated, sigDeleted };
diff --git a/tdeio/tests/kruntest.h b/tdeio/tests/kruntest.h
index 68e7a7280..b8870816c 100644
--- a/tdeio/tests/kruntest.h
+++ b/tdeio/tests/kruntest.h
@@ -25,7 +25,7 @@
 
 class testKRun : public KRun
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 
   testKRun( const KURL& _url, mode_t _mode = 0,
@@ -42,7 +42,7 @@ public:
 class TQPushButton;
 class Receiver : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Receiver();
   ~Receiver() {}
diff --git a/tdeio/tests/previewtest.h b/tdeio/tests/previewtest.h
index 5ef82916d..2a3f5e5d1 100644
--- a/tdeio/tests/previewtest.h
+++ b/tdeio/tests/previewtest.h
@@ -8,7 +8,7 @@ class KFileItem;
 
 class PreviewTest : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PreviewTest();
 
diff --git a/tdeio/tests/speed.h b/tdeio/tests/speed.h
index cd59cb6f6..1e9dab6a1 100644
--- a/tdeio/tests/speed.h
+++ b/tdeio/tests/speed.h
@@ -9,7 +9,7 @@ namespace TDEIO {
 }
 
 class SpeedTest : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     SpeedTest(const KURL & url);
diff --git a/tdeio/tests/tdeioslavetest.h b/tdeio/tests/tdeioslavetest.h
index 7f11bd4e3..efe089fd9 100644
--- a/tdeio/tests/tdeioslavetest.h
+++ b/tdeio/tests/tdeioslavetest.h
@@ -27,7 +27,7 @@
 #include "tdeio/slave.h"
 
 class KioslaveTest : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KioslaveTest( TQString src, TQString dest, uint op, uint pr );
diff --git a/tdeioslave/file/file.h b/tdeioslave/file/file.h
index 226e0a428..04a6ed225 100644
--- a/tdeioslave/file/file.h
+++ b/tdeioslave/file/file.h
@@ -42,7 +42,7 @@
 
 class FileProtocol : public TQObject, public TDEIO::SlaveBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   FileProtocol( const TQCString &pool, const TQCString &app);
   virtual ~FileProtocol() { }
diff --git a/tdeioslave/http/http.h b/tdeioslave/http/http.h
index aacdf1d47..51ec5b232 100644
--- a/tdeioslave/http/http.h
+++ b/tdeioslave/http/http.h
@@ -48,7 +48,7 @@ namespace TDEIO {
 
 class HTTPProtocol : public TQObject, public TDEIO::TCPSlaveBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   HTTPProtocol( const TQCString &protocol, const TQCString &pool,
                 const TQCString &app );
diff --git a/tdeioslave/http/kcookiejar/kcookieserver.h b/tdeioslave/http/kcookiejar/kcookieserver.h
index 2cbb9ccf1..4603808e0 100644
--- a/tdeioslave/http/kcookiejar/kcookieserver.h
+++ b/tdeioslave/http/kcookiejar/kcookieserver.h
@@ -38,7 +38,7 @@ class TDEConfig;
 
 class KCookieServer : public KDEDModule
 {
-  Q_OBJECT
+  TQ_OBJECT
   K_DCOP
 public:
   KCookieServer(const TQCString &);
diff --git a/tdeioslave/http/kcookiejar/kcookiewin.h b/tdeioslave/http/kcookiejar/kcookiewin.h
index d739732dc..ddf744019 100644
--- a/tdeioslave/http/kcookiejar/kcookiewin.h
+++ b/tdeioslave/http/kcookiejar/kcookiewin.h
@@ -39,7 +39,7 @@ class KURLLabel;
 
 class KCookieDetail : public TQGroupBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public :
     KCookieDetail( KHttpCookieList cookieList, int cookieCount, TQWidget *parent=0,
@@ -63,7 +63,7 @@ private slots:
 
 class KCookieWin : public KDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public :
     KCookieWin( TQWidget *parent, KHttpCookieList cookieList, int defaultButton=0,
diff --git a/tdemdi/tdemdi/dockcontainer.h b/tdemdi/tdemdi/dockcontainer.h
index 57855bfa0..cbe71a944 100644
--- a/tdemdi/tdemdi/dockcontainer.h
+++ b/tdemdi/tdemdi/dockcontainer.h
@@ -38,7 +38,7 @@ namespace KMDI
 
 class DockContainer: public TQWidget, public KDockContainer
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     DockContainer(TQWidget *parent, TQWidget *win, int position, int flags);
diff --git a/tdemdi/tdemdi/guiclient.h b/tdemdi/tdemdi/guiclient.h
index d4f752d64..14ccfa10a 100644
--- a/tdemdi/tdemdi/guiclient.h
+++ b/tdemdi/tdemdi/guiclient.h
@@ -44,7 +44,7 @@ class GUIClientPrivate;
 
 class GUIClient : public TQObject, public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     GUIClient( KMDI::MainWindow *mdiMainFrm, const char *name = 0 );
@@ -78,7 +78,7 @@ class GUIClient : public TQObject, public KXMLGUIClient
 
 class ToggleToolViewAction:public TDEToggleAction
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ToggleToolViewAction ( const TQString& text, const TDEShortcut& cut = TDEShortcut(),
diff --git a/tdemdi/tdemdi/mainwindow.h b/tdemdi/tdemdi/mainwindow.h
index 133abd4a9..835093e6e 100644
--- a/tdemdi/tdemdi/mainwindow.h
+++ b/tdemdi/tdemdi/mainwindow.h
@@ -71,7 +71,7 @@ class TabWidget;
 
 class KMDI_EXPORT MainWindow : public KParts::DockMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   friend class KMDI::ToolViewAccessor;
 
diff --git a/tdemdi/tdemdi/tabwidget.h b/tdemdi/tdemdi/tabwidget.h
index dd79f92a7..ecae1ec64 100644
--- a/tdemdi/tdemdi/tabwidget.h
+++ b/tdemdi/tdemdi/tabwidget.h
@@ -55,7 +55,7 @@ namespace KMDI
 
 class KMDI_EXPORT TabWidget : public KTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TabWidget(TQWidget* parent, const char* name=0);
diff --git a/tdemdi/tdemdi/toolviewaccessor.h b/tdemdi/tdemdi/toolviewaccessor.h
index 2278a3931..d27a50c0f 100644
--- a/tdemdi/tdemdi/toolviewaccessor.h
+++ b/tdemdi/tdemdi/toolviewaccessor.h
@@ -39,7 +39,7 @@ class MainWindow;
 
 class ToolViewAccessor : public TQObject
 {
-   Q_OBJECT
+   TQ_OBJECT
 
    friend class KMDI::MainWindow;
    friend class KMDIPrivate::GUIClient;
diff --git a/tdemdi/tdemdichildarea.h b/tdemdi/tdemdichildarea.h
index a3361bc9b..a755df515 100644
--- a/tdemdi/tdemdichildarea.h
+++ b/tdemdi/tdemdichildarea.h
@@ -54,7 +54,7 @@ class KMDI_EXPORT KMdiChildArea : public TQFrame
 	friend class KMdiChildFrmCaption;
 	friend class KMdiChildFrm;
 
-Q_OBJECT
+TQ_OBJECT
 
 	// attributes
 public:
diff --git a/tdemdi/tdemdichildfrm.h b/tdemdi/tdemdichildfrm.h
index 20f7ac347..6b9a2a648 100644
--- a/tdemdi/tdemdichildfrm.h
+++ b/tdemdi/tdemdichildfrm.h
@@ -51,7 +51,7 @@ class TQToolButton;
   */
 class KMDI_EXPORT KMdiWin32IconButton : public TQLabel
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMdiWin32IconButton( TQWidget* parent, const char* name = 0 );
 	virtual void mousePressEvent( TQMouseEvent* );
@@ -132,7 +132,7 @@ class KMDI_EXPORT KMdiChildFrm : public TQFrame
 	friend class KMdiChildArea;
 	friend class KMdiChildFrmCaption;
 
-	Q_OBJECT
+	TQ_OBJECT
 
 	// attributes
 public:
diff --git a/tdemdi/tdemdichildfrmcaption.h b/tdemdi/tdemdichildfrmcaption.h
index 7028202d8..9ae9f94e6 100644
--- a/tdemdi/tdemdichildfrmcaption.h
+++ b/tdemdi/tdemdichildfrmcaption.h
@@ -43,7 +43,7 @@ class KMdiChildFrmCaptionPrivate;
 */
 class KMDI_EXPORT KMdiChildFrmCaption : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 * Constructor
diff --git a/tdemdi/tdemdichildview.h b/tdemdi/tdemdichildview.h
index 0c05b5a47..66bd913ce 100644
--- a/tdemdi/tdemdichildview.h
+++ b/tdemdi/tdemdichildview.h
@@ -109,7 +109,7 @@ class KMDI_EXPORT KMdiChildView : public TQWidget
 {
 	friend class KMdiMainFrm;
 	friend class KMdiChildFrm;
-	Q_OBJECT
+	TQ_OBJECT
 
 	// attributes
 protected:
diff --git a/tdemdi/tdemdidockcontainer.h b/tdemdi/tdemdidockcontainer.h
index 9ef606d06..009a00901 100644
--- a/tdemdi/tdemdidockcontainer.h
+++ b/tdemdi/tdemdidockcontainer.h
@@ -36,7 +36,7 @@ class KDockButton_Private;
 
 class KMDI_EXPORT KMdiDockContainer: public TQWidget, public KDockContainer
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KMdiDockContainer( TQWidget *parent, TQWidget *win, int position, int flags );
diff --git a/tdemdi/tdemdidocumentviewtabwidget.h b/tdemdi/tdemdidocumentviewtabwidget.h
index 1481a86a8..14b5cc7b5 100644
--- a/tdemdi/tdemdidocumentviewtabwidget.h
+++ b/tdemdi/tdemdidocumentviewtabwidget.h
@@ -22,7 +22,7 @@ class TDEPopupMenu;
 class KMDI_EXPORT KMdiDocumentViewTabWidget:
 			public KTabWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMdiDocumentViewTabWidget( TQWidget* parent, const char* name = 0 );
 	~KMdiDocumentViewTabWidget();
diff --git a/tdemdi/tdemdifocuslist.h b/tdemdi/tdemdifocuslist.h
index 18749862b..8653d32bf 100644
--- a/tdemdi/tdemdifocuslist.h
+++ b/tdemdi/tdemdifocuslist.h
@@ -25,7 +25,7 @@
 
 class KMDI_EXPORT KMdiFocusList: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMdiFocusList( TQObject *parent );
 	~KMdiFocusList();
diff --git a/tdemdi/tdemdiguiclient.h b/tdemdi/tdemdiguiclient.h
index ef0f8bcbf..31550a234 100644
--- a/tdemdi/tdemdiguiclient.h
+++ b/tdemdi/tdemdiguiclient.h
@@ -41,7 +41,7 @@ namespace KMDIPrivate
 class KMDI_EXPORT KMDIGUIClient : public TQObject,
 			public KXMLGUIClient
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 
 	KMDIGUIClient( KMdiMainFrm *mdiMainFrm, bool showMDIModeAction, const char *name = 0 );
@@ -120,7 +120,7 @@ private:
  */
 class KMDI_EXPORT ToggleToolViewAction: public TDEToggleAction
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 
 	ToggleToolViewAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), KDockWidget *dw = 0, KMdiMainFrm *mdiMainFrm = 0,
diff --git a/tdemdi/tdemdimainfrm.h b/tdemdi/tdemdimainfrm.h
index 22efc9e9a..780df6fc4 100644
--- a/tdemdi/tdemdimainfrm.h
+++ b/tdemdi/tdemdimainfrm.h
@@ -240,7 +240,7 @@ class KMDI_EXPORT KMdiMainFrm : public KParts::DockMainWindow
 {
 	friend class KMdiChildView;
 	friend class KMdiTaskBar;
-	Q_OBJECT
+	TQ_OBJECT
 
 	friend class KMdiToolViewAccessor;
 	// attributes
diff --git a/tdemdi/tdemditaskbar.h b/tdemdi/tdemditaskbar.h
index 17df32014..a68e2d945 100644
--- a/tdemdi/tdemditaskbar.h
+++ b/tdemdi/tdemditaskbar.h
@@ -50,7 +50,7 @@ class KMdiTaskBarButtonPrivate;
   */
 class KMDI_EXPORT KMdiTaskBarButton : public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 	// methods
 public:
 	/**
@@ -128,7 +128,7 @@ class KMdiTaskBarPrivate;
  */
 class KMDI_EXPORT KMdiTaskBar : public TDEToolBar
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	* Constructor (NoFocus, minimum width = 1, an internal TQPtrList of taskbar buttons (autodelete))
diff --git a/tdemdi/tdemditoolviewaccessor.h b/tdemdi/tdemditoolviewaccessor.h
index 85dda10cc..0d851d5bf 100644
--- a/tdemdi/tdemditoolviewaccessor.h
+++ b/tdemdi/tdemditoolviewaccessor.h
@@ -37,7 +37,7 @@ class KMDIGUIClient;
 
 class KMDI_EXPORT KMdiToolViewAccessor : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 
 	friend class KMdiMainFrm;
diff --git a/tdemdi/test/hello.h b/tdemdi/test/hello.h
index b6ce589a0..9af080d11 100644
--- a/tdemdi/test/hello.h
+++ b/tdemdi/test/hello.h
@@ -20,7 +20,7 @@ class TQPaintEvent;
 
 class Hello : public KMdiChildView
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Hello( const char *title, const char *text, TQWidget* parentWidget = 0 );
 signals:
diff --git a/tdemdi/test/mainwidget.h b/tdemdi/test/mainwidget.h
index f1635d25e..a59989f9a 100644
--- a/tdemdi/test/mainwidget.h
+++ b/tdemdi/test/mainwidget.h
@@ -29,7 +29,7 @@
   */
 class MainWidget : public KMdiMainFrm
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MainWidget(TQDomElement& dockConfig,KMdi::MdiMode mode);
     virtual ~MainWidget();
@@ -50,7 +50,7 @@ private:
   */
 class RestartWidget : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 // methods
 public:
     RestartWidget();
diff --git a/tdenewstuff/downloaddialog.h b/tdenewstuff/downloaddialog.h
index 5756a4e6e..207d24fb4 100644
--- a/tdenewstuff/downloaddialog.h
+++ b/tdenewstuff/downloaddialog.h
@@ -56,7 +56,7 @@ class Engine;
  */
 class KDE_EXPORT DownloadDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     struct Private;
   public:
     /**
diff --git a/tdenewstuff/engine.h b/tdenewstuff/engine.h
index 432f3b04c..0cac342ab 100644
--- a/tdenewstuff/engine.h
+++ b/tdenewstuff/engine.h
@@ -51,7 +51,7 @@ class ProviderDialog;
  */
 class KDE_EXPORT Engine : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     struct Private;
   public:
     /**
diff --git a/tdenewstuff/ghns.h b/tdenewstuff/ghns.h
index 7eea0c489..3cb70da65 100644
--- a/tdenewstuff/ghns.h
+++ b/tdenewstuff/ghns.h
@@ -32,7 +32,7 @@
 
 class GhnsWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     GhnsWidget();
     ~GhnsWidget();
diff --git a/tdenewstuff/knewstuffbutton.h b/tdenewstuff/knewstuffbutton.h
index e4a98ae3a..7cad1b0a8 100644
--- a/tdenewstuff/knewstuffbutton.h
+++ b/tdenewstuff/knewstuffbutton.h
@@ -36,7 +36,7 @@ class DownloadDialog;
  */
 class Button : public KPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdenewstuff/knewstuffsecure.h b/tdenewstuff/knewstuffsecure.h
index 1c292a9a8..bb07a8637 100644
--- a/tdenewstuff/knewstuffsecure.h
+++ b/tdenewstuff/knewstuffsecure.h
@@ -39,7 +39,7 @@ to the standard TDENewStuff class.
 */
 class KDE_EXPORT TDENewStuffSecure : public  TQObject, public TDENewStuff
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     /** Constructor.
diff --git a/tdenewstuff/provider.h b/tdenewstuff/provider.h
index 0a65d64fc..0c62edca1 100644
--- a/tdenewstuff/provider.h
+++ b/tdenewstuff/provider.h
@@ -46,7 +46,7 @@ namespace KNS {
  */
 class KDE_EXPORT Provider : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     typedef TQPtrList<Provider> List;
 
@@ -190,7 +190,7 @@ class KDE_EXPORT Provider : public TQObject
  */
 class KDE_EXPORT ProviderLoader : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     /**
      * Constructor.
diff --git a/tdenewstuff/providerdialog.h b/tdenewstuff/providerdialog.h
index fe7652f14..d951801bd 100644
--- a/tdenewstuff/providerdialog.h
+++ b/tdenewstuff/providerdialog.h
@@ -42,7 +42,7 @@ class Engine;
  */
 class ProviderDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     /**
       Constructor.
diff --git a/tdenewstuff/security.h b/tdenewstuff/security.h
index 230821e7e..ac3f4f1a0 100644
--- a/tdenewstuff/security.h
+++ b/tdenewstuff/security.h
@@ -43,7 +43,7 @@ namespace KNS {
 
 class Security : public TQObject
 {
-Q_OBJECT
+TQ_OBJECT
 public:
   static Security* const ref()
   {
diff --git a/tdenewstuff/testnewstuff.h b/tdenewstuff/testnewstuff.h
index acd9aece4..9d4f71274 100644
--- a/tdenewstuff/testnewstuff.h
+++ b/tdenewstuff/testnewstuff.h
@@ -42,7 +42,7 @@ class TestNewStuff : public TDENewStuff
 
 class MyWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     MyWidget();
     ~MyWidget();
diff --git a/tdenewstuff/uploaddialog.h b/tdenewstuff/uploaddialog.h
index 3fc068e3a..906f2ea9f 100644
--- a/tdenewstuff/uploaddialog.h
+++ b/tdenewstuff/uploaddialog.h
@@ -46,7 +46,7 @@ class Entry;
  */
 class UploadDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     /**
       Constructor.
diff --git a/tdeparts/browserextension.h b/tdeparts/browserextension.h
index a84c3c837..ac6ec27ed 100644
--- a/tdeparts/browserextension.h
+++ b/tdeparts/browserextension.h
@@ -307,7 +307,7 @@ class BrowserExtensionPrivate;
   */
 class TDEPARTS_EXPORT BrowserExtension : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setURLDropHandlingEnabled )
 public:
   /**
@@ -723,7 +723,7 @@ private:
  */
 class TDEPARTS_EXPORT BrowserHostExtension : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   BrowserHostExtension( KParts::ReadOnlyPart *parent,
                         const char *name = 0L );
@@ -791,7 +791,7 @@ private:
  */
 class TDEPARTS_EXPORT LiveConnectExtension : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   enum Type {
       TypeVoid=0, TypeBool, TypeFunction, TypeNumber, TypeObject, TypeString
diff --git a/tdeparts/browserinterface.h b/tdeparts/browserinterface.h
index 5934c2c9c..558781bf4 100644
--- a/tdeparts/browserinterface.h
+++ b/tdeparts/browserinterface.h
@@ -37,7 +37,7 @@ namespace KParts
  */
 class TDEPARTS_EXPORT BrowserInterface : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BrowserInterface( TQObject *parent, const char *name = 0 );
     virtual ~BrowserInterface();
diff --git a/tdeparts/browserrun.h b/tdeparts/browserrun.h
index 0b7e1f514..95fb8a08b 100644
--- a/tdeparts/browserrun.h
+++ b/tdeparts/browserrun.h
@@ -41,7 +41,7 @@ namespace KParts {
      */
     class TDEPARTS_EXPORT BrowserRun : public KRun
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         /**
          * @param url the URL we're probing
diff --git a/tdeparts/dockmainwindow.h b/tdeparts/dockmainwindow.h
index 4974390de..64cd3bd35 100644
--- a/tdeparts/dockmainwindow.h
+++ b/tdeparts/dockmainwindow.h
@@ -46,7 +46,7 @@ class DockMainWindowPrivate;
  */
 class TDEPARTS_EXPORT DockMainWindow : public KDockMainWindow, virtual public PartBase
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   /**
    * Constructor, same signature as KDockMainWindow.
diff --git a/tdeparts/factory.h b/tdeparts/factory.h
index a9c5692c2..82312ca19 100644
--- a/tdeparts/factory.h
+++ b/tdeparts/factory.h
@@ -39,7 +39,7 @@ class Part;
  */
 class TDEPARTS_EXPORT Factory : public KLibFactory
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Factory( TQObject *parent = 0, const char *name = 0 );
   virtual ~Factory();
diff --git a/tdeparts/historyprovider.h b/tdeparts/historyprovider.h
index 616668e99..d5f4f817d 100644
--- a/tdeparts/historyprovider.h
+++ b/tdeparts/historyprovider.h
@@ -40,7 +40,7 @@ namespace KParts {
  */
 class TDEPARTS_EXPORT HistoryProvider : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static HistoryProvider * self();
diff --git a/tdeparts/mainwindow.h b/tdeparts/mainwindow.h
index f39c9f7c0..1721ecc81 100644
--- a/tdeparts/mainwindow.h
+++ b/tdeparts/mainwindow.h
@@ -46,7 +46,7 @@ class MainWindowPrivate;
  */
 class TDEPARTS_EXPORT MainWindow : public TDEMainWindow, virtual public PartBase
 {
-  Q_OBJECT
+  TQ_OBJECT
  public:
   /**
    * Constructor, same signature as TDEMainWindow.
diff --git a/tdeparts/part.h b/tdeparts/part.h
index 90c1804c5..1c91a8d5e 100644
--- a/tdeparts/part.h
+++ b/tdeparts/part.h
@@ -180,7 +180,7 @@ private:
  */
 class TDEPARTS_EXPORT Part : public TQObject, public PartBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -337,7 +337,7 @@ class ReadOnlyPartPrivate;
  */
 class TDEPARTS_EXPORT ReadOnlyPart : public Part
 {
-  Q_OBJECT
+  TQ_OBJECT
   friend class ReadWritePart;
 public:
   /**
@@ -543,7 +543,7 @@ private:
  */
 class TDEPARTS_EXPORT ReadWritePart : public ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor.
diff --git a/tdeparts/partmanager.h b/tdeparts/partmanager.h
index 19e161d44..2f3169a94 100644
--- a/tdeparts/partmanager.h
+++ b/tdeparts/partmanager.h
@@ -48,7 +48,7 @@ class PartManagerPrivate;
  */
 class TDEPARTS_EXPORT PartManager : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_ENUMS( SelectionPolicy )
   TQ_PROPERTY( SelectionPolicy selectionPolicy READ selectionPolicy WRITE setSelectionPolicy )
   TQ_PROPERTY( bool allowNestedParts READ allowNestedParts WRITE setAllowNestedParts )
diff --git a/tdeparts/plugin.h b/tdeparts/plugin.h
index 6815e9f02..cdb55b00b 100644
--- a/tdeparts/plugin.h
+++ b/tdeparts/plugin.h
@@ -48,7 +48,7 @@ namespace KParts
  */
 class TDEPARTS_EXPORT Plugin : public TQObject, virtual public KXMLGUIClient
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Struct holding information about a plugin
diff --git a/tdeparts/statusbarextension.h b/tdeparts/statusbarextension.h
index da00286cf..49a165f4e 100644
--- a/tdeparts/statusbarextension.h
+++ b/tdeparts/statusbarextension.h
@@ -52,7 +52,7 @@ namespace KParts
    */
   class TDEPARTS_EXPORT StatusBarExtension : public TQObject
   {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
       StatusBarExtension( KParts::ReadOnlyPart *parent, const char *name=0L );
diff --git a/tdeparts/tests/example.h b/tdeparts/tests/example.h
index 76541437d..9264bfa25 100644
--- a/tdeparts/tests/example.h
+++ b/tdeparts/tests/example.h
@@ -10,7 +10,7 @@ class TQWidget;
 
 class Shell : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Shell();
   virtual ~Shell();
diff --git a/tdeparts/tests/ghostview.h b/tdeparts/tests/ghostview.h
index 2974ded5e..983813f27 100644
--- a/tdeparts/tests/ghostview.h
+++ b/tdeparts/tests/ghostview.h
@@ -5,7 +5,7 @@
 
 class Shell : public KParts::MainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Shell();
   virtual ~Shell();
diff --git a/tdeparts/tests/normalktm.h b/tdeparts/tests/normalktm.h
index f60d490a6..962a71cc7 100644
--- a/tdeparts/tests/normalktm.h
+++ b/tdeparts/tests/normalktm.h
@@ -10,7 +10,7 @@ class TQWidget;
 
 class Shell : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Shell();
   virtual ~Shell();
diff --git a/tdeparts/tests/notepad.h b/tdeparts/tests/notepad.h
index bd502599b..25d452fac 100644
--- a/tdeparts/tests/notepad.h
+++ b/tdeparts/tests/notepad.h
@@ -15,7 +15,7 @@ class TQMultiLineEdit;
  */
 class NotepadPart : public KParts::ReadWritePart
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   NotepadPart( TQWidget*, const char* widgetName,
                TQObject* parent, const char* name,
diff --git a/tdeparts/tests/parts.h b/tdeparts/tests/parts.h
index 37af4911e..b2e8d2ee9 100644
--- a/tdeparts/tests/parts.h
+++ b/tdeparts/tests/parts.h
@@ -11,7 +11,7 @@ class GUIActivateEvent;
 
 class Part1 : public KParts::ReadOnlyPart
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Part1( TQObject *parent, TQWidget * parentWidget );
   virtual ~Part1();
@@ -26,7 +26,7 @@ protected:
 
 class Part2 : public KParts::Part
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Part2( TQObject *parent, TQWidget * parentWidget );
   virtual ~Part2();
diff --git a/tdeparts/tests/plugin_spellcheck.h b/tdeparts/tests/plugin_spellcheck.h
index d27966c0c..3c7506c5c 100644
--- a/tdeparts/tests/plugin_spellcheck.h
+++ b/tdeparts/tests/plugin_spellcheck.h
@@ -5,7 +5,7 @@
 
 class PluginSpellCheck : public KParts::Plugin
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     PluginSpellCheck( TQObject* parent = 0, const char* name = 0, 
                       const TQStringList& = TQStringList() );
diff --git a/tdeprint/cups/cupsaddsmb2.h b/tdeprint/cups/cupsaddsmb2.h
index 9aeccdd4a..5fa8a3f71 100644
--- a/tdeprint/cups/cupsaddsmb2.h
+++ b/tdeprint/cups/cupsaddsmb2.h
@@ -34,7 +34,7 @@ class TQLineEdit;
 
 class CupsAddSmb : public KDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	enum State { None, Start, MkDir, Copy, AddDriver, AddPrinter };
diff --git a/tdeprint/cups/cupsdconf2/browsedialog.h b/tdeprint/cups/cupsdconf2/browsedialog.h
index 8db12bc34..cc4a12907 100644
--- a/tdeprint/cups/cupsdconf2/browsedialog.h
+++ b/tdeprint/cups/cupsdconf2/browsedialog.h
@@ -28,7 +28,7 @@ struct CupsdConf;
 
 class BrowseDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	BrowseDialog(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
index bdbff1844..53bc266d7 100644
--- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.h
@@ -29,7 +29,7 @@ class TQComboBox;
 
 class CupsdBrowsingPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdBrowsingPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsddialog.h b/tdeprint/cups/cupsdconf2/cupsddialog.h
index 85eee172e..2d1de6689 100644
--- a/tdeprint/cups/cupsdconf2/cupsddialog.h
+++ b/tdeprint/cups/cupsdconf2/cupsddialog.h
@@ -28,7 +28,7 @@ struct CupsdConf;
 
 class CupsdDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	CupsdDialog(TQWidget *parent = 0, const char *name = 0);
 	~CupsdDialog();
diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.h b/tdeprint/cups/cupsdconf2/cupsdjobspage.h
index abbbd140d..8f6668aa3 100644
--- a/tdeprint/cups/cupsdconf2/cupsdjobspage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.h
@@ -27,7 +27,7 @@ class TQCheckBox;
 
 class CupsdJobsPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdJobsPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h
index be46c280f..912d4bb4a 100644
--- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.h
@@ -30,7 +30,7 @@ class SizeWidget;
 
 class CupsdNetworkPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdNetworkPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsdpage.h b/tdeprint/cups/cupsdconf2/cupsdpage.h
index aadbd54b9..41209a5c0 100644
--- a/tdeprint/cups/cupsdconf2/cupsdpage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdpage.h
@@ -26,7 +26,7 @@ struct CupsdConf;
 
 class CupsdPage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	CupsdPage(TQWidget *parent = 0, const char *name = 0);
 	virtual ~CupsdPage();
diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h
index 5e97c1cf8..ebe86b6ad 100644
--- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.h
@@ -30,7 +30,7 @@ struct CupsLocation;
 
 class CupsdSecurityPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdSecurityPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.h b/tdeprint/cups/cupsdconf2/cupsdserverpage.h
index f1f9eed2f..13bac0f6e 100644
--- a/tdeprint/cups/cupsdconf2/cupsdserverpage.h
+++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.h
@@ -28,7 +28,7 @@ class TQComboBox;
 
 class CupsdServerPage : public CupsdPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	CupsdServerPage(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/editlist.h b/tdeprint/cups/cupsdconf2/editlist.h
index 19a2da8c8..45783b0e3 100644
--- a/tdeprint/cups/cupsdconf2/editlist.h
+++ b/tdeprint/cups/cupsdconf2/editlist.h
@@ -28,7 +28,7 @@ class TQPushButton;
 
 class EditList : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	EditList(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/cupsdconf2/locationdialog.h b/tdeprint/cups/cupsdconf2/locationdialog.h
index f0c182f42..2afd3600b 100644
--- a/tdeprint/cups/cupsdconf2/locationdialog.h
+++ b/tdeprint/cups/cupsdconf2/locationdialog.h
@@ -30,7 +30,7 @@ struct CupsLocation;
 
 class LocationDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	LocationDialog(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.h b/tdeprint/cups/cupsdconf2/qdirlineedit.h
index d852897c3..f682d6fbe 100644
--- a/tdeprint/cups/cupsdconf2/qdirlineedit.h
+++ b/tdeprint/cups/cupsdconf2/qdirlineedit.h
@@ -28,7 +28,7 @@ class TQPushButton;
 
 class QDirLineEdit : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	QDirLineEdit(bool file, TQWidget *parent = 0, const char *name = 0);
 	~QDirLineEdit();
diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
index a55f3355e..47b9530d3 100644
--- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
+++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.h
@@ -28,7 +28,7 @@ class TQPushButton;
 
 class QDirMultiLineEdit : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	QDirMultiLineEdit(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/cups/ippreportdlg.h b/tdeprint/cups/ippreportdlg.h
index e61ccd7b7..9d622562e 100644
--- a/tdeprint/cups/ippreportdlg.h
+++ b/tdeprint/cups/ippreportdlg.h
@@ -27,7 +27,7 @@ class KTextEdit;
 
 class IppReportDlg : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	IppReportDlg(TQWidget *parent = 0, const char *name = 0);
 	static void report(IppRequest *req, int group, const TQString& caption = TQString::null);
diff --git a/tdeprint/cups/kmcupsjobmanager.h b/tdeprint/cups/kmcupsjobmanager.h
index 0635dd8ea..00b218c20 100644
--- a/tdeprint/cups/kmcupsjobmanager.h
+++ b/tdeprint/cups/kmcupsjobmanager.h
@@ -28,7 +28,7 @@ class KMPrinter;
 
 class KMCupsJobManager : public KMJobManager
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KMCupsJobManager(TQObject *parent, const char *name, const TQStringList &/*args*/);
diff --git a/tdeprint/cups/kmcupsmanager.h b/tdeprint/cups/kmcupsmanager.h
index 1e7c21b19..cc4a74a85 100644
--- a/tdeprint/cups/kmcupsmanager.h
+++ b/tdeprint/cups/kmcupsmanager.h
@@ -35,7 +35,7 @@ class KMCupsManager : public KMManager
 	friend class KMWIppPrinter;
 	friend class KMCupsJobManager;
 
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMCupsManager(TQObject *parent, const char *name, const TQStringList & /*args*/);
 	virtual ~KMCupsManager();
diff --git a/tdeprint/cups/kmwippprinter.h b/tdeprint/cups/kmwippprinter.h
index f578afba9..24758ab4a 100644
--- a/tdeprint/cups/kmwippprinter.h
+++ b/tdeprint/cups/kmwippprinter.h
@@ -31,7 +31,7 @@ class NetworkScanner;
 
 class KMWIppPrinter : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWIppPrinter(TQWidget *parent = 0, const char *name = 0);
 	~KMWIppPrinter();
diff --git a/tdeprint/cups/kmwother.h b/tdeprint/cups/kmwother.h
index a650482f4..c25913a52 100644
--- a/tdeprint/cups/kmwother.h
+++ b/tdeprint/cups/kmwother.h
@@ -28,7 +28,7 @@ class TQListViewItem;
 
 class KMWOther : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWOther(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/cups/kmwquota.h b/tdeprint/cups/kmwquota.h
index d8895c80d..e63f01aa4 100644
--- a/tdeprint/cups/kmwquota.h
+++ b/tdeprint/cups/kmwquota.h
@@ -27,7 +27,7 @@ class TQComboBox;
 
 class KMWQuota : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWQuota(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KMWQuota();
diff --git a/tdeprint/cups/kmwusers.h b/tdeprint/cups/kmwusers.h
index cae8844a6..82c0d8a75 100644
--- a/tdeprint/cups/kmwusers.h
+++ b/tdeprint/cups/kmwusers.h
@@ -27,7 +27,7 @@ class TQComboBox;
 
 class KMWUsers : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWUsers(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KMWUsers();
diff --git a/tdeprint/cups/kpimagepage.h b/tdeprint/cups/kpimagepage.h
index 1a6bc6e44..71bf31e0b 100644
--- a/tdeprint/cups/kpimagepage.h
+++ b/tdeprint/cups/kpimagepage.h
@@ -30,7 +30,7 @@ class ImagePosition;
 
 class KPImagePage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPImagePage(DrMain *driver = 0, TQWidget *parent = 0, const char *name = 0);
 	~KPImagePage();
diff --git a/tdeprint/cups/kpschedulepage.h b/tdeprint/cups/kpschedulepage.h
index 4be11fab9..163cdcf23 100644
--- a/tdeprint/cups/kpschedulepage.h
+++ b/tdeprint/cups/kpschedulepage.h
@@ -29,7 +29,7 @@ class KIntNumInput;
 
 class KPSchedulePage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPSchedulePage(TQWidget *parent = 0, const char *name = 0);
 	~KPSchedulePage();
diff --git a/tdeprint/cups/kptextpage.h b/tdeprint/cups/kptextpage.h
index 504e2d5c2..5aecfb526 100644
--- a/tdeprint/cups/kptextpage.h
+++ b/tdeprint/cups/kptextpage.h
@@ -30,7 +30,7 @@ class MarginWidget;
 
 class KPTextPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPTextPage(DrMain *driver, TQWidget *parent = 0, const char *name = 0);
 	~KPTextPage();
diff --git a/tdeprint/driverview.h b/tdeprint/driverview.h
index 7e06648fa..5db76a0cd 100644
--- a/tdeprint/driverview.h
+++ b/tdeprint/driverview.h
@@ -38,7 +38,7 @@ public:
 
 class TDEPRINT_EXPORT DriverView : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	DriverView(TQWidget *parent = 0, const char *name = 0);
 	~DriverView();
diff --git a/tdeprint/droptionview.h b/tdeprint/droptionview.h
index 6114efcbd..9304db3b3 100644
--- a/tdeprint/droptionview.h
+++ b/tdeprint/droptionview.h
@@ -37,7 +37,7 @@ class DriverItem;
 
 class OptionBaseView : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	OptionBaseView(TQWidget *parent = 0, const char *name = 0);
 	virtual void setOption(DrBase*);
@@ -52,7 +52,7 @@ protected:
 
 class OptionNumericView : public OptionBaseView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	OptionNumericView(TQWidget *parent = 0, const char *name = 0);
 	void setOption(DrBase *opt);
@@ -82,7 +82,7 @@ private:
 
 class OptionListView : public OptionBaseView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	OptionListView(TQWidget *parent = 0, const char *name = 0);
 	void setOption(DrBase *opt);
@@ -98,7 +98,7 @@ private:
 
 class OptionBooleanView : public OptionBaseView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	OptionBooleanView(TQWidget *parent = 0, const char *name = 0);
 	void setOption(DrBase *opt);
@@ -114,7 +114,7 @@ private:
 
 class DrOptionView : public TQGroupBox
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	DrOptionView(TQWidget *parent = 0, const char *name = 0);
 	void setAllowFixed(bool on) 	{ m_allowfixed = on; }
diff --git a/tdeprint/kmfactory.h b/tdeprint/kmfactory.h
index baaf48477..86aaad676 100644
--- a/tdeprint/kmfactory.h
+++ b/tdeprint/kmfactory.h
@@ -44,7 +44,7 @@ class KPReloadObject;
 
 class TDEPRINT_EXPORT KMFactory : public TQObject, public DCOPObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 
 public:
diff --git a/tdeprint/kmjobmanager.h b/tdeprint/kmjobmanager.h
index fce6e61d2..e2aa01f5b 100644
--- a/tdeprint/kmjobmanager.h
+++ b/tdeprint/kmjobmanager.h
@@ -45,7 +45,7 @@ class TDEAction;
  */
 class TDEPRINT_EXPORT KMJobManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	enum JobType { ActiveJobs = 0, CompletedJobs = 1 };
diff --git a/tdeprint/kmmanager.h b/tdeprint/kmmanager.h
index d90a02d23..3f42a1acc 100644
--- a/tdeprint/kmmanager.h
+++ b/tdeprint/kmmanager.h
@@ -47,7 +47,7 @@ class PrinterFilter;
  */
 class TDEPRINT_EXPORT KMManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 friend class KMVirtualManager;
 friend class KMSpecialManager;
diff --git a/tdeprint/kmuimanager.h b/tdeprint/kmuimanager.h
index e59c61e40..6b9113d33 100644
--- a/tdeprint/kmuimanager.h
+++ b/tdeprint/kmuimanager.h
@@ -35,7 +35,7 @@ class TQListView;
 
 class TDEPRINT_EXPORT KMUiManager : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum PrintDialogFlagType
 	{
diff --git a/tdeprint/kpcopiespage.h b/tdeprint/kpcopiespage.h
index ddb2b4f2a..2011c7ade 100644
--- a/tdeprint/kpcopiespage.h
+++ b/tdeprint/kpcopiespage.h
@@ -33,7 +33,7 @@ class KPrinter;
 
 class TDEPRINT_EXPORT KPCopiesPage : public KPrintDialogPage, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPCopiesPage(KPrinter *prt = 0, TQWidget *parent = 0, const char *name = 0);
 	~KPCopiesPage();
diff --git a/tdeprint/kpfilterpage.h b/tdeprint/kpfilterpage.h
index a5bc7f757..9845b87b8 100644
--- a/tdeprint/kpfilterpage.h
+++ b/tdeprint/kpfilterpage.h
@@ -33,7 +33,7 @@ class TQTextBrowser;
 
 class KPFilterPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPFilterPage(TQWidget *parent = 0, const char *name = 0);
 	~KPFilterPage();
diff --git a/tdeprint/kpgeneralpage.h b/tdeprint/kpgeneralpage.h
index dc8eef580..eea610cdc 100644
--- a/tdeprint/kpgeneralpage.h
+++ b/tdeprint/kpgeneralpage.h
@@ -30,7 +30,7 @@ class TQLabel;
 
 class TDEPRINT_EXPORT KPGeneralPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent = 0, const char *name = 0);
 	~KPGeneralPage();
diff --git a/tdeprint/kpposterpage.h b/tdeprint/kpposterpage.h
index ce4858aa3..bd5352a51 100644
--- a/tdeprint/kpposterpage.h
+++ b/tdeprint/kpposterpage.h
@@ -32,7 +32,7 @@ class TQLineEdit;
 
 class KPPosterPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPPosterPage( TQWidget *parent = 0, const char *name = 0 );
 	~KPPosterPage();
diff --git a/tdeprint/kpqtpage.h b/tdeprint/kpqtpage.h
index ee78ffa86..cfeefa465 100644
--- a/tdeprint/kpqtpage.h
+++ b/tdeprint/kpqtpage.h
@@ -31,7 +31,7 @@ class DrMain;
 
 class TDEPRINT_EXPORT KPQtPage : public KPrintDialogPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPQtPage(TQWidget *parent = 0, const char *name = 0);
 	KPQtPage(DrMain *driver, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/kprintaction.h b/tdeprint/kprintaction.h
index 94549402f..a381ac6dd 100644
--- a/tdeprint/kprintaction.h
+++ b/tdeprint/kprintaction.h
@@ -26,7 +26,7 @@ class KPrinter;
 
 class TDEPRINT_EXPORT KPrintAction : public TDEActionMenu
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum PrinterType { All, Regular, Specials };
 
diff --git a/tdeprint/kprintdialog.h b/tdeprint/kprintdialog.h
index c23e9cdc1..0c14f1407 100644
--- a/tdeprint/kprintdialog.h
+++ b/tdeprint/kprintdialog.h
@@ -40,7 +40,7 @@ class KPrintDialogPage;
  */
 class TDEPRINT_EXPORT KPrintDialog : public KDialog, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrintDialog(TQWidget *parent = 0, const char *name = 0);
 	~KPrintDialog();
diff --git a/tdeprint/kprintdialogpage.h b/tdeprint/kprintdialogpage.h
index 46152ee13..353b68986 100644
--- a/tdeprint/kprintdialogpage.h
+++ b/tdeprint/kprintdialogpage.h
@@ -89,7 +89,7 @@ class DrMain;
  */
 class TDEPRINT_EXPORT KPrintDialogPage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 * Standard constructor.
diff --git a/tdeprint/kprinterimpl.h b/tdeprint/kprinterimpl.h
index 24da07be4..2913a1406 100644
--- a/tdeprint/kprinterimpl.h
+++ b/tdeprint/kprinterimpl.h
@@ -33,7 +33,7 @@ class KMPrinter;
 
 class TDEPRINT_EXPORT KPrinterImpl : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrinterImpl(TQObject *parent = 0, const char *name = 0);
 	virtual ~KPrinterImpl();
diff --git a/tdeprint/kprinterpropertydialog.h b/tdeprint/kprinterpropertydialog.h
index e76f38212..62647fd24 100644
--- a/tdeprint/kprinterpropertydialog.h
+++ b/tdeprint/kprinterpropertydialog.h
@@ -32,7 +32,7 @@ class TQTabWidget;
 
 class TDEPRINT_EXPORT KPrinterPropertyDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrinterPropertyDialog(KMPrinter *printer, TQWidget *parent = 0, const char *name = 0);
 	~KPrinterPropertyDialog();
diff --git a/tdeprint/kprintpreview.h b/tdeprint/kprintpreview.h
index ae99fb405..678f74454 100644
--- a/tdeprint/kprintpreview.h
+++ b/tdeprint/kprintpreview.h
@@ -29,7 +29,7 @@ class KLibFactory;
 
 class KPrintPreview : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrintPreview(TQWidget *parent = 0, bool previewOnly = false);
 	~KPrintPreview();
@@ -49,7 +49,7 @@ private:
 
 class KPreviewProc : public TDEProcess
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPreviewProc();
 	virtual ~KPreviewProc();
diff --git a/tdeprint/kprintprocess.h b/tdeprint/kprintprocess.h
index 5ceb3835e..ede5eb3b6 100644
--- a/tdeprint/kprintprocess.h
+++ b/tdeprint/kprintprocess.h
@@ -25,7 +25,7 @@
 
 class KPrintProcess : public KShellProcess
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KPrintProcess();
 	~KPrintProcess();
diff --git a/tdeprint/lpr/editentrydialog.h b/tdeprint/lpr/editentrydialog.h
index f4359dd89..888f87eed 100644
--- a/tdeprint/lpr/editentrydialog.h
+++ b/tdeprint/lpr/editentrydialog.h
@@ -33,7 +33,7 @@ class TQWidgetStack;
 
 class EditEntryDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	EditEntryDialog(PrintcapEntry *entry, TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/lpr/kmlprmanager.h b/tdeprint/lpr/kmlprmanager.h
index d26af4d77..c4be757b1 100644
--- a/tdeprint/lpr/kmlprmanager.h
+++ b/tdeprint/lpr/kmlprmanager.h
@@ -34,7 +34,7 @@ class KPrinter;
 
 class KMLprManager : public KMManager
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMLprManager(TQObject *parent, const char *name, const TQStringList & /*args*/);
 
diff --git a/tdeprint/management/cjanuswidget.h b/tdeprint/management/cjanuswidget.h
index d33be1499..5b178c824 100644
--- a/tdeprint/management/cjanuswidget.h
+++ b/tdeprint/management/cjanuswidget.h
@@ -30,7 +30,7 @@ class TQListBoxItem;
 
 class CJanusWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	CJanusWidget(TQWidget *parent, const char *name);
 	~CJanusWidget();
diff --git a/tdeprint/management/kiconselectaction.h b/tdeprint/management/kiconselectaction.h
index 26e703fbf..7403d311a 100644
--- a/tdeprint/management/kiconselectaction.h
+++ b/tdeprint/management/kiconselectaction.h
@@ -26,7 +26,7 @@ class TDEIconSelectActionPrivate;
 
 class TDEIconSelectAction : public TDESelectAction
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEIconSelectAction(const TQString& text, int accel = 0, TQObject* parent = 0, const char* name = 0);
 	virtual ~TDEIconSelectAction();
diff --git a/tdeprint/management/kmconfigdialog.h b/tdeprint/management/kmconfigdialog.h
index 6a47995cc..30dd2b2ef 100644
--- a/tdeprint/management/kmconfigdialog.h
+++ b/tdeprint/management/kmconfigdialog.h
@@ -27,7 +27,7 @@
 
 class TDEPRINT_EXPORT KMConfigDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigDialog(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmconfigfilter.h b/tdeprint/management/kmconfigfilter.h
index 8338ebd6f..1e0f6e2c9 100644
--- a/tdeprint/management/kmconfigfilter.h
+++ b/tdeprint/management/kmconfigfilter.h
@@ -28,7 +28,7 @@ class TQLineEdit;
 
 class KMConfigFilter : public KMConfigPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigFilter(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmconfigfonts.h b/tdeprint/management/kmconfigfonts.h
index 8bd285f38..9ac9a43f5 100644
--- a/tdeprint/management/kmconfigfonts.h
+++ b/tdeprint/management/kmconfigfonts.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 
 class KMConfigFonts : public KMConfigPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigFonts(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmconfiggeneral.h b/tdeprint/management/kmconfiggeneral.h
index b82a91daa..190b4f38a 100644
--- a/tdeprint/management/kmconfiggeneral.h
+++ b/tdeprint/management/kmconfiggeneral.h
@@ -28,7 +28,7 @@ class TQCheckBox;
 class TQPushButton;
 class KMConfigGeneral : public KMConfigPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigGeneral(TQWidget *parent = 0);
 
diff --git a/tdeprint/management/kmconfigjobs.h b/tdeprint/management/kmconfigjobs.h
index 29818d68a..0edab1056 100644
--- a/tdeprint/management/kmconfigjobs.h
+++ b/tdeprint/management/kmconfigjobs.h
@@ -26,7 +26,7 @@ class KIntNumInput;
 
 class KMConfigJobs : public KMConfigPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigJobs(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmconfigpage.h b/tdeprint/management/kmconfigpage.h
index f29b8a23e..da1cad014 100644
--- a/tdeprint/management/kmconfigpage.h
+++ b/tdeprint/management/kmconfigpage.h
@@ -28,7 +28,7 @@ class TDEConfig;
 
 class TDEPRINT_EXPORT KMConfigPage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMConfigPage(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmdbcreator.h b/tdeprint/management/kmdbcreator.h
index 4b1983ae6..1aadc5026 100644
--- a/tdeprint/management/kmdbcreator.h
+++ b/tdeprint/management/kmdbcreator.h
@@ -30,7 +30,7 @@ class TQProgressDialog;
 
 class KMDBCreator : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMDBCreator(TQObject *parent = 0, const char *name = 0);
 	~KMDBCreator();
diff --git a/tdeprint/management/kmdriverdb.h b/tdeprint/management/kmdriverdb.h
index c5af6d53e..8dec3e8f0 100644
--- a/tdeprint/management/kmdriverdb.h
+++ b/tdeprint/management/kmdriverdb.h
@@ -31,7 +31,7 @@ class KMDBCreator;
 
 class KMDriverDB : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	static KMDriverDB* self();
 
diff --git a/tdeprint/management/kmdriverdbwidget.h b/tdeprint/management/kmdriverdbwidget.h
index 05b50536d..2841fd51f 100644
--- a/tdeprint/management/kmdriverdbwidget.h
+++ b/tdeprint/management/kmdriverdbwidget.h
@@ -29,7 +29,7 @@ class TQPushButton;
 
 class KMDriverDbWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMDriverDbWidget(TQWidget *parent = 0, const char *name = 0);
 	~KMDriverDbWidget();
diff --git a/tdeprint/management/kmdriverdialog.h b/tdeprint/management/kmdriverdialog.h
index 8b7b01c45..3a62619ed 100644
--- a/tdeprint/management/kmdriverdialog.h
+++ b/tdeprint/management/kmdriverdialog.h
@@ -27,7 +27,7 @@ class DrMain;
 
 class KMDriverDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMDriverDialog(TQWidget *parent = 0, const char *name = 0);
 	~KMDriverDialog();
diff --git a/tdeprint/management/kmiconview.h b/tdeprint/management/kmiconview.h
index 1c8cb197e..888ae9ad9 100644
--- a/tdeprint/management/kmiconview.h
+++ b/tdeprint/management/kmiconview.h
@@ -47,7 +47,7 @@ private:
 
 class KMIconView : public TDEIconView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum ViewMode { Big, Small };
 
diff --git a/tdeprint/management/kminstancepage.h b/tdeprint/management/kminstancepage.h
index 56b045fe2..67bef455e 100644
--- a/tdeprint/management/kminstancepage.h
+++ b/tdeprint/management/kminstancepage.h
@@ -30,7 +30,7 @@ class TQButton;
 
 class KMInstancePage : public TQWidget, public KMPrinterPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMInstancePage(TQWidget *parent = 0, const char *name = 0);
 	~KMInstancePage();
diff --git a/tdeprint/management/kmjobviewer.h b/tdeprint/management/kmjobviewer.h
index f9e6ffb80..38db6c16c 100644
--- a/tdeprint/management/kmjobviewer.h
+++ b/tdeprint/management/kmjobviewer.h
@@ -48,7 +48,7 @@ class TQCheckBox;
  */
 class TDEPRINT_EXPORT KMJobViewer : public TDEMainWindow, public KMPrinterPage, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMJobViewer(TQWidget *parent = 0, const char *name = 0);
 	~KMJobViewer();
diff --git a/tdeprint/management/kmlistview.h b/tdeprint/management/kmlistview.h
index 20ddc5731..472f0d2cc 100644
--- a/tdeprint/management/kmlistview.h
+++ b/tdeprint/management/kmlistview.h
@@ -28,7 +28,7 @@ class KMPrinter;
 
 class KMListView : public TQListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMListView(TQWidget *parent = 0, const char *name = 0);
 	~KMListView();
diff --git a/tdeprint/management/kmmainview.h b/tdeprint/management/kmmainview.h
index b35e7ef0f..9c55fe433 100644
--- a/tdeprint/management/kmmainview.h
+++ b/tdeprint/management/kmmainview.h
@@ -52,7 +52,7 @@ class TQMenuBar;
  */
 class TDEPRINT_EXPORT KMMainView : public TQWidget, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMMainView(TQWidget *parent = 0, const char *name = 0, TDEActionCollection *coll = 0);
 	~KMMainView();
diff --git a/tdeprint/management/kmprinterview.h b/tdeprint/management/kmprinterview.h
index 14354a3b5..e9ce4aa9f 100644
--- a/tdeprint/management/kmprinterview.h
+++ b/tdeprint/management/kmprinterview.h
@@ -30,7 +30,7 @@ class TQIconViewItem;
 
 class KMPrinterView : public TQWidgetStack
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum ViewType { Icons = 0, List, Tree };
 
diff --git a/tdeprint/management/kmpropcontainer.h b/tdeprint/management/kmpropcontainer.h
index d191dfeb6..eadcde1e3 100644
--- a/tdeprint/management/kmpropcontainer.h
+++ b/tdeprint/management/kmpropcontainer.h
@@ -28,7 +28,7 @@ class KMPrinter;
 
 class KMPropContainer : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMPropContainer(TQWidget *parent = 0, const char *name = 0);
 	~KMPropContainer();
diff --git a/tdeprint/management/kmpropertypage.h b/tdeprint/management/kmpropertypage.h
index 5acee87fd..c54011d25 100644
--- a/tdeprint/management/kmpropertypage.h
+++ b/tdeprint/management/kmpropertypage.h
@@ -31,7 +31,7 @@ class KMPrinter;
 
 class TDEPRINT_EXPORT KMPropertyPage : public CJanusWidget, public KMPrinterPage, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMPropertyPage(TQWidget *parent = 0, const char *name = 0);
 	~KMPropertyPage();
diff --git a/tdeprint/management/kmpropwidget.h b/tdeprint/management/kmpropwidget.h
index 9d418066a..6e7a78d8d 100644
--- a/tdeprint/management/kmpropwidget.h
+++ b/tdeprint/management/kmpropwidget.h
@@ -29,7 +29,7 @@ class KMWizard;
 
 class TDEPRINT_EXPORT KMPropWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMPropWidget(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KMPropWidget();
diff --git a/tdeprint/management/kmspecialprinterdlg.h b/tdeprint/management/kmspecialprinterdlg.h
index 3d334c7fd..efa927474 100644
--- a/tdeprint/management/kmspecialprinterdlg.h
+++ b/tdeprint/management/kmspecialprinterdlg.h
@@ -31,7 +31,7 @@ class KXmlCommandSelector;
 
 class KMSpecialPrinterDlg : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMSpecialPrinterDlg(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmtimer.h b/tdeprint/management/kmtimer.h
index 0c2e0169a..d64c9c091 100644
--- a/tdeprint/management/kmtimer.h
+++ b/tdeprint/management/kmtimer.h
@@ -36,7 +36,7 @@
  */
 class TDEPRINT_EXPORT KMTimer : public TQTimer
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	void delay(int t);
 	~KMTimer();
diff --git a/tdeprint/management/kmwclass.h b/tdeprint/management/kmwclass.h
index a74f20117..286f930e7 100644
--- a/tdeprint/management/kmwclass.h
+++ b/tdeprint/management/kmwclass.h
@@ -26,7 +26,7 @@ class TDEListBox;
 
 class KMWClass : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWClass(TQWidget *parent = 0, const char *name = 0);
 	~KMWClass();
diff --git a/tdeprint/management/kmwdriverselect.h b/tdeprint/management/kmwdriverselect.h
index 9c78008c1..6419232dd 100644
--- a/tdeprint/management/kmwdriverselect.h
+++ b/tdeprint/management/kmwdriverselect.h
@@ -28,7 +28,7 @@ class TQPushButton;
 
 class KMWDriverSelect : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWDriverSelect(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmwdrivertest.h b/tdeprint/management/kmwdrivertest.h
index 5c1aefaee..4bf68f06a 100644
--- a/tdeprint/management/kmwdrivertest.h
+++ b/tdeprint/management/kmwdrivertest.h
@@ -28,7 +28,7 @@ class DrMain;
 
 class KMWDriverTest : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWDriverTest(TQWidget *parent = 0, const char *name = 0);
 	~KMWDriverTest();
diff --git a/tdeprint/management/kmwizard.h b/tdeprint/management/kmwizard.h
index 171158b37..63849c5bb 100644
--- a/tdeprint/management/kmwizard.h
+++ b/tdeprint/management/kmwizard.h
@@ -36,7 +36,7 @@ class SidePixmap;
 
 class TDEPRINT_EXPORT KMWizard : public TQDialog
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum PageType {
 		Start   = 0,
diff --git a/tdeprint/management/kmwizardpage.h b/tdeprint/management/kmwizardpage.h
index b02dbe9fe..e7568c847 100644
--- a/tdeprint/management/kmwizardpage.h
+++ b/tdeprint/management/kmwizardpage.h
@@ -28,7 +28,7 @@ class KMPrinter;
 
 class TDEPRINT_EXPORT KMWizardPage : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWizardPage(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KMWizardPage();
diff --git a/tdeprint/management/kmwlocal.h b/tdeprint/management/kmwlocal.h
index e65128747..0216fae8f 100644
--- a/tdeprint/management/kmwlocal.h
+++ b/tdeprint/management/kmwlocal.h
@@ -30,7 +30,7 @@ class TQListViewItem;
 
 class KMWLocal : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWLocal(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmwsmb.h b/tdeprint/management/kmwsmb.h
index 695379a79..e8c5361ec 100644
--- a/tdeprint/management/kmwsmb.h
+++ b/tdeprint/management/kmwsmb.h
@@ -28,7 +28,7 @@ class TQLabel;
 
 class KMWSmb : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWSmb(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kmwsocket.h b/tdeprint/management/kmwsocket.h
index 7489d6ec7..b765c594d 100644
--- a/tdeprint/management/kmwsocket.h
+++ b/tdeprint/management/kmwsocket.h
@@ -29,7 +29,7 @@ class NetworkScanner;
 
 class KMWSocket : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWSocket(TQWidget *parent = 0, const char *name = 0);
 	~KMWSocket();
diff --git a/tdeprint/management/kmwsocketutil.h b/tdeprint/management/kmwsocketutil.h
index dfb9f490e..643ff67d5 100644
--- a/tdeprint/management/kmwsocketutil.h
+++ b/tdeprint/management/kmwsocketutil.h
@@ -39,7 +39,7 @@ class KMWSocketUtil;
 class SocketConfig : public KDialogBase
 {
 	friend class KMWSocketUtil;
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SocketConfig(KMWSocketUtil *util, TQWidget *parent = 0, const char *name = 0);
 	~SocketConfig();
diff --git a/tdeprint/management/kxmlcommanddlg.h b/tdeprint/management/kxmlcommanddlg.h
index d69c19e62..d4c574514 100644
--- a/tdeprint/management/kxmlcommanddlg.h
+++ b/tdeprint/management/kxmlcommanddlg.h
@@ -42,7 +42,7 @@ class KXmlCommand;
 
 class KXmlCommandAdvancedDlg : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KXmlCommandAdvancedDlg(TQWidget *parent = 0, const char *name = 0);
 	~KXmlCommandAdvancedDlg();
@@ -93,7 +93,7 @@ private:
 
 class KXmlCommandDlg : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KXmlCommandDlg(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/management/kxmlcommandselector.h b/tdeprint/management/kxmlcommandselector.h
index 5b2d109ea..40b8f4bd3 100644
--- a/tdeprint/management/kxmlcommandselector.h
+++ b/tdeprint/management/kxmlcommandselector.h
@@ -34,7 +34,7 @@ class KDialogBase;
 
 class TDEPRINT_EXPORT KXmlCommandSelector : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KXmlCommandSelector(bool canBeNull = true, TQWidget *parent = 0, const char *name = 0, KDialogBase *dlg = 0);
 
diff --git a/tdeprint/management/networkscanner.h b/tdeprint/management/networkscanner.h
index 80a017676..7218472a5 100644
--- a/tdeprint/management/networkscanner.h
+++ b/tdeprint/management/networkscanner.h
@@ -27,7 +27,7 @@
 
 class TDEPRINT_EXPORT NetworkScanner : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	NetworkScanner( int port = 9100, TQWidget *parent = 0, const char *name = 0 );
@@ -77,7 +77,7 @@ class TQComboBox;
 
 class NetworkScannerConfig : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	NetworkScannerConfig(NetworkScanner *scanner, const char *name = 0);
diff --git a/tdeprint/management/pluginaction.h b/tdeprint/management/pluginaction.h
index 0f87460fd..d8aa98ca6 100644
--- a/tdeprint/management/pluginaction.h
+++ b/tdeprint/management/pluginaction.h
@@ -24,7 +24,7 @@
 
 class TDEPRINT_EXPORT PluginAction : public TDEAction
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent = 0, const char *name = 0);
diff --git a/tdeprint/management/smbview.h b/tdeprint/management/smbview.h
index 51193254e..7eb7623cb 100644
--- a/tdeprint/management/smbview.h
+++ b/tdeprint/management/smbview.h
@@ -27,7 +27,7 @@ class KTempFile;
 
 class SmbView : public TDEListView
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	SmbView(TQWidget *parent = 0, const char *name = 0);
 	~SmbView();
diff --git a/tdeprint/marginpreview.h b/tdeprint/marginpreview.h
index e0ed3e775..6c01bde73 100644
--- a/tdeprint/marginpreview.h
+++ b/tdeprint/marginpreview.h
@@ -24,7 +24,7 @@
 
 class MarginPreview : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	MarginPreview(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/marginvaluewidget.h b/tdeprint/marginvaluewidget.h
index 97f1409c1..1e9266d0e 100644
--- a/tdeprint/marginvaluewidget.h
+++ b/tdeprint/marginvaluewidget.h
@@ -24,7 +24,7 @@
 
 class MarginValueWidget : public KDoubleNumInput
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	enum Mode { Pixels = 0, IN, CM, MM };
 	MarginValueWidget(KNumInput *below, double value = 18.0, TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeprint/marginwidget.h b/tdeprint/marginwidget.h
index 0668beeb2..89e2e1af4 100644
--- a/tdeprint/marginwidget.h
+++ b/tdeprint/marginwidget.h
@@ -32,7 +32,7 @@ class TQComboBox;
 
 class TDEPRINT_EXPORT MarginWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	MarginWidget(TQWidget *parent = 0, const char *name = 0, bool allowMetricUnit = true);
 	~MarginWidget();
diff --git a/tdeprint/messagewindow.h b/tdeprint/messagewindow.h
index 26de652db..7c64c0c5c 100644
--- a/tdeprint/messagewindow.h
+++ b/tdeprint/messagewindow.h
@@ -29,7 +29,7 @@ class TQLabel;
 
 class TDEPRINT_EXPORT MessageWindow : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	~MessageWindow();
diff --git a/tdeprint/plugincombobox.h b/tdeprint/plugincombobox.h
index fc217667b..247a20b53 100644
--- a/tdeprint/plugincombobox.h
+++ b/tdeprint/plugincombobox.h
@@ -30,7 +30,7 @@ class TQLabel;
 
 class TDEPRINT_EXPORT PluginComboBox : public TQWidget, public KPReloadObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PluginComboBox(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/posterpreview.h b/tdeprint/posterpreview.h
index d9a23cb59..e5970dc9f 100644
--- a/tdeprint/posterpreview.h
+++ b/tdeprint/posterpreview.h
@@ -27,7 +27,7 @@ class TDEProcess;
 
 class PosterPreview : public TQFrame
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PosterPreview( TQWidget *parent = 0, const char *name = 0 );
 	PosterPreview( const TQString& postersize, const TQString& mediasize, TQWidget *parent = 0, const char *name = 0 );
diff --git a/tdeprint/rlpr/kmwrlpr.h b/tdeprint/rlpr/kmwrlpr.h
index dc375303d..916390471 100644
--- a/tdeprint/rlpr/kmwrlpr.h
+++ b/tdeprint/rlpr/kmwrlpr.h
@@ -28,7 +28,7 @@ class TQListViewItem;
 
 class KMWRlpr : public KMWizardPage
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KMWRlpr(TQWidget *parent = 0, const char *name = 0);
 
diff --git a/tdeprint/tdefilelist.h b/tdeprint/tdefilelist.h
index 912abd07a..0c36657ba 100644
--- a/tdeprint/tdefilelist.h
+++ b/tdeprint/tdefilelist.h
@@ -30,7 +30,7 @@ class TQListViewItem;
 
 class KFileList : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	KFileList(TQWidget *parent = 0, const char *name = 0);
 	virtual ~KFileList();
diff --git a/tdeprint/tdeprintd.h b/tdeprint/tdeprintd.h
index 4ef54b894..e8a5fe51f 100644
--- a/tdeprint/tdeprintd.h
+++ b/tdeprint/tdeprintd.h
@@ -33,7 +33,7 @@ class StatusWindow;
 
 class KDEPrintd : public KDEDModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 	K_DCOP
 
 public:
diff --git a/tdeprint/tests/drawdemo.h b/tdeprint/tests/drawdemo.h
index 963da64db..13f1df77a 100644
--- a/tdeprint/tests/drawdemo.h
+++ b/tdeprint/tests/drawdemo.h
@@ -8,7 +8,7 @@
 
 class DrawView : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     DrawView();
     ~DrawView();
diff --git a/tdeprint/tests/helpwindow.h b/tdeprint/tests/helpwindow.h
index 2ff3d3649..53a424d1b 100644
--- a/tdeprint/tests/helpwindow.h
+++ b/tdeprint/tests/helpwindow.h
@@ -22,7 +22,7 @@ class TQPopupMenu;
 
 class HelpWindow : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HelpWindow( const TQString& home_,  const TQString& path, TQWidget* parent = 0, const char *name=0 );
     ~HelpWindow();
diff --git a/tdeprint/tools/escputil/escpwidget.h b/tdeprint/tools/escputil/escpwidget.h
index 4ad284d00..21441091f 100644
--- a/tdeprint/tools/escputil/escpwidget.h
+++ b/tdeprint/tools/escputil/escpwidget.h
@@ -29,7 +29,7 @@ class TQCheckBox;
 
 class EscpWidget : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	EscpWidget(TQWidget *parent = 0, const char *name = 0);
diff --git a/tderandr/ktimerdialog.h b/tderandr/ktimerdialog.h
index 965a72393..0d844a27f 100644
--- a/tderandr/ktimerdialog.h
+++ b/tderandr/ktimerdialog.h
@@ -44,7 +44,7 @@ class TQLabel;
  */
 class KTimerDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/tderandr/randr.h b/tderandr/randr.h
index ee00b2065..5c2115791 100644
--- a/tderandr/randr.h
+++ b/tderandr/randr.h
@@ -100,7 +100,7 @@ class TDERANDR_EXPORT SingleScreenData {
 
 class RandRScreen : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	enum orientations {
diff --git a/tderesources/configdialog.h b/tderesources/configdialog.h
index 94f5ab107..37b1bf166 100644
--- a/tderesources/configdialog.h
+++ b/tderesources/configdialog.h
@@ -34,7 +34,7 @@ namespace KRES {
 
 class TDERESOURCES_EXPORT ConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     // Resource=0: create new resource
     ConfigDialog( TQWidget *parent, const TQString& resourceFamily,
diff --git a/tderesources/configpage.h b/tderesources/configpage.h
index 789735d5e..a9bd37ada 100644
--- a/tderesources/configpage.h
+++ b/tderesources/configpage.h
@@ -51,7 +51,7 @@ class ConfigViewItem;
 
 class TDERESOURCES_EXPORT ConfigPage : public TQWidget, public ManagerObserver<Resource>
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     ConfigPage( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tderesources/configwidget.h b/tderesources/configwidget.h
index a9d20aa8b..e8014090d 100644
--- a/tderesources/configwidget.h
+++ b/tderesources/configwidget.h
@@ -32,7 +32,7 @@ namespace KRES {
 
 class TDERESOURCES_EXPORT ConfigWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     ConfigWidget( TQWidget *parent = 0, const char *name = 0 );
 
diff --git a/tderesources/kcmtderesources.h b/tderesources/kcmtderesources.h
index 4c6b99214..75a2b92c0 100644
--- a/tderesources/kcmtderesources.h
+++ b/tderesources/kcmtderesources.h
@@ -26,7 +26,7 @@
 
 class TDERESOURCES_EXPORT KCMTDEResources : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KCMTDEResources( TQWidget *parent, const char *name, const TQStringList& );
diff --git a/tderesources/resource.h b/tderesources/resource.h
index 5c05ea4e0..3c5383799 100644
--- a/tderesources/resource.h
+++ b/tderesources/resource.h
@@ -128,7 +128,7 @@ extern "C"
 
 class ResourceExampleConfig : public KRES::ResourceConfigWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
   public:
     ResourceExampleConfig( TQWidget *parent = 0, const char *name = 0 );
 
@@ -257,7 +257,7 @@ class TDERESOURCES_EXPORT Resource : public TQObject
     friend class Factory;
     friend class ManagerImpl;
 
-    Q_OBJECT
+    TQ_OBJECT
   public:
     typedef TQValueList<Resource *> List;
 
diff --git a/tdersync/rsyncconfigdialog.h b/tdersync/rsyncconfigdialog.h
index 2ce05b8db..1427866f2 100644
--- a/tdersync/rsyncconfigdialog.h
+++ b/tdersync/rsyncconfigdialog.h
@@ -37,7 +37,7 @@
 
 class RsyncConfigDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
   
 
     public:
diff --git a/tdersync/tdersync.h b/tdersync/tdersync.h
index 54d3090ed..25bcb8e01 100644
--- a/tdersync/tdersync.h
+++ b/tdersync/tdersync.h
@@ -84,7 +84,7 @@ namespace KParts
 
 class KRsync : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdespell2/backgroundchecker.h b/tdespell2/backgroundchecker.h
index 84deea5c8..6f9163b26 100644
--- a/tdespell2/backgroundchecker.h
+++ b/tdespell2/backgroundchecker.h
@@ -48,7 +48,7 @@ namespace KSpell2
      */
     class KDE_EXPORT BackgroundChecker : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         BackgroundChecker( const Broker::Ptr& broker, TQObject *parent =0,
                            const char *name =0 );
diff --git a/tdespell2/backgroundengine.h b/tdespell2/backgroundengine.h
index 9ddbe7289..365d3ebbf 100644
--- a/tdespell2/backgroundengine.h
+++ b/tdespell2/backgroundengine.h
@@ -33,7 +33,7 @@ namespace KSpell2
     class Dictionary;
     class BackgroundEngine : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         BackgroundEngine( TQObject *parent );
         ~BackgroundEngine();
diff --git a/tdespell2/broker.h b/tdespell2/broker.h
index f4029c487..2ccc63635 100644
--- a/tdespell2/broker.h
+++ b/tdespell2/broker.h
@@ -47,7 +47,7 @@ namespace KSpell2
     class KDE_EXPORT Broker : public TQObject,
                    public TDEShared
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         typedef TDESharedPtr<Broker> Ptr;
         /**
diff --git a/tdespell2/client.h b/tdespell2/client.h
index 07f6fce6e..c115b3847 100644
--- a/tdespell2/client.h
+++ b/tdespell2/client.h
@@ -39,7 +39,7 @@ namespace KSpell2
      */
     class KDE_EXPORT Client : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Client( TQObject *parent = 0, const char *name=0 );
 
diff --git a/tdespell2/defaultdictionary.h b/tdespell2/defaultdictionary.h
index 1a0090751..f3ee83339 100644
--- a/tdespell2/defaultdictionary.h
+++ b/tdespell2/defaultdictionary.h
@@ -32,7 +32,7 @@ namespace KSpell2
     class DefaultDictionary : public TQObject,
                               public Dictionary
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         DefaultDictionary( const TQString& lang, Broker *broker );
         ~DefaultDictionary();
diff --git a/tdespell2/plugins/aspell/tdespell_aspellclient.h b/tdespell2/plugins/aspell/tdespell_aspellclient.h
index 1384b0242..9a71bfa69 100644
--- a/tdespell2/plugins/aspell/tdespell_aspellclient.h
+++ b/tdespell2/plugins/aspell/tdespell_aspellclient.h
@@ -33,7 +33,7 @@ using KSpell2::Dictionary;
 
 class ASpellClient : public KSpell2::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ASpellClient( TQObject *parent, const char *name, const TQStringList & /* args */  );
     ~ASpellClient();
diff --git a/tdespell2/plugins/hspell/tdespell_hspellclient.h b/tdespell2/plugins/hspell/tdespell_hspellclient.h
index 00a89749e..a18928900 100644
--- a/tdespell2/plugins/hspell/tdespell_hspellclient.h
+++ b/tdespell2/plugins/hspell/tdespell_hspellclient.h
@@ -37,7 +37,7 @@ using KSpell2::Dictionary;
 
 class HSpellClient : public KSpell2::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     HSpellClient( TQObject *parent, const char *name, const TQStringList & /* args */  );
     ~HSpellClient();
diff --git a/tdespell2/plugins/ispell/tdespell_ispellclient.h b/tdespell2/plugins/ispell/tdespell_ispellclient.h
index 7deee7de8..b15453bd3 100644
--- a/tdespell2/plugins/ispell/tdespell_ispellclient.h
+++ b/tdespell2/plugins/ispell/tdespell_ispellclient.h
@@ -33,7 +33,7 @@ using KSpell2::Dictionary;
 
 class ISpellClient : public KSpell2::Client
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ISpellClient( TQObject *parent, const char *name, const TQStringList & /* args */  );
     ~ISpellClient();
diff --git a/tdespell2/tests/backgroundtest.h b/tdespell2/tests/backgroundtest.h
index 2f08e9ce0..1fb16fd60 100644
--- a/tdespell2/tests/backgroundtest.h
+++ b/tdespell2/tests/backgroundtest.h
@@ -28,7 +28,7 @@
 
 class BackgroundTest : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     BackgroundTest();
 
diff --git a/tdespell2/tests/test_dialog.h b/tdespell2/tests/test_dialog.h
index e8a6cf970..924c1281b 100644
--- a/tdespell2/tests/test_dialog.h
+++ b/tdespell2/tests/test_dialog.h
@@ -28,7 +28,7 @@
 
 class TestDialog : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TestDialog();
 
diff --git a/tdespell2/ui/configdialog.h b/tdespell2/ui/configdialog.h
index 43a785490..4147c2f84 100644
--- a/tdespell2/ui/configdialog.h
+++ b/tdespell2/ui/configdialog.h
@@ -28,7 +28,7 @@ namespace KSpell2
     class Broker;
     class ConfigDialog : public KDialogBase
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         ConfigDialog( Broker *broker,
                       TQWidget *parent );
diff --git a/tdespell2/ui/configwidget.h b/tdespell2/ui/configwidget.h
index 2f65ed20e..071e83272 100644
--- a/tdespell2/ui/configwidget.h
+++ b/tdespell2/ui/configwidget.h
@@ -29,7 +29,7 @@ namespace KSpell2
     class Broker;
     class KDE_EXPORT ConfigWidget : public TQWidget
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         ConfigWidget( Broker *broker, TQWidget *parent, const char *name =0 );
         ~ConfigWidget();
diff --git a/tdespell2/ui/dialog.h b/tdespell2/ui/dialog.h
index d07ddacce..a531408bf 100644
--- a/tdespell2/ui/dialog.h
+++ b/tdespell2/ui/dialog.h
@@ -29,7 +29,7 @@ namespace KSpell2
     class BackgroundChecker;
     class KDE_EXPORT Dialog : public KDialogBase
     {
-        Q_OBJECT
+        TQ_OBJECT
     public:
         Dialog( BackgroundChecker *checker,
                 TQWidget *parent, const char *name=0 );
diff --git a/tdestyles/asteroid/asteroid.h b/tdestyles/asteroid/asteroid.h
index d6be130aa..b5d7e5a6e 100644
--- a/tdestyles/asteroid/asteroid.h
+++ b/tdestyles/asteroid/asteroid.h
@@ -11,7 +11,7 @@
 
 class AsteroidStyle : public TDEStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 	
 public:
 	AsteroidStyle();
diff --git a/tdestyles/highcolor/highcolor.h b/tdestyles/highcolor/highcolor.h
index d8b7251db..93e2658dd 100644
--- a/tdestyles/highcolor/highcolor.h
+++ b/tdestyles/highcolor/highcolor.h
@@ -57,7 +57,7 @@ class TQPopupMenu;
 
 class HighColorStyle : public TDEStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		enum StyleType { HighColor = 0, Default, B3 };
diff --git a/tdestyles/highcontrast/config/highcontrastconfig.h b/tdestyles/highcontrast/config/highcontrastconfig.h
index d52a22b47..0f0a5ca09 100644
--- a/tdestyles/highcontrast/config/highcontrastconfig.h
+++ b/tdestyles/highcontrast/config/highcontrastconfig.h
@@ -31,7 +31,7 @@ class TQCheckBox;
 
 class HighContrastStyleConfig: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	HighContrastStyleConfig(TQWidget* parent);
 	~HighContrastStyleConfig();
diff --git a/tdestyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h
index 30d498b96..905a35ea4 100644
--- a/tdestyles/highcontrast/highcontrast.h
+++ b/tdestyles/highcontrast/highcontrast.h
@@ -48,7 +48,7 @@ class TQPopupMenu;
 
 class HighContrastStyle : public TDEStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		HighContrastStyle();
diff --git a/tdestyles/keramik/keramik.h b/tdestyles/keramik/keramik.h
index 3792027e3..6b0cf42ab 100644
--- a/tdestyles/keramik/keramik.h
+++ b/tdestyles/keramik/keramik.h
@@ -41,7 +41,7 @@ class TQProgressBar;
 
 class KeramikStyle : public TDEStyle
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	KeramikStyle();
diff --git a/tdestyles/klegacy/klegacystyle.h b/tdestyles/klegacy/klegacystyle.h
index f82fd5d0a..3bb50ae6e 100644
--- a/tdestyles/klegacy/klegacystyle.h
+++ b/tdestyles/klegacy/klegacystyle.h
@@ -32,7 +32,7 @@ class KLegacyStylePrivate;
 
 
 class Q_EXPORT KLegacyStyle : public TDEStyle {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KLegacyStyle(void);
     virtual ~KLegacyStyle(void);
diff --git a/tdestyles/kthemestyle/kthemebase.h b/tdestyles/kthemestyle/kthemebase.h
index 01ecab138..12b2e7908 100644
--- a/tdestyles/kthemestyle/kthemebase.h
+++ b/tdestyles/kthemestyle/kthemebase.h
@@ -122,7 +122,7 @@ inline bool KThemePixmap::isOld()
  */
 class KThemeCache : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * The scale hints supported by the cache. Note that Tiled is not here
@@ -213,7 +213,7 @@ class KThemeBasePrivate;
  */
 class KThemeBase: public TDEStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a new KThemeBase object.
diff --git a/tdestyles/kthemestyle/kthemestyle.h b/tdestyles/kthemestyle/kthemestyle.h
index ca112ed14..8bb82c8e7 100644
--- a/tdestyles/kthemestyle/kthemestyle.h
+++ b/tdestyles/kthemestyle/kthemestyle.h
@@ -67,7 +67,7 @@ Copyright (C) 2000 Daniel M. Duley   <mosfet@kde.org>
 
 class KThemeStyle: public KThemeBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a new KThemeStyle object.
diff --git a/tdestyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h
index 90b3e89c9..9460d53fb 100644
--- a/tdestyles/light/lightstyle-v2.h
+++ b/tdestyles/light/lightstyle-v2.h
@@ -36,7 +36,7 @@
 
 class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     LightStyleV2();
diff --git a/tdestyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h
index 0330c8f87..345b30144 100644
--- a/tdestyles/light/lightstyle-v3.h
+++ b/tdestyles/light/lightstyle-v3.h
@@ -39,7 +39,7 @@
 
 class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQStyle *basestyle;
 
 public:
diff --git a/tdestyles/plastik/config/plastikconf.h b/tdestyles/plastik/config/plastikconf.h
index 512ad6f2e..6973a0d0b 100644
--- a/tdestyles/plastik/config/plastikconf.h
+++ b/tdestyles/plastik/config/plastikconf.h
@@ -31,7 +31,7 @@ class TQCheckBox;
 
 class PlastikStyleConfig: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	PlastikStyleConfig(TQWidget* parent);
 	~PlastikStyleConfig();
diff --git a/tdestyles/plastik/plastik.h b/tdestyles/plastik/plastik.h
index 68f707d79..d25888e15 100644
--- a/tdestyles/plastik/plastik.h
+++ b/tdestyles/plastik/plastik.h
@@ -56,7 +56,7 @@ class TQTimer;
 
 class PlastikStyle : public TDEStyle
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     PlastikStyle();
diff --git a/tdeui/kaboutdialog_private.h b/tdeui/kaboutdialog_private.h
index 7a6245a81..057e8a6c1 100644
--- a/tdeui/kaboutdialog_private.h
+++ b/tdeui/kaboutdialog_private.h
@@ -34,7 +34,7 @@ class TQVBoxLayout;
  */
 class KImageTrackLabel : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum MouseMode
@@ -68,7 +68,7 @@ class TDEAboutContainerBasePrivate;
  */
 class TDEAboutContainerBase : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum LayoutType
diff --git a/tdeui/kactivelabel.h b/tdeui/kactivelabel.h
index 5832a4fa1..9f49dd05c 100644
--- a/tdeui/kactivelabel.h
+++ b/tdeui/kactivelabel.h
@@ -36,7 +36,7 @@ class KActiveLabelPrivate;
   */
 class TDEUI_EXPORT KActiveLabel : public TQTextBrowser
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructor.
diff --git a/tdeui/kanimwidget.h b/tdeui/kanimwidget.h
index 77abf837a..046522d01 100644
--- a/tdeui/kanimwidget.h
+++ b/tdeui/kanimwidget.h
@@ -54,7 +54,7 @@ class KAnimWidgetPrivate;
  */
 class TDEUI_EXPORT KAnimWidget : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int size READ size WRITE setSize )
   TQ_PROPERTY( TQString icons READ icons WRITE setIcons )
 
diff --git a/tdeui/karrowbutton.h b/tdeui/karrowbutton.h
index c490c8aab..7634ea4ce 100644
--- a/tdeui/karrowbutton.h
+++ b/tdeui/karrowbutton.h
@@ -37,7 +37,7 @@ class KArrowButtonPrivate;
  */
 class TDEUI_EXPORT KArrowButton : public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 	TQ_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp )
 
 	public:
diff --git a/tdeui/kauthicon.h b/tdeui/kauthicon.h
index 3aad21dba..697182483 100644
--- a/tdeui/kauthicon.h
+++ b/tdeui/kauthicon.h
@@ -46,7 +46,7 @@ class KAuthIconPrivate;
  */
 class TDEUI_EXPORT KAuthIcon : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -102,7 +102,7 @@ class KRootPermsIconPrivate;
  */
 class TDEUI_EXPORT KRootPermsIcon : public KAuthIcon
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   KRootPermsIcon(TQWidget *parent = 0, const char *name = 0);
@@ -134,7 +134,7 @@ class KWritePermsIconPrivate;
  */
 class TDEUI_EXPORT KWritePermsIcon : public KAuthIcon
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
 
 public:
diff --git a/tdeui/kbugreport.h b/tdeui/kbugreport.h
index 3110d3dd6..3720f7031 100644
--- a/tdeui/kbugreport.h
+++ b/tdeui/kbugreport.h
@@ -42,7 +42,7 @@ class KBugReportPrivate;
  */
 class TDEUI_EXPORT KBugReport : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Creates a bug-report dialog.
diff --git a/tdeui/kbuttonbox.h b/tdeui/kbuttonbox.h
index 6044bdb53..4fd9e7ddb 100644
--- a/tdeui/kbuttonbox.h
+++ b/tdeui/kbuttonbox.h
@@ -41,7 +41,7 @@ class KButtonBoxPrivate;
 
 class TDEUI_EXPORT KButtonBox : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/kcharselect.h b/tdeui/kcharselect.h
index a434154f0..4db7056f5 100644
--- a/tdeui/kcharselect.h
+++ b/tdeui/kcharselect.h
@@ -50,7 +50,7 @@ class KCharSelectPrivate;
 
 class TDEUI_EXPORT KCharSelectTable : public TQGridView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCharSelectTable( TQWidget *parent, const char *name, const TQString &_font,
@@ -139,7 +139,7 @@ private:
 
 class TDEUI_EXPORT KCharSelect : public TQVBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString fontFamily READ font WRITE setFont )
     TQ_PROPERTY( int tableNum READ tableNum WRITE setTableNum )
     TQ_PROPERTY( bool fontComboEnabled READ isFontComboEnabled WRITE enableFontCombo )
diff --git a/tdeui/kcmenumngr.h b/tdeui/kcmenumngr.h
index f59ec8286..4483fae92 100644
--- a/tdeui/kcmenumngr.h
+++ b/tdeui/kcmenumngr.h
@@ -77,7 +77,7 @@ the position of the micro focus hint of the widget ( TQWidget::microFocusHint()
 
 class TDEUI_EXPORT KContextMenuManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/tdeui/kcolorbutton.h b/tdeui/kcolorbutton.h
index a9ca78ea8..d2ccc61b9 100644
--- a/tdeui/kcolorbutton.h
+++ b/tdeui/kcolorbutton.h
@@ -36,7 +36,7 @@ class KColorButtonPrivate;
 */
 class TDEUI_EXPORT KColorButton : public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQColor color READ color WRITE setColor )
     TQ_PROPERTY( TQColor defaultColor READ defaultColor WRITE setDefaultColor )
 
diff --git a/tdeui/kcolorcombo.h b/tdeui/kcolorcombo.h
index bade8efcb..084537441 100644
--- a/tdeui/kcolorcombo.h
+++ b/tdeui/kcolorcombo.h
@@ -38,7 +38,7 @@ class KColorComboInternal;
  */
 class TDEUI_EXPORT KColorCombo : public TQComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQColor color READ color WRITE setColor )
 
 public:
diff --git a/tdeui/kcolordialog.h b/tdeui/kcolordialog.h
index e580ad582..248a582b9 100644
--- a/tdeui/kcolordialog.h
+++ b/tdeui/kcolordialog.h
@@ -57,7 +57,7 @@ class KColorCells;
 */
 class TDEUI_EXPORT KHSSelector : public KXYSelector
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -101,7 +101,7 @@ class KValueSelectorPrivate;
  */
 class TDEUI_EXPORT KValueSelector : public TDESelector
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -197,7 +197,7 @@ private:
  **/
 class TDEUI_EXPORT KPaletteTable : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KPaletteTable( TQWidget *parent, int minWidth=210, int cols = 16);
   ~KPaletteTable();
@@ -252,7 +252,7 @@ private:
 */
 class TDEUI_EXPORT KColorCells : public TQGridView
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KColorCells( TQWidget *parent, int rows, int cols );
   ~KColorCells();
@@ -310,7 +310,7 @@ private:
  */
 class TDEUI_EXPORT KColorPatch : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KColorPatch( TQWidget *parent );
   virtual ~KColorPatch();
@@ -376,7 +376,7 @@ private:
  **/
 class TDEUI_EXPORT KColorDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeui/kcolordrag.h b/tdeui/kcolordrag.h
index 289938b00..7c46faf2d 100644
--- a/tdeui/kcolordrag.h
+++ b/tdeui/kcolordrag.h
@@ -34,7 +34,7 @@ class KColorDragPrivate;
  * See the Qt drag'n'drop documentation.
  */
 class TDEUI_EXPORT KColorDrag : public TQStoredDrag {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h
index e0c2e2704..542dce2e5 100644
--- a/tdeui/kcombobox.h
+++ b/tdeui/kcombobox.h
@@ -150,7 +150,7 @@ class KURL;
  */
 class TDEUI_EXPORT KComboBox : public TQComboBox, public TDECompletionBase
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion )
   TQ_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled )
   TQ_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled )
@@ -539,7 +539,7 @@ class KPixmapProvider;
  */
 class TDEUI_EXPORT KHistoryCombo : public KComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQStringList historyItems READ historyItems WRITE setHistoryItems )
 
 public:
@@ -798,7 +798,7 @@ private:
 
 class TDEUI_EXPORT KHistoryComboEditor : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KHistoryComboEditor( const TQStringList& entries, TQWidget *parent = 0L );
diff --git a/tdeui/kcommand.h b/tdeui/kcommand.h
index e27e5178b..f043afe00 100644
--- a/tdeui/kcommand.h
+++ b/tdeui/kcommand.h
@@ -154,7 +154,7 @@ protected:
  * to the name of the command.
  */
 class TDEUI_EXPORT KCommandHistory : public TQObject {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Creates a command history, to store commands.
diff --git a/tdeui/kcursor_private.h b/tdeui/kcursor_private.h
index 0ed1789e6..999280f74 100644
--- a/tdeui/kcursor_private.h
+++ b/tdeui/kcursor_private.h
@@ -38,7 +38,7 @@ class TQWidget;
 */
 class KCursorPrivateAutoHideEventFilter : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KCursorPrivateAutoHideEventFilter( TQWidget* widget );
@@ -71,7 +71,7 @@ private:
 class KCursorPrivate : public TQObject
 {
     friend class KCursor; // to shut up the compiler
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     static KCursorPrivate *self();
diff --git a/tdeui/kdatepicker.h b/tdeui/kdatepicker.h
index 4e13f860e..32455144d 100644
--- a/tdeui/kdatepicker.h
+++ b/tdeui/kdatepicker.h
@@ -50,7 +50,7 @@ class KDateTable;
  **/
 class TDEUI_EXPORT KDatePicker: public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQDate date READ date WRITE setDate)
   TQ_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton )
   TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
diff --git a/tdeui/kdatetbl.h b/tdeui/kdatetbl.h
index 4bc1444ca..d40099abf 100644
--- a/tdeui/kdatetbl.h
+++ b/tdeui/kdatetbl.h
@@ -39,7 +39,7 @@ class TDEPopupMenu;
 */
 class TDEUI_EXPORT KDateInternalWeekSelector : public TQLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   TQIntValidator *val;
   int result;
@@ -66,7 +66,7 @@ private:
 */
 class TDEUI_EXPORT KDateInternalMonthPicker : public TQGridView
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   /**
    * Store the month that has been clicked [1..12].
@@ -139,7 +139,7 @@ private:
 */
 class TDEUI_EXPORT KDateInternalYearSelector : public TQLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   TQIntValidator *val;
   int result;
@@ -165,7 +165,7 @@ private:
  */
 class TDEUI_EXPORT TDEPopupFrame : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   /**
    * The result. It is returned from exec() when the popup window closes.
@@ -262,7 +262,7 @@ public:
  */
 class TDEUI_EXPORT KDateTable : public TQGridView
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQDate date READ getDate WRITE setDate )
     TQ_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnabled )
 
diff --git a/tdeui/kdatetimewidget.h b/tdeui/kdatetimewidget.h
index 26c3cf670..d2b0b4e31 100644
--- a/tdeui/kdatetimewidget.h
+++ b/tdeui/kdatetimewidget.h
@@ -39,7 +39,7 @@
  */
 class TDEUI_EXPORT KDateTimeWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime )
 
 public:
diff --git a/tdeui/kdatewidget.h b/tdeui/kdatewidget.h
index c89b382c1..3f68dc0da 100644
--- a/tdeui/kdatewidget.h
+++ b/tdeui/kdatewidget.h
@@ -35,7 +35,7 @@
 */
 class TDEUI_EXPORT KDateWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQDate date READ date WRITE setDate )
 
 public:
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.h b/tdeui/kdetrayproxy/kdetrayproxy.h
index 9331aad5c..2231be9ab 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.h
+++ b/tdeui/kdetrayproxy/kdetrayproxy.h
@@ -28,7 +28,7 @@
 class KDETrayProxy
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KDETrayProxy();
     public slots:
diff --git a/tdeui/kdetrayproxy/module.h b/tdeui/kdetrayproxy/module.h
index 67ed1a29d..5ce759eb4 100644
--- a/tdeui/kdetrayproxy/module.h
+++ b/tdeui/kdetrayproxy/module.h
@@ -28,7 +28,7 @@
 class KDETrayModule
     : public KDEDModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     public:
         KDETrayModule( const TQCString& obj );
diff --git a/tdeui/kdialog.h b/tdeui/kdialog.h
index ad48693fe..1e19ca365 100644
--- a/tdeui/kdialog.h
+++ b/tdeui/kdialog.h
@@ -51,7 +51,7 @@ class TQLayoutItem;
  */
 class TDEUI_EXPORT KDialog : public TQDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
@@ -188,7 +188,7 @@ class TDEUI_EXPORT KDialog : public TQDialog
 class KDialogQueuePrivate;
 class TDEUI_EXPORT KDialogQueue : public TQObject
 {
-      Q_OBJECT
+      TQ_OBJECT
 
 public:
 
@@ -217,7 +217,7 @@ protected:
   */
 class TDEUI_EXPORT KSMModalDialogHeader : public TQWidget
 {
-      Q_OBJECT
+      TQ_OBJECT
 
 public:
       KSMModalDialogHeader( TQWidget* parent );
@@ -240,7 +240,7 @@ class TQFrame;
 class TQGridLayout;
 class TDEUI_EXPORT KSMModalDialog : public TQWidget
 {
-      Q_OBJECT
+      TQ_OBJECT
 
 public:
       KSMModalDialog( TQWidget* parent );
diff --git a/tdeui/kdialogbase.h b/tdeui/kdialogbase.h
index 1bc910fd6..969d1c3e2 100644
--- a/tdeui/kdialogbase.h
+++ b/tdeui/kdialogbase.h
@@ -190,7 +190,7 @@ class KDialogBaseTile;
  */
 class TDEUI_EXPORT KDialogBase : public KDialog
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
 
diff --git a/tdeui/kdialogbase_priv.h b/tdeui/kdialogbase_priv.h
index 84db3b84f..59cef2f25 100644
--- a/tdeui/kdialogbase_priv.h
+++ b/tdeui/kdialogbase_priv.h
@@ -30,7 +30,7 @@
  */
 class TDEUI_EXPORT KDialogBaseButton : public KPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KDialogBaseButton( const KGuiItem &text, int key, TQWidget *parent=0,
@@ -47,7 +47,7 @@ class TDEUI_EXPORT KDialogBaseButton : public KPushButton
  */
 class TDEUI_EXPORT KDialogBaseTile : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     KDialogBaseTile( TQObject *parent=0, const char *name=0 );
diff --git a/tdeui/kdockwidget.h b/tdeui/kdockwidget.h
index e6c9bae1a..298794732 100644
--- a/tdeui/kdockwidget.h
+++ b/tdeui/kdockwidget.h
@@ -102,7 +102,7 @@ namespace KMDI
  */
 class TDEUI_EXPORT KDockWidgetAbstractHeader : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
@@ -152,7 +152,7 @@ private:
  */
 class TDEUI_EXPORT KDockWidgetAbstractHeaderDrag : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
@@ -198,7 +198,7 @@ private:
  */
 class TDEUI_EXPORT KDockWidgetHeaderDrag : public KDockWidgetAbstractHeaderDrag
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
@@ -240,7 +240,7 @@ private:
  */
 class TDEUI_EXPORT KDockWidgetHeader : public KDockWidgetAbstractHeader
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
 
@@ -366,7 +366,7 @@ private:
  */
 class TDEUI_EXPORT KDockTabGroup : public TQTabWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
   /**
@@ -427,7 +427,7 @@ private:
  */
 class TDEUI_EXPORT KDockWidget: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 friend class KDockManager;
 friend class KDockSplitter;
@@ -914,7 +914,7 @@ private:
  */
 class TDEUI_EXPORT KDockManager: public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 friend class KDockWidget;
 friend class KDockMainWindow;
@@ -1313,7 +1313,7 @@ private:
  */
 class TDEUI_EXPORT KDockMainWindow : public TDEMainWindow
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 friend class KDockManager;
@@ -1484,7 +1484,7 @@ private:
 
 class TDEUI_EXPORT KDockArea : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 friend class KDockManager;
diff --git a/tdeui/kdockwidget_private.h b/tdeui/kdockwidget_private.h
index a72532e3d..739286e5f 100644
--- a/tdeui/kdockwidget_private.h
+++ b/tdeui/kdockwidget_private.h
@@ -47,7 +47,7 @@ class TDEUI_EXPORT KDockSplitter : public TQWidget
   // which copies the whole definition of the class to be able to access separatorPosInPercent etc. 
   // This needs real fixing in KDE4.
   
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor.
@@ -247,7 +247,7 @@ private:
 */
 class TDEUI_EXPORT KDockButton_Private : public TQPushButton
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDockButton_Private( TQWidget *parent=0, const char *name=0 );
   ~KDockButton_Private();
@@ -272,7 +272,7 @@ private:
 */
 class KDockWidgetPrivate : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KDockWidgetPrivate();
   ~KDockWidgetPrivate();
diff --git a/tdeui/kdockwindow.h b/tdeui/kdockwindow.h
index 4b7a34049..851502488 100644
--- a/tdeui/kdockwindow.h
+++ b/tdeui/kdockwindow.h
@@ -31,7 +31,7 @@
  */
 class KDE_DEPRECATED KDockWindow : public KSystemTray
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KDockWindow( TQWidget* parent = 0, const char* name  = 0 )
 	: KSystemTray( parent, name ) {}
diff --git a/tdeui/kdualcolorbutton.h b/tdeui/kdualcolorbutton.h
index 2495750f8..15e04d39d 100644
--- a/tdeui/kdualcolorbutton.h
+++ b/tdeui/kdualcolorbutton.h
@@ -47,7 +47,7 @@ class TQBitmap;
  */
 class TDEUI_EXPORT KDualColorButton : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_ENUMS( DualColor )
     TQ_PROPERTY( TQColor foreground READ foreground WRITE setForeground )
     TQ_PROPERTY( TQColor background READ background WRITE setBackground )
diff --git a/tdeui/keditcl.h b/tdeui/keditcl.h
index aefd3df81..8862d8ce0 100644
--- a/tdeui/keditcl.h
+++ b/tdeui/keditcl.h
@@ -36,7 +36,7 @@ class TQVButtonGroup;
 
 class TDEUI_EXPORT KEdGotoLine : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KEdGotoLine( TQWidget *parent=0, const char *name=0, bool modal=true );
@@ -58,7 +58,7 @@ private:
 ///
 class TDEUI_EXPORT KEdFind : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( TQString text READ getText WRITE setText )
     TQ_PROPERTY( bool caseSensitivity READ case_sensitive WRITE setCaseSensitive )
     TQ_PROPERTY( bool direction READ get_direction WRITE setDirection )
@@ -108,7 +108,7 @@ private:
 ///
 class TDEUI_EXPORT KEdReplace : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -170,7 +170,7 @@ private:
 
 class TDEUI_EXPORT_DEPRECATED KEdit : public TQMultiLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/keditlistbox.h b/tdeui/keditlistbox.h
index c6930128b..0a986b93e 100644
--- a/tdeui/keditlistbox.h
+++ b/tdeui/keditlistbox.h
@@ -43,7 +43,7 @@ class KEditListBoxPrivate;
  */
 class TDEUI_EXPORT KEditListBox : public TQGroupBox
 {
-   Q_OBJECT
+   TQ_OBJECT
    
 
    TQ_SETS( Button )
diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h
index 8afe67352..b980b3cb4 100644
--- a/tdeui/kedittoolbar.h
+++ b/tdeui/kedittoolbar.h
@@ -108,7 +108,7 @@ namespace KEditToolbarInternal
  */
 class TDEUI_EXPORT KEditToolbar : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
   /**
    * Constructor for apps that do not use components.
@@ -268,7 +268,7 @@ private:
  */
 class TDEUI_EXPORT KEditToolbarWidget : public TQWidget, virtual public KXMLGUIClient
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Constructor.  This is the only entry point to this class.  You
diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h
index 25e118b5b..b2fbba759 100644
--- a/tdeui/khelpmenu.h
+++ b/tdeui/khelpmenu.h
@@ -130,7 +130,7 @@ class KHelpMenuPrivate;
 
 class TDEUI_EXPORT KHelpMenu : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     enum MenuId
diff --git a/tdeui/kiconview.h b/tdeui/kiconview.h
index 8c0cd5a24..f29bf61d4 100644
--- a/tdeui/kiconview.h
+++ b/tdeui/kiconview.h
@@ -42,7 +42,7 @@
 class TDEUI_EXPORT TDEIconView : public TQIconView
 {
   friend class TDEIconViewItem;
-  Q_OBJECT
+  TQ_OBJECT
   TQ_ENUMS( Mode )
   TQ_PROPERTY( Mode mode READ mode WRITE setMode )
 
diff --git a/tdeui/kiconviewsearchline.h b/tdeui/kiconviewsearchline.h
index cef09b3ea..3988a7c9b 100644
--- a/tdeui/kiconviewsearchline.h
+++ b/tdeui/kiconviewsearchline.h
@@ -37,7 +37,7 @@ class TQIconViewItem;
  */
 class TDEUI_EXPORT TDEIconViewSearchLine : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeui/kinputdialog.h b/tdeui/kinputdialog.h
index d1e148d9a..6fad6b54e 100644
--- a/tdeui/kinputdialog.h
+++ b/tdeui/kinputdialog.h
@@ -47,7 +47,7 @@ class KInputDialogPrivate;
  */
 class TDEUI_EXPORT KInputDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   private:
 
diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp
index 7330fa6e8..03e375b6a 100644
--- a/tdeui/kjanuswidget.cpp
+++ b/tdeui/kjanuswidget.cpp
@@ -726,7 +726,7 @@ void KJanusWidget::slotItemClicked(TQListViewItem *it)
     it->setOpen(!it->isOpen());
 }
 
-// hack because qt does not support Q_OBJECT in nested classes
+// hack because qt does not support TQ_OBJECT in nested classes
 void KJanusWidget::slotOnItem(TQListBoxItem *qitem)
 {
   mIconList->slotOnItem( qitem );
@@ -1017,7 +1017,7 @@ void KJanusWidget::IconListBox::leaveEvent( TQEvent *ev )
   }
 } 
 
-// hack because qt does not support Q_OBJECT in nested classes
+// hack because qt does not support TQ_OBJECT in nested classes
 void KJanusWidget::IconListBox::slotOnItem(TQListBoxItem *qitem)
 {
   TDEListBox::slotOnItem( qitem );
diff --git a/tdeui/kjanuswidget.h b/tdeui/kjanuswidget.h
index 604765029..1bc8ed332 100644
--- a/tdeui/kjanuswidget.h
+++ b/tdeui/kjanuswidget.h
@@ -66,7 +66,7 @@ class KGuiItem;
  */
 class TDEUI_EXPORT KJanusWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   private:
     class IconListBox : public TDEListBox
diff --git a/tdeui/kkeybutton.h b/tdeui/kkeybutton.h
index 889319884..03b551679 100644
--- a/tdeui/kkeybutton.h
+++ b/tdeui/kkeybutton.h
@@ -39,7 +39,7 @@
  */
 class TDEUI_EXPORT KKeyButton: public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 
  public:
 	/**
diff --git a/tdeui/kkeydialog.h b/tdeui/kkeydialog.h
index af395682e..bbfa07f59 100644
--- a/tdeui/kkeydialog.h
+++ b/tdeui/kkeydialog.h
@@ -57,7 +57,7 @@ class KKeyChooserItem;
  */
 class TDEUI_EXPORT KKeyChooser : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
  public:
 	enum ActionType { Application, ApplicationGlobal, Standard, Global };
 
@@ -273,7 +273,7 @@ typedef KKeyChooser KKeyChooser;
  */
 class TDEUI_EXPORT KKeyDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	/**
diff --git a/tdeui/klanguagebutton.h b/tdeui/klanguagebutton.h
index e13ad9566..c6bb122c5 100644
--- a/tdeui/klanguagebutton.h
+++ b/tdeui/klanguagebutton.h
@@ -46,7 +46,7 @@ class TQPopupMenu;
  */
 class TDEUI_EXPORT KLanguageButton : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/kled.h b/tdeui/kled.h
index 7307be06a..4fe8a7287 100644
--- a/tdeui/kled.h
+++ b/tdeui/kled.h
@@ -44,7 +44,7 @@ class TQColor;
  */
 class TDEUI_EXPORT KLed : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_ENUMS( State Shape Look )
     TQ_PROPERTY( State state READ state WRITE setState )
     TQ_PROPERTY( Shape shape READ shape WRITE setShape )
diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h
index 82179fa05..98168313a 100644
--- a/tdeui/klineedit.h
+++ b/tdeui/klineedit.h
@@ -146,7 +146,7 @@ class TDEUI_EXPORT KLineEdit : public TQLineEdit, public TDECompletionBase
 {
     friend class KComboBox;
 
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE setContextMenuEnabled )
     TQ_PROPERTY( bool urlDropsEnabled READ isURLDropsEnabled WRITE setURLDropsEnabled )
     TQ_PROPERTY( bool trapEnterKeyEvent READ trapReturnKey WRITE setTrapReturnKey )
diff --git a/tdeui/klineeditdlg.h b/tdeui/klineeditdlg.h
index efa4b4a4a..e0b609dcd 100644
--- a/tdeui/klineeditdlg.h
+++ b/tdeui/klineeditdlg.h
@@ -39,7 +39,7 @@ class TQValidator;
 
 class TDEUI_EXPORT_DEPRECATED KLineEditDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   /**
    * Create a dialog that asks for a single line of text. _value is
diff --git a/tdeui/knuminput.h b/tdeui/knuminput.h
index 4716d8051..8712d2bf4 100644
--- a/tdeui/knuminput.h
+++ b/tdeui/knuminput.h
@@ -48,7 +48,7 @@ class KIntSpinBox;
  */
 class TDEUI_EXPORT KNumInput : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( TQString label READ label WRITE setLabel )
 public:
@@ -187,7 +187,7 @@ private:
 
 class TDEUI_EXPORT KIntNumInput : public KNumInput
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( int value READ value WRITE setValue )
     TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
@@ -433,7 +433,7 @@ class KDoubleLine;
 
 class TDEUI_EXPORT KDoubleNumInput : public KNumInput
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( double value READ value WRITE setValue )
     TQ_PROPERTY( double minValue READ minValue WRITE setMinValue )
@@ -706,7 +706,7 @@ private:
  */
 class TDEUI_EXPORT KIntSpinBox : public TQSpinBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( int base READ base WRITE setBase )
 
@@ -836,7 +836,7 @@ private:
 **/
 
 class TDEUI_EXPORT KDoubleSpinBox : public TQSpinBox {
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
   TQ_OVERRIDE( double maxValue READ maxValue WRITE setMaxValue )
diff --git a/tdeui/knumvalidator.h b/tdeui/knumvalidator.h
index 5c7b31484..fd42a0fa6 100644
--- a/tdeui/knumvalidator.h
+++ b/tdeui/knumvalidator.h
@@ -179,7 +179,7 @@ class TDEUI_EXPORT KFloatValidator : public TQValidator {
 **/
 
 class TDEUI_EXPORT KDoubleValidator : public TQDoubleValidator {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool acceptLocalizedNumbers READ acceptLocalizedNumbers WRITE setAcceptLocalizedNumbers )
 public:
   /** Constuct a locale-aware KDoubleValidator with default range
diff --git a/tdeui/kpanelapplet.h b/tdeui/kpanelapplet.h
index a8729e331..df3bca44b 100644
--- a/tdeui/kpanelapplet.h
+++ b/tdeui/kpanelapplet.h
@@ -96,7 +96,7 @@ class TQPopupMenu;
  **/
 class TDEUI_EXPORT KPanelApplet : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeui/kpanelappmenu.h b/tdeui/kpanelappmenu.h
index 56131e290..39b6b8e4e 100644
--- a/tdeui/kpanelappmenu.h
+++ b/tdeui/kpanelappmenu.h
@@ -36,7 +36,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 class TDEUI_EXPORT KPanelAppMenu : public TQObject, public DCOPObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Constructs a new menu with the given title.
diff --git a/tdeui/kpanelextension.h b/tdeui/kpanelextension.h
index f97e85482..2c817ae39 100644
--- a/tdeui/kpanelextension.h
+++ b/tdeui/kpanelextension.h
@@ -96,7 +96,7 @@ class KPanelExtensionPrivate;
  **/
 class TDEUI_EXPORT KPanelExtension : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeui/kpanelmenu.h b/tdeui/kpanelmenu.h
index 03b700b82..972fb2bc1 100644
--- a/tdeui/kpanelmenu.h
+++ b/tdeui/kpanelmenu.h
@@ -52,7 +52,7 @@ class KPanelMenuPrivate;
  */
 class TDEUI_EXPORT KPanelMenu : public TDEPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/kpassdlg.h b/tdeui/kpassdlg.h
index 9272e63c3..039f1c506 100644
--- a/tdeui/kpassdlg.h
+++ b/tdeui/kpassdlg.h
@@ -38,7 +38,7 @@ class TQWidget;
 class TDEUI_EXPORT KPasswordEdit
     : public TQLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     enum EchoModes { OneStar, ThreeStars, NoEcho };
@@ -150,7 +150,7 @@ private:
 class TDEUI_EXPORT KPasswordDialog
     : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/kpassivepopup.h b/tdeui/kpassivepopup.h
index 89a05a671..bc1b9ed1c 100644
--- a/tdeui/kpassivepopup.h
+++ b/tdeui/kpassivepopup.h
@@ -65,7 +65,7 @@ class TQVBox;
  */
 class TDEUI_EXPORT KPassivePopup : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY (bool autoDelete READ autoDelete WRITE setAutoDelete )
     TQ_PROPERTY (int timeout READ timeout WRITE setTimeout )
 
diff --git a/tdeui/kpixmapregionselectorwidget.h b/tdeui/kpixmapregionselectorwidget.h
index 0277a0d10..7d6f37b99 100644
--- a/tdeui/kpixmapregionselectorwidget.h
+++ b/tdeui/kpixmapregionselectorwidget.h
@@ -43,7 +43,7 @@ class TDEPopupMenu;
  */
 class TDEUI_EXPORT KPixmapRegionSelectorWidget : public TQWidget
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
    /**
     * Constructor for a KPixmapRegionSelectorWidget.
diff --git a/tdeui/kprogress.h b/tdeui/kprogress.h
index 49dce88c0..ada1f4fc0 100644
--- a/tdeui/kprogress.h
+++ b/tdeui/kprogress.h
@@ -45,7 +45,7 @@
  */
 class TDEUI_EXPORT KProgress : public TQProgressBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
@@ -186,7 +186,7 @@ private:
  */
 class TDEUI_EXPORT KProgressDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdeui/kprogressbox.h b/tdeui/kprogressbox.h
index 448b37abe..5d9f3bd8b 100644
--- a/tdeui/kprogressbox.h
+++ b/tdeui/kprogressbox.h
@@ -53,7 +53,7 @@
  */
 class TDEUI_EXPORT KProgressBoxDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
         /**
diff --git a/tdeui/kpushbutton.h b/tdeui/kpushbutton.h
index ee7bb3b52..44f174da9 100644
--- a/tdeui/kpushbutton.h
+++ b/tdeui/kpushbutton.h
@@ -36,7 +36,7 @@ class TQDragObject;
  */
 class TDEUI_EXPORT KPushButton : public TQPushButton
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY(int stdItem READ guiItm WRITE setGuiItm )
     TQ_PROPERTY(bool isDragEnabled READ isDragEnabled WRITE setDragEnabled)
 
diff --git a/tdeui/krestrictedline.h b/tdeui/krestrictedline.h
index 142bd5444..c343ffb55 100644
--- a/tdeui/krestrictedline.h
+++ b/tdeui/krestrictedline.h
@@ -43,7 +43,7 @@
  */
 class TDEUI_EXPORT KRestrictedLine : public KLineEdit
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQString validChars READ validChars WRITE setValidChars )
 
 public:
diff --git a/tdeui/krootpixmap.h b/tdeui/krootpixmap.h
index 5f279be6d..fd882372b 100644
--- a/tdeui/krootpixmap.h
+++ b/tdeui/krootpixmap.h
@@ -45,7 +45,7 @@ class KRootPixmapData;
  */
 class TDEUI_EXPORT KRootPixmap: public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/kruler.h b/tdeui/kruler.h
index 2ad699b5e..c962fd947 100644
--- a/tdeui/kruler.h
+++ b/tdeui/kruler.h
@@ -69,7 +69,7 @@
  */
 class TDEUI_EXPORT KRuler : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
   TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
   TQ_PROPERTY( int value READ value WRITE setValue )
diff --git a/tdeui/ksconfig.h b/tdeui/ksconfig.h
index b0ca46fd9..21ce54013 100644
--- a/tdeui/ksconfig.h
+++ b/tdeui/ksconfig.h
@@ -86,7 +86,7 @@ enum KSpellClients {
 
 class TDEUI_EXPORT KSpellConfig : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     /**
diff --git a/tdeui/kscrollview.h b/tdeui/kscrollview.h
index 315ea1c81..2f96b047d 100644
--- a/tdeui/kscrollview.h
+++ b/tdeui/kscrollview.h
@@ -29,7 +29,7 @@
  **/
 class TDEUI_EXPORT KScrollView : public TQScrollView
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
     KScrollView( TQWidget *parent = 0, const char *name = 0, Qt::WFlags f = 0 );
diff --git a/tdeui/kseparator.h b/tdeui/kseparator.h
index f21c4c99b..908a0d57a 100644
--- a/tdeui/kseparator.h
+++ b/tdeui/kseparator.h
@@ -32,7 +32,7 @@
 */
 class TDEUI_EXPORT KSeparator : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int orientation READ orientation WRITE setOrientation )
  public:
   /**
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index 29b7821ff..5645184f4 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -57,7 +57,7 @@ class TDEUI_EXPORT TDESharedPixmap:
     public TQWidget,
     public KPixmap
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/tdeui/ksplashscreen.h b/tdeui/ksplashscreen.h
index f4d1c22ef..9980cc203 100644
--- a/tdeui/ksplashscreen.h
+++ b/tdeui/ksplashscreen.h
@@ -40,7 +40,7 @@ class TQPixmap;
  */
 class TDEUI_EXPORT KSplashScreen : public TQSplashScreen
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeui/ksqueezedtextlabel.h b/tdeui/ksqueezedtextlabel.h
index 586c9b27b..2dfa70bec 100644
--- a/tdeui/ksqueezedtextlabel.h
+++ b/tdeui/ksqueezedtextlabel.h
@@ -44,7 +44,7 @@
  * QLabel
  */
 class TDEUI_EXPORT KSqueezedTextLabel : public TQLabel {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/kstatusbar.h b/tdeui/kstatusbar.h
index 2c7574a79..cbf305d83 100644
--- a/tdeui/kstatusbar.h
+++ b/tdeui/kstatusbar.h
@@ -34,7 +34,7 @@ class KStatusBar;
  */
 class TDEUI_EXPORT KStatusBarLabel : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -86,7 +86,7 @@ signals:
  */
 class TDEUI_EXPORT KStatusBar : public TQStatusBar
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/kstringvalidator.h b/tdeui/kstringvalidator.h
index b23bc87bd..55c00a3ab 100644
--- a/tdeui/kstringvalidator.h
+++ b/tdeui/kstringvalidator.h
@@ -58,7 +58,7 @@
  * @author Marc Mutz <mutz@kde.org>
  **/
 class TDEUI_EXPORT KStringListValidator : public TQValidator {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQStringList stringList READ stringList WRITE setStringList )
   TQ_PROPERTY( bool rejecting READ isRejecting WRITE setRejecting )
   TQ_PROPERTY( bool fixupEnabled READ isFixupEnabled WRITE setFixupEnabled )
@@ -118,7 +118,7 @@ private:
  **/
 class TDEUI_EXPORT KMimeTypeValidator : public TQValidator
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   KMimeTypeValidator( TQObject* parent, const char* name=0)
     : TQValidator( parent, name ) {}
diff --git a/tdeui/kswitchlanguagedialog.h b/tdeui/kswitchlanguagedialog.h
index 9e0a3ff87..64ffe171c 100644
--- a/tdeui/kswitchlanguagedialog.h
+++ b/tdeui/kswitchlanguagedialog.h
@@ -37,7 +37,7 @@ class KSwitchLanguageDialogPrivate;
 
 class TDEUI_EXPORT KSwitchLanguageDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
         /**
diff --git a/tdeui/ksyntaxhighlighter.h b/tdeui/ksyntaxhighlighter.h
index 6ac4264ab..45ad7da36 100644
--- a/tdeui/ksyntaxhighlighter.h
+++ b/tdeui/ksyntaxhighlighter.h
@@ -93,7 +93,7 @@ private:
  */
 class TDEUI_EXPORT KDictSpellingHighlighter : public TQObject, public KSpellingHighlighter
 {
-Q_OBJECT
+TQ_OBJECT
 
 public:
     KDictSpellingHighlighter( TQTextEdit *textEdit,
diff --git a/tdeui/ksystemtray.h b/tdeui/ksystemtray.h
index f7e81c9b1..5c66dc143 100644
--- a/tdeui/ksystemtray.h
+++ b/tdeui/ksystemtray.h
@@ -62,7 +62,7 @@ class KSystemTrayPrivate;
  **/
 class TDEUI_EXPORT KSystemTray : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     /**
diff --git a/tdeui/ktabbar.h b/tdeui/ktabbar.h
index c5ea25c6d..e31454253 100644
--- a/tdeui/ktabbar.h
+++ b/tdeui/ktabbar.h
@@ -34,7 +34,7 @@ class KTabBarPrivate;
  */
 class TDEUI_EXPORT KTabBar: public TQTabBar
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KTabBar( TQWidget* parent=0, const char* name=0 );
diff --git a/tdeui/ktabctl.h b/tdeui/ktabctl.h
index 28de4805b..dcd7756e9 100644
--- a/tdeui/ktabctl.h
+++ b/tdeui/ktabctl.h
@@ -47,7 +47,7 @@
 */
 class TDEUI_EXPORT KTabCtl : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KTabCtl(TQWidget *parent = 0, const char *name = 0);
diff --git a/tdeui/ktabwidget.h b/tdeui/ktabwidget.h
index d0a75b38b..b552229c9 100644
--- a/tdeui/ktabwidget.h
+++ b/tdeui/ktabwidget.h
@@ -35,7 +35,7 @@ class KTabWidgetPrivate;
  */
 class TDEUI_EXPORT KTabWidget : public TQTabWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
     TQ_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverCloseButton )
     TQ_PROPERTY( bool hoverCloseButtonDelayed READ hoverCloseButtonDelayed WRITE setHoverCloseButtonDelayed )
diff --git a/tdeui/ktextbrowser.h b/tdeui/ktextbrowser.h
index 0d6885329..eb79078c9 100644
--- a/tdeui/ktextbrowser.h
+++ b/tdeui/ktextbrowser.h
@@ -41,7 +41,7 @@
 
 class TDEUI_EXPORT KTextBrowser : public TQTextBrowser
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( bool notifyClick READ isNotifyClick WRITE setNotifyClick )
 
   public:
diff --git a/tdeui/ktextedit.h b/tdeui/ktextedit.h
index 930409b04..8ba6f382f 100644
--- a/tdeui/ktextedit.h
+++ b/tdeui/ktextedit.h
@@ -42,7 +42,7 @@ class KSpell;
  */
 class TDEUI_EXPORT KTextEdit : public TQTextEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/ktimewidget.h b/tdeui/ktimewidget.h
index 9ac6923f3..5d170434b 100644
--- a/tdeui/ktimewidget.h
+++ b/tdeui/ktimewidget.h
@@ -36,7 +36,7 @@
  */
 class TDEUI_EXPORT KTimeWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQTime time READ time WRITE setTime )
 
 public:
diff --git a/tdeui/ktimezonewidget.h b/tdeui/ktimezonewidget.h
index 70d63521e..ff044460c 100644
--- a/tdeui/ktimezonewidget.h
+++ b/tdeui/ktimezonewidget.h
@@ -59,7 +59,7 @@ class KTimezoneWidgetPrivate;
 class TDEUI_EXPORT KTimezoneWidget :
     public TDEListView
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/ktip.h b/tdeui/ktip.h
index a506902bf..b6fe3c0b6 100644
--- a/tdeui/ktip.h
+++ b/tdeui/ktip.h
@@ -107,7 +107,7 @@ private:
  */
 class TDEUI_EXPORT KTipDialog : public KDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     /**
      * Construct a tip dialog.
diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h
index c35d3156b..c3d1eb259 100644
--- a/tdeui/kurllabel.h
+++ b/tdeui/kurllabel.h
@@ -70,7 +70,7 @@ class TQPixmap;
  */
 class TDEUI_EXPORT KURLLabel : public TQLabel
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY (TQString url READ url WRITE setURL)
   TQ_PROPERTY (TQString tipText READ tipText WRITE setTipText )
   TQ_PROPERTY (TQPixmap altPixmap READ altPixmap WRITE setAltPixmap)
diff --git a/tdeui/kwhatsthismanager_p.h b/tdeui/kwhatsthismanager_p.h
index 084c83641..ddc7c0e86 100644
--- a/tdeui/kwhatsthismanager_p.h
+++ b/tdeui/kwhatsthismanager_p.h
@@ -45,7 +45,7 @@ class TQTextEdit;
  **/
 class TDEUI_EXPORT KWhatsThisManager : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         static void init ();
         bool eventFilter (TQObject *o, TQEvent *e);
diff --git a/tdeui/kwizard.h b/tdeui/kwizard.h
index 56995a2e0..4fafd5933 100644
--- a/tdeui/kwizard.h
+++ b/tdeui/kwizard.h
@@ -45,7 +45,7 @@
 */
 class TDEUI_EXPORT KWizard : public TQWizard
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
 /**
 * Constructor
diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h
index ae726dd9c..b6b91ed47 100644
--- a/tdeui/kxmlguifactory.h
+++ b/tdeui/kxmlguifactory.h
@@ -61,7 +61,7 @@ class BuildHelper;
 class TDEUI_EXPORT KXMLGUIFactory : public TQObject
 {
   friend class KXMLGUI::BuildHelper;
-  Q_OBJECT
+  TQ_OBJECT
  public:
   /**
    * Constructs a KXMLGUIFactory. The provided @p builder KXMLGUIBuilder will be called
diff --git a/tdeui/qxembed.h b/tdeui/qxembed.h
index 5c409fd51..d97961674 100644
--- a/tdeui/qxembed.h
+++ b/tdeui/qxembed.h
@@ -61,7 +61,7 @@ class QXEmbedData;
 */
 class TDEUI_EXPORT QXEmbed : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp
index d0ab3dc3d..f403feb88 100644
--- a/tdeui/tdeaboutdialog.cpp
+++ b/tdeui/tdeaboutdialog.cpp
@@ -938,7 +938,7 @@ void TDEAboutContainer::addImage( const TQString &fileName, int alignment )
 class TDEAboutContributor : public QFrame
 {
   // ############################################################################
-  Q_OBJECT
+  TQ_OBJECT
   // ----------------------------------------------------------------------------
 public:
   /** The Qt constructor. */
diff --git a/tdeui/tdeaboutdialog.h b/tdeui/tdeaboutdialog.h
index 0ebb89174..d637a64b7 100644
--- a/tdeui/tdeaboutdialog.h
+++ b/tdeui/tdeaboutdialog.h
@@ -49,7 +49,7 @@ class TDEAboutContainerPrivate;
  */
 class TDEUI_EXPORT TDEAboutContainer : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TDEAboutContainer( TQWidget *parent=0, const char *name=0,
@@ -91,7 +91,7 @@ class TDEAboutContributorPrivate;
  */
 class TDEUI_EXPORT TDEAboutContributor : public TQFrame
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
     TDEAboutContributor( TQWidget *parent=0, const char *name=0,
@@ -149,7 +149,7 @@ class TDEUI_EXPORT TDEAboutContributor : public TQFrame
  */
 class TDEUI_EXPORT TDEAboutWidget : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
@@ -282,7 +282,7 @@ class TDEAboutDialogPrivate;
  */
 class TDEUI_EXPORT TDEAboutDialog : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   public:
   /**
diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h
index cc803022f..355675e87 100644
--- a/tdeui/tdeaction.h
+++ b/tdeui/tdeaction.h
@@ -202,7 +202,7 @@ class TDEMainWindow;
 class TDEUI_EXPORT TDEAction : public TQObject
 {
   friend class TDEActionCollection;
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int containerCount READ containerCount )
   TQ_PROPERTY( TQString plainText READ plainText )
   TQ_PROPERTY( TQString text READ text WRITE setText )
diff --git a/tdeui/tdeactionclasses.h b/tdeui/tdeactionclasses.h
index 86594f179..b865ccab5 100644
--- a/tdeui/tdeactionclasses.h
+++ b/tdeui/tdeactionclasses.h
@@ -67,7 +67,7 @@ class TDEMainWindow;
  */
 class TDEUI_EXPORT TDEToggleAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( bool checked READ isChecked WRITE setChecked )
     TQ_PROPERTY( TQString exclusiveGroup READ exclusiveGroup WRITE setExclusiveGroup )
@@ -230,7 +230,7 @@ private:
  */
 class TDEUI_EXPORT TDERadioAction : public TDEToggleAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 public:
     /**
@@ -330,7 +330,7 @@ private:
  */
 class TDEUI_EXPORT TDESelectAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem )
     TQ_PROPERTY( TQStringList items READ items WRITE setItems )
@@ -583,7 +583,7 @@ private:
  */
 class TDEUI_EXPORT_DEPRECATED TDEListAction : public TDESelectAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -699,7 +699,7 @@ private:
  */
 class TDEUI_EXPORT TDERecentFilesAction : public TDEListAction  // TODO public TDESelectAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_PROPERTY( uint maxItems READ maxItems WRITE setMaxItems )
 public:
@@ -909,7 +909,7 @@ private:
 
 class TDEUI_EXPORT TDEFontAction : public TDESelectAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( TQString font READ font WRITE setFont )
 public:
@@ -960,7 +960,7 @@ private:
 
 class TDEUI_EXPORT TDEFontSizeAction : public TDESelectAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
 public:
@@ -1019,7 +1019,7 @@ private:
  */
 class TDEUI_EXPORT TDEActionMenu : public TDEAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed )
   TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
@@ -1093,7 +1093,7 @@ private:
  */
 class TDEUI_EXPORT TDEToolBarPopupAction : public TDEAction
 {
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_PROPERTY( bool delayed READ delayed WRITE setDelayed )
   TQ_PROPERTY( bool stickyMenu READ stickyMenu WRITE setStickyMenu )
@@ -1216,7 +1216,7 @@ private:
  */
 class TDEUI_EXPORT TDEToggleToolBarAction : public TDEToggleAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -1263,7 +1263,7 @@ private:
  */
 class TDEUI_EXPORT TDEToggleFullScreenAction : public TDEToggleAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -1308,7 +1308,7 @@ private:
  */
 class TDEUI_EXPORT KWidgetAction : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
@@ -1353,7 +1353,7 @@ private:
 
 class TDEUI_EXPORT TDEActionSeparator : public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     TDEActionSeparator( TQObject* parent = 0, const char* name = 0 );
@@ -1380,7 +1380,7 @@ private:
  */
 class TDEUI_EXPORT TDEPasteTextAction: public TDEAction
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
diff --git a/tdeui/tdeactioncollection.h b/tdeui/tdeactioncollection.h
index ae6fd6575..c48bb5e2d 100644
--- a/tdeui/tdeactioncollection.h
+++ b/tdeui/tdeactioncollection.h
@@ -80,7 +80,7 @@ class TDEUI_EXPORT TDEActionCollection : public TQObject
   friend class TDEAction;
   friend class KXMLGUIClient;
 
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   TDEActionCollection( TQWidget *parent, const char *name = 0, TDEInstance *instance = 0 );
diff --git a/tdeui/tdeactionselector.h b/tdeui/tdeactionselector.h
index 6aeaac3d8..d9ee62873 100644
--- a/tdeui/tdeactionselector.h
+++ b/tdeui/tdeactionselector.h
@@ -77,7 +77,7 @@ class TDEActionSelectorPrivate;
 */
 
 class TDEUI_EXPORT TDEActionSelector : public TQWidget {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_ENUMS( ButtonIconSize InsertionPolicy )
   TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick )
   TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled )
diff --git a/tdeui/tdecmodule.h b/tdeui/tdecmodule.h
index 186ee6656..920769d33 100644
--- a/tdeui/tdecmodule.h
+++ b/tdeui/tdecmodule.h
@@ -68,7 +68,7 @@ class TDEInstance;
  */
 class TDEUI_EXPORT TDECModule : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeui/tdecompletionbox.h b/tdeui/tdecompletionbox.h
index b804411b1..e3f74e819 100644
--- a/tdeui/tdecompletionbox.h
+++ b/tdeui/tdecompletionbox.h
@@ -42,7 +42,7 @@ class TQEvent;
  */
 class TDEUI_EXPORT TDECompletionBox : public TDEListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY( bool isTabHandling READ isTabHandling WRITE setTabHandling )
     TQ_PROPERTY(TQString cancelledText READ cancelledText WRITE setCancelledText)
     TQ_PROPERTY( bool activateOnSelect READ activateOnSelect WRITE setActivateOnSelect )
diff --git a/tdeui/tdeconfigdialog.h b/tdeui/tdeconfigdialog.h
index 3eeed5b6f..67a22b698 100644
--- a/tdeui/tdeconfigdialog.h
+++ b/tdeui/tdeconfigdialog.h
@@ -70,7 +70,7 @@ class TDEConfigDialogManager;
  * @since 3.2
  */
 class TDEUI_EXPORT TDEConfigDialog : public KDialogBase {
-Q_OBJECT
+TQ_OBJECT
 
 signals:
   /**
diff --git a/tdeui/tdefontcombo.h b/tdeui/tdefontcombo.h
index 308b7e047..2ddf7f638 100644
--- a/tdeui/tdefontcombo.h
+++ b/tdeui/tdefontcombo.h
@@ -34,7 +34,7 @@
  */
 class TDEUI_EXPORT TDEFontCombo : public KComboBox
 {
-    Q_OBJECT
+    TQ_OBJECT
     TQ_PROPERTY(TQString family READ currentFont WRITE setCurrentFont)
     TQ_PROPERTY(bool bold READ bold WRITE setBold DESIGNABLE true)
     TQ_PROPERTY(bool italic READ italic WRITE setItalic DESIGNABLE true)
diff --git a/tdeui/tdefontdialog.h b/tdeui/tdefontdialog.h
index de966d47d..0946c1b6e 100644
--- a/tdeui/tdefontdialog.h
+++ b/tdeui/tdefontdialog.h
@@ -53,7 +53,7 @@ class KIntNumInput;
  */
 class TDEUI_EXPORT TDEFontChooser : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( TQFont font READ font WRITE setFont )
 
 public:
@@ -347,7 +347,7 @@ private:
  * @version $Id$
  */
 class TDEUI_EXPORT TDEFontDialog : public KDialogBase  {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/tdefontrequester.h b/tdeui/tdefontrequester.h
index 9d324545a..ef0a17c59 100644
--- a/tdeui/tdefontrequester.h
+++ b/tdeui/tdefontrequester.h
@@ -43,7 +43,7 @@ class TQPushButton;
  */
 class TDEUI_EXPORT TDEFontRequester : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   TQ_PROPERTY( TQString title READ title WRITE setTitle )
   TQ_PROPERTY( TQString sampleText READ sampleText WRITE setSampleText )
diff --git a/tdeui/tdelistbox.h b/tdeui/tdelistbox.h
index e7666af32..591349320 100644
--- a/tdeui/tdelistbox.h
+++ b/tdeui/tdelistbox.h
@@ -39,7 +39,7 @@
  **/
 class TDEUI_EXPORT TDEListBox : public TQListBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
   TDEListBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
diff --git a/tdeui/tdelistview.h b/tdeui/tdelistview.h
index 6b02b6891..c07d040e4 100644
--- a/tdeui/tdelistview.h
+++ b/tdeui/tdelistview.h
@@ -85,7 +85,7 @@ class TDEUI_EXPORT TDEListView : public TQListView
 {
   friend class TDEListViewItem;
 
-  Q_OBJECT
+  TQ_OBJECT
   
   TQ_ENUMS( SelectionModeExt )
   TQ_PROPERTY( bool fullWidth READ fullWidth WRITE setFullWidth )
diff --git a/tdeui/tdelistviewlineedit.h b/tdeui/tdelistviewlineedit.h
index 0a87394ab..b7c166096 100644
--- a/tdeui/tdelistviewlineedit.h
+++ b/tdeui/tdelistviewlineedit.h
@@ -28,7 +28,7 @@
  **/
 class TDEUI_EXPORT TDEListViewLineEdit : public KLineEdit
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 	TDEListViewLineEdit(TDEListView *parent);
 	~TDEListViewLineEdit();
diff --git a/tdeui/tdelistviewsearchline.h b/tdeui/tdelistviewsearchline.h
index cf02c492c..aeac7d668 100644
--- a/tdeui/tdelistviewsearchline.h
+++ b/tdeui/tdelistviewsearchline.h
@@ -46,7 +46,7 @@ class TQToolButton;
 
 class TDEUI_EXPORT TDEListViewSearchLine : public KLineEdit
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
@@ -218,7 +218,7 @@ private:
  */
 class TDEUI_EXPORT TDEListViewSearchLineWidget : public TQHBox
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h
index 856590ab9..cca8e64ac 100644
--- a/tdeui/tdemainwindow.h
+++ b/tdeui/tdemainwindow.h
@@ -98,7 +98,7 @@ class DCOPObject;
 class TDEUI_EXPORT TDEMainWindow : public TQMainWindow, public KXMLGUIBuilder, virtual public KXMLGUIClient
 {
     friend class KMWSessionManaged;
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/tdemenubar.h b/tdeui/tdemenubar.h
index 18ee3bf90..d7f8e1780 100644
--- a/tdeui/tdemenubar.h
+++ b/tdeui/tdemenubar.h
@@ -41,7 +41,7 @@
 
 class TDEUI_EXPORT KMenuBar : public TQMenuBar
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeui/tdepassivepopupstack.h b/tdeui/tdepassivepopupstack.h
index 61ef209e1..13ac29f44 100644
--- a/tdeui/tdepassivepopupstack.h
+++ b/tdeui/tdepassivepopupstack.h
@@ -32,7 +32,7 @@ typedef TQMap<KPassivePopup*, TQString> TQStringPopupIDMap;
 
 class TDEUI_EXPORT TDEPassivePopupStackContainer : public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDEPassivePopupStackContainer(TQWidget *parent=0, const char *name=0);
diff --git a/tdeui/tdepopupmenu.h b/tdeui/tdepopupmenu.h
index 7f84a5fc5..1a03ad11b 100644
--- a/tdeui/tdepopupmenu.h
+++ b/tdeui/tdepopupmenu.h
@@ -37,7 +37,7 @@
  */
 class TDEUI_EXPORT TDEPopupTitle : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
@@ -121,7 +121,7 @@ private:
  * @author Hamish Rodda <rodda@kde.org>
  */
 class TDEUI_EXPORT TDEPopupMenu : public TQPopupMenu {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     /**
diff --git a/tdeui/tdeselect.h b/tdeui/tdeselect.h
index 19321da1b..748b5897a 100644
--- a/tdeui/tdeselect.h
+++ b/tdeui/tdeselect.h
@@ -42,7 +42,7 @@
  */
 class TDEUI_EXPORT KXYSelector : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int xValue READ xValue WRITE setXValue )
   TQ_PROPERTY( int yValue READ yValue WRITE setYValue )
   
@@ -158,7 +158,7 @@ private:
  */
 class TDEUI_EXPORT TDESelector : public TQWidget, public TQRangeControl
 {
-  Q_OBJECT
+  TQ_OBJECT
   TQ_PROPERTY( int value READ value WRITE setValue )
   TQ_PROPERTY( int minValue READ minValue WRITE setMinValue )
   TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue )
@@ -292,7 +292,7 @@ private:
  **/
 class TDEUI_EXPORT KGradientSelector : public TDESelector
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   TQ_PROPERTY( TQColor firstColor READ firstColor WRITE setFirstColor )
   TQ_PROPERTY( TQColor secondColor READ secondColor WRITE setSecondColor )
diff --git a/tdeui/tdeshortcutdialog.h b/tdeui/tdeshortcutdialog.h
index afad6fda2..f041783a8 100644
--- a/tdeui/tdeshortcutdialog.h
+++ b/tdeui/tdeshortcutdialog.h
@@ -40,7 +40,7 @@ class TDEShortcutDialogAdvanced;
  */
 class TDEUI_EXPORT TDEShortcutDialog : public KDialogBase
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShortcut, TQWidget* parent = 0, const char* name = 0 );
 	~TDEShortcutDialog();
diff --git a/tdeui/tdespell.h b/tdeui/tdespell.h
index f09571004..802c5567b 100644
--- a/tdeui/tdespell.h
+++ b/tdeui/tdespell.h
@@ -45,7 +45,7 @@ class KSpellDlg;
 
 class TDEUI_EXPORT KSpell : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
 
diff --git a/tdeui/tdespelldlg.h b/tdeui/tdespelldlg.h
index c4731800f..565464c4e 100644
--- a/tdeui/tdespelldlg.h
+++ b/tdeui/tdespelldlg.h
@@ -45,7 +45,7 @@ enum KS_RESULT {
 
 class TDEUI_EXPORT KSpellDlg : public KDialogBase
 {
-  Q_OBJECT
+  TQ_OBJECT
 
   class KSpellDlgPrivate;
   KSpellDlgPrivate *d;
diff --git a/tdeui/tdetoolbar.h b/tdeui/tdetoolbar.h
index f59d78174..cf3a162df 100644
--- a/tdeui/tdetoolbar.h
+++ b/tdeui/tdetoolbar.h
@@ -57,7 +57,7 @@ class TDEToolBarPrivate;
 
 class TDEUI_EXPORT TDEToolBarSeparator : public TQFrame
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 public:
     TDEToolBarSeparator( Orientation, bool l, TQToolBar *parent, const char* name=0 );
@@ -103,7 +103,7 @@ private:
 
 class TDEUI_EXPORT TDEToolBar : public TQToolBar
 {
-    Q_OBJECT
+    TQ_OBJECT
     
     TQ_ENUMS( IconText BarPosition )
     TQ_PROPERTY( IconText iconText READ iconText WRITE setIconText )
diff --git a/tdeui/tdetoolbarbutton.h b/tdeui/tdetoolbarbutton.h
index 16831b0d7..0c2d65fb4 100644
--- a/tdeui/tdetoolbarbutton.h
+++ b/tdeui/tdetoolbarbutton.h
@@ -43,7 +43,7 @@ class TQPainter;
  */
 class TDEUI_EXPORT TDEToolBarButton : public TQToolButton
 {
-  Q_OBJECT
+  TQ_OBJECT
   
 
 public:
diff --git a/tdeui/tdetoolbarhandler.h b/tdeui/tdetoolbarhandler.h
index fe25ace98..aea84b84b 100644
--- a/tdeui/tdetoolbarhandler.h
+++ b/tdeui/tdetoolbarhandler.h
@@ -33,7 +33,7 @@ namespace KDEPrivate
 class ToolBarHandler : public TQObject,
                        public KXMLGUIClient
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     ToolBarHandler( TDEMainWindow *mainWindow, const char *name = 0 );
     ToolBarHandler( TDEMainWindow *mainWindow, TQObject *parent, const char *name = 0 );
diff --git a/tdeui/tdetoolbarradiogroup.h b/tdeui/tdetoolbarradiogroup.h
index d262aa539..5df8c5a20 100644
--- a/tdeui/tdetoolbarradiogroup.h
+++ b/tdeui/tdetoolbarradiogroup.h
@@ -48,7 +48,7 @@ class TDEToolBarRadioGroupPrivate;
   */
 class TDEUI_EXPORT TDEToolBarRadioGroup : public TQObject
 {
-  Q_OBJECT
+  TQ_OBJECT
 
 public:
   /**
diff --git a/tdeui/tests/itemcontainertest.h b/tdeui/tests/itemcontainertest.h
index cb6cc3a51..bb8c7fefc 100644
--- a/tdeui/tests/itemcontainertest.h
+++ b/tdeui/tests/itemcontainertest.h
@@ -11,7 +11,7 @@ class TQLabel;
 
 class TopLevel : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TopLevel( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/kcomboboxtest.h b/tdeui/tests/kcomboboxtest.h
index 6566c9097..577b09080 100644
--- a/tdeui/tests/kcomboboxtest.h
+++ b/tdeui/tests/kcomboboxtest.h
@@ -11,7 +11,7 @@ class KComboBox;
 
 class KComboBoxTest : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
     
 public:
   KComboBoxTest ( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/kcompletiontest.h b/tdeui/tests/kcompletiontest.h
index 9443401eb..03cb6ed2a 100644
--- a/tdeui/tests/kcompletiontest.h
+++ b/tdeui/tests/kcompletiontest.h
@@ -27,7 +27,7 @@ class KLineEdit;
 
 class Form1 : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     Form1( TQWidget* parent = 0, const char* name = 0 );
diff --git a/tdeui/tests/kdesattest.h b/tdeui/tests/kdesattest.h
index 8e04c08c6..4faaa2798 100644
--- a/tdeui/tests/kdesattest.h
+++ b/tdeui/tests/kdesattest.h
@@ -13,7 +13,7 @@
 
 class KDesatWidget : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 public:
     KDesatWidget(TQWidget *parent=0, const char *name=0);
 
diff --git a/tdeui/tests/kdocktest.h b/tdeui/tests/kdocktest.h
index f23d22a35..d38ac029a 100644
--- a/tdeui/tests/kdocktest.h
+++ b/tdeui/tests/kdocktest.h
@@ -6,7 +6,7 @@
 class TQWidget;
 class DockTest : public KDockArea
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   DockTest( TQWidget* parent=0 );
 
diff --git a/tdeui/tests/kdockwidgetdemo.h b/tdeui/tests/kdockwidgetdemo.h
index b6f029cd5..f3227fb86 100644
--- a/tdeui/tests/kdockwidgetdemo.h
+++ b/tdeui/tests/kdockwidgetdemo.h
@@ -29,7 +29,7 @@ class Preview;
 class DirectoryView;
 
 class SFileDialog : public TQDialog
-{Q_OBJECT
+{TQ_OBJECT
 
 public:
 	SFileDialog( TQString initially = TQString::null,
@@ -87,7 +87,7 @@ private:
 };
 
 class DirectoryView : public TQListView
-{Q_OBJECT
+{TQ_OBJECT
 public:
   DirectoryView( TQWidget *parent = 0, const char *name = 0 );
   virtual void setOpen ( TQListViewItem *, bool );
@@ -108,7 +108,7 @@ private:
 };
 /******************************************************************************************************/
 class PixmapView : public TQScrollView
-{Q_OBJECT
+{TQ_OBJECT
 public:
   PixmapView( TQWidget *parent );
   void setPixmap( const TQPixmap &pix );
@@ -119,7 +119,7 @@ private:
 };
 
 class Preview : public TQWidgetStack
-{Q_OBJECT
+{TQ_OBJECT
 public:
   Preview( TQWidget *parent );
 
@@ -133,7 +133,7 @@ private:
 };
 
 class CustomFileDialog : public TQFileDialog
-{Q_OBJECT
+{TQ_OBJECT
 public:
   CustomFileDialog( TQWidget* parent );
   ~CustomFileDialog();
diff --git a/tdeui/tests/kdockwidgettest.h b/tdeui/tests/kdockwidgettest.h
index 4cc952857..315c23267 100644
--- a/tdeui/tests/kdockwidgettest.h
+++ b/tdeui/tests/kdockwidgettest.h
@@ -22,7 +22,7 @@
 class TQPushButton;
 
 class DockApplication : public KDockMainWindow
-{Q_OBJECT
+{TQ_OBJECT
 public:
   DockApplication( const char* name );
   ~DockApplication();
@@ -57,7 +57,7 @@ private:
 
 class CTW:public TQTabWidget,public KDockContainer
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         CTW(TQWidget *parent):TQTabWidget(parent,"MyDockContainer"),KDockContainer(){insertTab(new TQLabel("BLAH",this),"BLUP");}
         virtual ~CTW(){;}
diff --git a/tdeui/tests/kdualcolortest.h b/tdeui/tests/kdualcolortest.h
index 2c38b7af0..bfea58493 100644
--- a/tdeui/tests/kdualcolortest.h
+++ b/tdeui/tests/kdualcolortest.h
@@ -6,7 +6,7 @@
 
 class KDualColorWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KDualColorWidget(TQWidget *parent=0, const char *name=0);
 protected slots:
diff --git a/tdeui/tests/khashtest.h b/tdeui/tests/khashtest.h
index 05de5c435..ea1c161aa 100644
--- a/tdeui/tests/khashtest.h
+++ b/tdeui/tests/khashtest.h
@@ -12,7 +12,7 @@
 
 class KHashWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KHashWidget(TQWidget *parent=0, const char *name=0)
diff --git a/tdeui/tests/kledtest.h b/tdeui/tests/kledtest.h
index 5652e306e..dce5fb3a8 100644
--- a/tdeui/tests/kledtest.h
+++ b/tdeui/tests/kledtest.h
@@ -8,7 +8,7 @@
 
 class KLedTest : public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 protected:
   TQTimer timer;
   KLed *leds[/*KLed::NoOfShapes*/2* /*KLed::NoOfLooks*/3* /*KLed::NoOfStates*/2];
diff --git a/tdeui/tests/klineedittest.h b/tdeui/tests/klineedittest.h
index 6fee4dbc4..63cb1d459 100644
--- a/tdeui/tests/klineedittest.h
+++ b/tdeui/tests/klineedittest.h
@@ -11,7 +11,7 @@ class KLineEdit;
 
 class KLineEditTest : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
    KLineEditTest( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/knuminputtest.h b/tdeui/tests/knuminputtest.h
index 32a9e9098..e5d1c6d7f 100644
--- a/tdeui/tests/knuminputtest.h
+++ b/tdeui/tests/knuminputtest.h
@@ -8,7 +8,7 @@ class KDoubleNumInput;
 
 class TopLevel : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TopLevel( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/kpanelmenutest.h b/tdeui/tests/kpanelmenutest.h
index 361ae545a..f6c81eac8 100644
--- a/tdeui/tests/kpanelmenutest.h
+++ b/tdeui/tests/kpanelmenutest.h
@@ -6,7 +6,7 @@
 
 class TestWidget : public TQLabel
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TestWidget(TQWidget *parent=0, const char *name=0);
     ~TestWidget(){delete testMenu;}
diff --git a/tdeui/tests/krulertest.h b/tdeui/tests/krulertest.h
index 0175db3aa..1bcc5ade1 100644
--- a/tdeui/tests/krulertest.h
+++ b/tdeui/tests/krulertest.h
@@ -19,7 +19,7 @@ class TQGroupBox;
 
 class MouseWidget : public TQFrame
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 MouseWidget( TQWidget *parent=0, const char *name=0, WFlags f=0 );
 
@@ -42,7 +42,7 @@ private:
 
 class KRulerTest : public TDEMainWindow
 {
-Q_OBJECT
+TQ_OBJECT
 public:
 KRulerTest( const char *name = 0L );
 ~KRulerTest();
diff --git a/tdeui/tests/kstatusbartest.h b/tdeui/tests/kstatusbartest.h
index 712f24352..d61f3b422 100644
--- a/tdeui/tests/kstatusbartest.h
+++ b/tdeui/tests/kstatusbartest.h
@@ -10,7 +10,7 @@ class TQMultiLineEdit;
 
 class testWindow  : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     testWindow (TQWidget *parent=0, const char *name=0);
diff --git a/tdeui/tests/ktabctltest.h b/tdeui/tests/ktabctltest.h
index 6dd3b932a..fe327c4c1 100644
--- a/tdeui/tests/ktabctltest.h
+++ b/tdeui/tests/ktabctltest.h
@@ -12,7 +12,7 @@ class TQMultiLineEdit;
 
 class TopLevel : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
 
     TopLevel( TQWidget *parent=0, const char *name=0 );
diff --git a/tdeui/tests/ktabwidgettest.h b/tdeui/tests/ktabwidgettest.h
index 7c178bd32..eba95ef7b 100644
--- a/tdeui/tests/ktabwidgettest.h
+++ b/tdeui/tests/ktabwidgettest.h
@@ -15,7 +15,7 @@
 
 class Test : public TQVBox
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   Test( TQWidget* parent=0, const char *name =0 );
 
diff --git a/tdeui/tests/kunbalancedgrdtest.h b/tdeui/tests/kunbalancedgrdtest.h
index 8b7893772..db4c99f80 100644
--- a/tdeui/tests/kunbalancedgrdtest.h
+++ b/tdeui/tests/kunbalancedgrdtest.h
@@ -30,7 +30,7 @@ private:
 
 class myTopWidget: public TQWidget
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   myTopWidget(TQWidget *parent=0, const char *name=0);
   
diff --git a/tdeui/tests/kxmlguitest.h b/tdeui/tests/kxmlguitest.h
index bc88711f7..9d1789301 100644
--- a/tdeui/tests/kxmlguitest.h
+++ b/tdeui/tests/kxmlguitest.h
@@ -6,7 +6,7 @@
 
 class Client : public TQObject, public KXMLGUIClient
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     Client() {}
 
diff --git a/tdeui/tests/tdemainwindowrestoretest.h b/tdeui/tests/tdemainwindowrestoretest.h
index d0279cdae..5e6531dbb 100644
--- a/tdeui/tests/tdemainwindowrestoretest.h
+++ b/tdeui/tests/tdemainwindowrestoretest.h
@@ -4,42 +4,42 @@
 #include <tdemainwindow.h>
 
 class MainWin1 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin1() : TDEMainWindow() {}
   virtual ~MainWin1() {}
 };
 
 class MainWin2 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin2() : TDEMainWindow() {}
   virtual ~MainWin2() {}
 };
 
 class MainWin3 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin3() : TDEMainWindow() {}
   virtual ~MainWin3() {}
 };
 
 class MainWin4 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin4() : TDEMainWindow() {}
   virtual ~MainWin4() {}
 };
 
 class MainWin5 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin5() : TDEMainWindow() {}
   virtual ~MainWin5() {}
 };
 
 class MainWin6 : public TDEMainWindow {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MainWin6() : TDEMainWindow() {}
   virtual ~MainWin6() {}
diff --git a/tdeui/tests/tdemainwindowtest.h b/tdeui/tests/tdemainwindowtest.h
index 5512c7f9f..3bf613aaf 100644
--- a/tdeui/tests/tdemainwindowtest.h
+++ b/tdeui/tests/tdemainwindowtest.h
@@ -5,7 +5,7 @@
 
 class MainWindow : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     MainWindow();
 
diff --git a/tdeui/tests/twindowtest.h b/tdeui/tests/twindowtest.h
index d1d9d460e..12cc0f297 100644
--- a/tdeui/tests/twindowtest.h
+++ b/tdeui/tests/twindowtest.h
@@ -15,7 +15,7 @@ class KHelpMenu;
 
 class testWindow  : public TDEMainWindow
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     testWindow (TQWidget *parent=0, const char *name=0);
diff --git a/tdeui/twindowinfo.h b/tdeui/twindowinfo.h
index d15942b47..26a274aa1 100644
--- a/tdeui/twindowinfo.h
+++ b/tdeui/twindowinfo.h
@@ -38,7 +38,7 @@
 */
 class TDEUI_EXPORT KWindowInfo : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeui/twindowlistmenu.h b/tdeui/twindowlistmenu.h
index 20da236f1..e404128af 100644
--- a/tdeui/twindowlistmenu.h
+++ b/tdeui/twindowlistmenu.h
@@ -39,7 +39,7 @@ class KWindowListMenuPrivate;
 
 class TDEUI_EXPORT KWindowListMenu : public TDEPopupMenu
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     KWindowListMenu( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tdeunittest/runner.h b/tdeunittest/runner.h
index 76c662bb7..cff4ac718 100644
--- a/tdeunittest/runner.h
+++ b/tdeunittest/runner.h
@@ -96,7 +96,7 @@ namespace KUnitTest
      */
     class TDEUNITTEST_EXPORT Runner : public TQObject
     {
-        Q_OBJECT
+        TQ_OBJECT
     
     public:
         /*! Registers a test case. A registry will be automatically created if necessary.
diff --git a/tdeunittest/tester.h b/tdeunittest/tester.h
index 3f0e45acf..07d65ce56 100644
--- a/tdeunittest/tester.h
+++ b/tdeunittest/tester.h
@@ -685,7 +685,7 @@ namespace KUnitTest
      */
     class TDEUNITTEST_EXPORT SlotTester : public Tester
     {
-        Q_OBJECT
+        TQ_OBJECT
 
     public:
         SlotTester(const char *name = 0L);
diff --git a/tdeutils/kcmultidialog.h b/tdeutils/kcmultidialog.h
index 8f30603e6..89aedf0a5 100644
--- a/tdeutils/kcmultidialog.h
+++ b/tdeutils/kcmultidialog.h
@@ -42,7 +42,7 @@ class TDECModuleInfo;
  */
 class TDEUTILS_EXPORT KCMultiDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
     /**
diff --git a/tdeutils/kfind.h b/tdeutils/kfind.h
index 054eeb259..11ce20d83 100644
--- a/tdeutils/kfind.h
+++ b/tdeutils/kfind.h
@@ -103,7 +103,7 @@
 class TDEUTILS_EXPORT KFind :
     public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
     
 
 public:
diff --git a/tdeutils/kfinddialog.h b/tdeutils/kfinddialog.h
index 687939e05..0494f7861 100644
--- a/tdeutils/kfinddialog.h
+++ b/tdeutils/kfinddialog.h
@@ -74,7 +74,7 @@ class TQCheckBox;
 class TDEUTILS_EXPORT KFindDialog:
     public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeutils/kpluginselector.h b/tdeutils/kpluginselector.h
index 111abfe0d..12d484d0e 100644
--- a/tdeutils/kpluginselector.h
+++ b/tdeutils/kpluginselector.h
@@ -61,7 +61,7 @@ class TDEUTILS_EXPORT KPluginSelector : public TQWidget
 {
     friend class KPluginSelectionWidget;
 
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Create a new KPluginSelector.
diff --git a/tdeutils/kpluginselector_p.h b/tdeutils/kpluginselector_p.h
index 79a39ca94..1983a6468 100644
--- a/tdeutils/kpluginselector_p.h
+++ b/tdeutils/kpluginselector_p.h
@@ -41,7 +41,7 @@ class TDECModuleInfo;
  */
 class KPluginSelectionWidget : public TQWidget
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Create a new Plugin Selector widget.
diff --git a/tdeutils/kreplace.h b/tdeutils/kreplace.h
index e30e20b44..2ecbd3990 100644
--- a/tdeutils/kreplace.h
+++ b/tdeutils/kreplace.h
@@ -97,7 +97,7 @@ class KReplaceNextDialog;
 class TDEUTILS_EXPORT KReplace :
     public KFind
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeutils/kreplacedialog.h b/tdeutils/kreplacedialog.h
index 573a059f2..9e787730e 100644
--- a/tdeutils/kreplacedialog.h
+++ b/tdeutils/kreplacedialog.h
@@ -59,7 +59,7 @@ class TQRect;
 class TDEUTILS_EXPORT KReplaceDialog:
     public KFindDialog
 {
-    Q_OBJECT
+    TQ_OBJECT
 
 public:
 
diff --git a/tdeutils/ksettings/README.dox b/tdeutils/ksettings/README.dox
index 40d54ee3d..39e38f4a0 100644
--- a/tdeutils/ksettings/README.dox
+++ b/tdeutils/ksettings/README.dox
@@ -47,7 +47,7 @@ Every page is a KCM. This is what you need for creating a page:
 \code
 class MyAppConfig : public TDECModule
 {
-  Q_OBJECT
+  TQ_OBJECT
 public:
   MyAppConfig( QWidget *parent, const char *name = 0, const QStringList &args =
       QStringList() );
diff --git a/tdeutils/ksettings/componentsdialog.h b/tdeutils/ksettings/componentsdialog.h
index 49e5a26e9..ca6d029a9 100644
--- a/tdeutils/ksettings/componentsdialog.h
+++ b/tdeutils/ksettings/componentsdialog.h
@@ -39,7 +39,7 @@ namespace KSettings
 */
 class TDEUTILS_EXPORT ComponentsDialog : public KDialogBase
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
           Create Dialog.
diff --git a/tdeutils/ksettings/dialog.h b/tdeutils/ksettings/dialog.h
index f42558b26..7f87b861b 100644
--- a/tdeutils/ksettings/dialog.h
+++ b/tdeutils/ksettings/dialog.h
@@ -73,7 +73,7 @@ namespace KSettings
 class TDEUTILS_EXPORT Dialog : public TQObject
 {
     friend class PageNode;
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Tells the dialog whether the entries in the listview are all static
diff --git a/tdeutils/ksettings/dispatcher.h b/tdeutils/ksettings/dispatcher.h
index ec5a540b1..aa3b50c41 100644
--- a/tdeutils/ksettings/dispatcher.h
+++ b/tdeutils/ksettings/dispatcher.h
@@ -52,7 +52,7 @@ class TDEUTILS_EXPORT Dispatcher : public TQObject
 {
     friend class KStaticDeleter<Dispatcher>;
 
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Get a reference the the Dispatcher object.
diff --git a/tdeutils/ksettings/pluginpage.h b/tdeutils/ksettings/pluginpage.h
index e9a23fcd8..f3dc1c946 100644
--- a/tdeutils/ksettings/pluginpage.h
+++ b/tdeutils/ksettings/pluginpage.h
@@ -72,7 +72,7 @@ namespace KSettings
  */
 class TDEUTILS_EXPORT PluginPage : public TDECModule
 {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         /**
          * Standart TDECModule constructor. Automatically creates the the
diff --git a/tdeutils/tdecmodulecontainer.h b/tdeutils/tdecmodulecontainer.h
index 31961ab7f..4cfb2ca03 100644
--- a/tdeutils/tdecmodulecontainer.h
+++ b/tdeutils/tdecmodulecontainer.h
@@ -52,7 +52,7 @@ class TDECModuleProxy;
  */
 class TDEUTILS_EXPORT TDECModuleContainer : public TDECModule
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		/**
 		 * Creates a TDECModuleContainer with tabs, each one containing one of the
diff --git a/tdeutils/tdecmoduleproxy.h b/tdeutils/tdecmoduleproxy.h
index 11bbca987..1aa337a23 100644
--- a/tdeutils/tdecmoduleproxy.h
+++ b/tdeutils/tdecmoduleproxy.h
@@ -67,7 +67,7 @@ class TDEProcess;
  */
 class TDEUTILS_EXPORT TDECModuleProxy : public TQWidget
 {
-Q_OBJECT
+TQ_OBJECT
 
 
 	friend class TDECModuleProxyRootCommunicatorImpl;
diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.h b/tdeutils/tdecmoduleproxyIfaceImpl.h
index a8a80f23b..ca77a966e 100644
--- a/tdeutils/tdecmoduleproxyIfaceImpl.h
+++ b/tdeutils/tdecmoduleproxyIfaceImpl.h
@@ -33,7 +33,7 @@ class TDECModuleProxyIfaceImpl: public TQObject, virtual public TDECModuleProxyI
 	 * Update: This is probably not possible, since we don't want the DCOPObject when 
 	 * we're running in root mode. */
 
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 
@@ -79,7 +79,7 @@ private:
 class TDECModuleProxyRootCommunicatorImpl: public TQObject, 
 	virtual public TDECModuleProxyRootDispatcher
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	TDECModuleProxyRootCommunicatorImpl( const TQCString& name, TDECModuleProxy* const client );
diff --git a/tdeutils/tdemultitabbar.h b/tdeutils/tdemultitabbar.h
index eca4695ff..3d7785842 100644
--- a/tdeutils/tdemultitabbar.h
+++ b/tdeutils/tdemultitabbar.h
@@ -55,7 +55,7 @@ class KMultiTabBarInternal;
  */
 class TDEUTILS_EXPORT KMultiTabBar: public TQWidget
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/**
 	 * The tab bar's orientation. Also constraints the bar's position.
@@ -204,7 +204,7 @@ private:
  */
 class TDEUTILS_EXPORT KMultiTabBarButton: public TQPushButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	/** @internal */
 	KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup,
@@ -267,7 +267,7 @@ protected slots:
  */
 class TDEUTILS_EXPORT KMultiTabBarTab: public KMultiTabBarButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
   /** @internal */
 	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent,
diff --git a/tdeutils/tdemultitabbar_p.h b/tdeutils/tdemultitabbar_p.h
index 353a33260..61f8e82c7 100644
--- a/tdeutils/tdemultitabbar_p.h
+++ b/tdeutils/tdemultitabbar_p.h
@@ -29,7 +29,7 @@
 
 class KMultiTabBarInternal: public TQScrollView
 {
-        Q_OBJECT
+        TQ_OBJECT
 public:
         KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm);
         int appendTab(const TQPixmap &,int=-1,const TQString& =TQString::null);
diff --git a/tdeutils/tests/kfindtest.h b/tdeutils/tests/kfindtest.h
index 847d9579c..09526c1b0 100644
--- a/tdeutils/tests/kfindtest.h
+++ b/tdeutils/tests/kfindtest.h
@@ -27,7 +27,7 @@ class KFind;
 
 class KFindTest : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		KFindTest(const TQStringList &text) :
diff --git a/tdeutils/tests/kreplacetest.h b/tdeutils/tests/kreplacetest.h
index b8fb8120b..71aa8cebb 100644
--- a/tdeutils/tests/kreplacetest.h
+++ b/tdeutils/tests/kreplacetest.h
@@ -27,7 +27,7 @@ class KReplace;
 
 class KReplaceTest : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     KReplaceTest( const TQStringList& text, int button )
         : TQObject( 0L ), m_text( text ), m_replace( 0 ), m_button( button ) {}
diff --git a/tdewallet/client/tdewallet.h b/tdewallet/client/tdewallet.h
index 613231908..5a3747d38 100644
--- a/tdewallet/client/tdewallet.h
+++ b/tdewallet/client/tdewallet.h
@@ -52,7 +52,7 @@ namespace TDEWallet {
  */
 class TDEIO_EXPORT Wallet : public TQObject, public DCOPObject {
 	K_DCOP
-	Q_OBJECT
+	TQ_OBJECT
 	protected:
 		/**
 		 *  Construct a TDEWallet object.
diff --git a/tdewallet/tests/tdewallettest.h b/tdewallet/tests/tdewallettest.h
index a3ce51e48..426412864 100644
--- a/tdewallet/tests/tdewallettest.h
+++ b/tdewallet/tests/tdewallettest.h
@@ -7,7 +7,7 @@ namespace TDEWallet { class Wallet; }
 
 class WalletReceiver : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 public slots:
 	void walletOpened( bool );
 };
diff --git a/win/qeventloopex.h b/win/qeventloopex.h
index 648ddf228..2fed3ecf9 100644
--- a/win/qeventloopex.h
+++ b/win/qeventloopex.h
@@ -30,7 +30,7 @@ class QEventLoopExPrivate;
 
 class QEventLoopEx : public TQEventLoop
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 public:
 	QEventLoopEx( TQObject *parent = 0, const char *name = 0 );
diff --git a/win/tools/kmoc b/win/tools/kmoc
index 2fef8ea60..8e79c8246 100755
--- a/win/tools/kmoc
+++ b/win/tools/kmoc
@@ -6,7 +6,7 @@
 
 mkdir -p moc
 find . -maxdepth 1 -name \*.h | while read ; do 
-	grep Q_OBJECT $REPLY > /dev/null || continue
+	grep TQ_OBJECT $REPLY > /dev/null || continue
 	moc=moc/`echo $REPLY | sed -e "s/\\.h/\\.moc/;s/\\.\\///"`
 	if [ $moc -ot $REPLY ] ; then echo mocing $REPLY... ; moc $REPLY -o $moc ; fi
 done
-- 
cgit v1.2.3

