From 7f03918f8df7479b0e1a88288066201a301e87bf Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 12 Jan 2024 11:17:33 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro (cherry picked from commit ba3b5b77e1a430dc7197df20872ba46ce2fb6fa7) --- KDE3PORTING.html | 6 +- arts/kde/kartsfloatwatch.h | 2 +- arts/kde/kaudioconverter.cpp | 8 +- arts/kde/kaudiorecordstream.cpp | 6 +- arts/kde/kconverttest.cpp | 10 +- arts/kde/kioinputstream_impl.cpp | 32 +- arts/kde/kplayobject.cpp | 2 +- arts/kde/kplayobjectcreator.cpp | 6 +- arts/kde/kplayobjectfactory.cpp | 2 +- arts/kde/kvideowidget.cpp | 22 +- arts/knotify/knotify.cpp | 6 +- dcop/dcop_deadlock_test.cpp | 2 +- dcop/dcopclient.cpp | 14 +- dcop/dcopserver.cpp | 22 +- dcop/testdcop.cpp | 22 +- dcop/tests/driver.cpp | 4 +- dnssd/domainbrowser.cpp | 4 +- dnssd/publicservice.cpp | 2 +- dnssd/publicservice.h | 2 +- dnssd/query.cpp | 2 +- dnssd/servicebrowser.cpp | 20 +- dnssd/servicebrowser.h | 4 +- interfaces/khexedit/byteseditinterface.h | 2 +- interfaces/khexedit/clipboardinterface.h | 2 +- interfaces/kregexpeditor/kregexpeditorinterface.h | 2 +- interfaces/tdeimproxy/library/tdeimproxy.cpp | 4 +- .../tdefileaudiopreview/tdefileaudiopreview.cpp | 2 +- interfaces/tdescript/sample/shellscript.cpp | 6 +- interfaces/tdescript/scriptloader.cpp | 2 +- interfaces/terminal/kde_terminal_interface.h | 4 +- interfaces/terminal/test/main.cpp | 8 +- kab/addressbook.cpp | 8 +- kab/kabapi.cpp | 8 +- kab/qconfigDB.cpp | 2 +- kate/data/isocpp.xml | 6 +- kate/data/objectivec.xml | 6 +- kate/data/objectivecpp.xml | 6 +- kate/data/qt4.xml | 4 +- kate/part/katearbitraryhighlight.cpp | 10 +- kate/part/kateautoindent.cpp | 10 +- kate/part/katebookmarks.cpp | 20 +- kate/part/katecodecompletion.cpp | 14 +- kate/part/katedialogs.cpp | 146 +++++----- kate/part/katedocument.cpp | 36 +-- kate/part/katedocumenthelpers.cpp | 4 +- kate/part/katefiletype.cpp | 30 +- kate/part/katehighlight.cpp | 6 +- kate/part/kateprinter.cpp | 12 +- kate/part/kateschema.cpp | 104 +++---- kate/part/kateschema.h | 4 +- kate/part/katesearch.cpp | 12 +- kate/part/katespell.cpp | 24 +- kate/part/katesupercursor.cpp | 26 +- kate/part/katetemplatehandler.cpp | 22 +- kate/part/kateview.cpp | 230 +++++++-------- kate/part/kateviewhelpers.cpp | 22 +- kate/part/kateviewinternal.cpp | 50 ++-- kate/part/test_regression.cpp | 8 +- kate/plugins/autobookmarker/autobookmarker.cpp | 14 +- kate/plugins/insertfile/insertfileplugin.cpp | 4 +- kate/plugins/isearch/ISearchPlugin.cpp | 40 +-- kate/plugins/kdatatool/kate_kdatatool.cpp | 8 +- kate/plugins/wordcompletion/docwordcompletion.cpp | 26 +- kded/kded.cpp | 36 +-- kded/kdedmodule.cpp | 2 +- kded/tdebuildsycoca.cpp | 12 +- libtdescreensaver/tdescreensaver.cpp | 2 +- networkstatus/networkstatus.cpp | 4 +- networkstatus/networkstatusindicator.cpp | 4 +- networkstatus/testservice.cpp | 4 +- tdeabc/HOWTO | 4 +- tdeabc/addressbook.cpp | 32 +- tdeabc/addresseedialog.cpp | 30 +- tdeabc/addresslineedit.cpp | 18 +- tdeabc/distributionlist.cpp | 2 +- tdeabc/distributionlist.h | 2 +- tdeabc/distributionlistdialog.cpp | 28 +- tdeabc/distributionlisteditor.cpp | 16 +- tdeabc/ldapclient.cpp | 26 +- tdeabc/ldapconfigwidget.cpp | 24 +- tdeabc/plugins/dir/resourcedir.cpp | 6 +- tdeabc/plugins/file/resourcefile.cpp | 10 +- tdeabc/plugins/file/resourcefileconfig.cpp | 4 +- tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp | 52 ++-- .../plugins/ldaptdeio/resourceldaptdeioconfig.cpp | 10 +- tdeabc/plugins/net/resourcenet.cpp | 10 +- tdeabc/resourceselectdialog.cpp | 4 +- tdeabc/stdaddressbook.cpp | 18 +- tdeabc/tests/testaddresslineedit.cpp | 2 +- tdeabc/tests/testdistlist.cpp | 2 +- tdeabc/tests/testldapclient.cpp | 12 +- tdeabc/tests/testlock.cpp | 18 +- tdecert/tdecertpart.cpp | 16 +- tdecmshell/main.cpp | 4 +- tdecore/kaudioplayer.h | 2 +- tdecore/kcheckaccelerators.cpp | 6 +- tdecore/kclipboard.cpp | 8 +- tdecore/kextsock.cpp | 24 +- tdecore/kglobalaccel.h | 2 +- tdecore/kglobalaccel_win.cpp | 4 +- tdecore/kglobalaccel_x11.cpp | 10 +- tdecore/kiconloader.cpp | 2 +- tdecore/klibloader.cpp | 28 +- tdecore/kprocctrl.cpp | 4 +- tdecore/kprocess.cpp | 12 +- tdecore/kprocess.h | 4 +- tdecore/kprocio.cpp | 24 +- tdecore/ksimpledirwatch.cpp | 16 +- tdecore/ksock.cpp | 8 +- tdecore/kuniqueapplication.cpp | 14 +- tdecore/network/kbufferedsocket.cpp | 4 +- tdecore/network/kclientsocketbase.cpp | 18 +- tdecore/network/kdatagramsocket.cpp | 14 +- tdecore/network/kresolver.cpp | 2 +- tdecore/network/kresolver.h | 4 +- tdecore/network/kserversocket.cpp | 16 +- tdecore/network/kserversocket.h | 8 +- tdecore/network/ksrvresolverworker.cpp | 2 +- tdecore/network/kstreamsocket.cpp | 20 +- tdecore/network/kstreamsocket.h | 16 +- tdecore/tdeaccel.cpp | 24 +- tdecore/tdeaccel.h | 8 +- tdecore/tdeaccelbase.h | 10 +- tdecore/tdeaccelmanager.cpp | 4 +- tdecore/tdeapplication.cpp | 28 +- tdecore/tdeapplication.h | 16 +- tdecore/tdeconfigdialogmanager.cpp | 90 +++--- .../network-manager/network-manager.cpp | 44 +-- tdecore/tdehw/tdecryptographiccarddevice.cpp | 6 +- tdecore/tdehw/tdeeventdevice.cpp | 8 +- tdecore/tdehw/tdehardwaredevices.cpp | 12 +- tdecore/tdehw/tdenetworkconnections.cpp | 8 +- tdecore/tdeshortcut.h | 2 +- tdecore/tdestartupinfo.cpp | 10 +- tdecore/tests/kipctest.cpp | 12 +- tdecore/tests/kipctest.h | 12 +- tdecore/tests/kprocesstest.cpp | 32 +- tdecore/tests/kprociotest.cpp | 4 +- tdecore/tests/tdeconfigtestgui.cpp | 16 +- tdecore/twinmodule.cpp | 2 +- tdehtml/domtreeview.cpp | 4 +- tdehtml/ecma/kjs_debugwin.cpp | 22 +- tdehtml/ecma/kjs_window.cpp | 6 +- tdehtml/ecma/xmlhttprequest.cpp | 16 +- tdehtml/html/html_documentimpl.cpp | 12 +- tdehtml/html/html_objectimpl.cpp | 2 +- tdehtml/java/kjavaappletcontext.cpp | 2 +- tdehtml/java/kjavaappletserver.cpp | 14 +- tdehtml/java/kjavaappletviewer.cpp | 10 +- tdehtml/java/kjavaappletwidget.cpp | 8 +- tdehtml/java/kjavadownloader.cpp | 24 +- tdehtml/java/kjavaprocess.cpp | 16 +- tdehtml/misc/knsplugininstaller.cpp | 24 +- tdehtml/misc/loader.cpp | 22 +- tdehtml/rendering/render_form.cpp | 66 ++--- tdehtml/rendering/render_frames.cpp | 4 +- tdehtml/rendering/render_layer.cpp | 2 +- tdehtml/rendering/render_replaced.cpp | 4 +- tdehtml/tdehtml_ext.cpp | 96 +++--- tdehtml/tdehtml_pagecache.cpp | 6 +- tdehtml/tdehtml_part.cpp | 322 ++++++++++----------- tdehtml/tdehtmlimage.cpp | 20 +- tdehtml/tdehtmlview.cpp | 16 +- tdehtml/tdemultipart/tdemultipart.cpp | 106 +++---- tdehtml/test_regression.cpp | 20 +- tdehtml/testtdehtml.cpp | 20 +- tdehtml/xml/dom_docimpl.cpp | 2 +- tdeinit/tdelauncher.cpp | 26 +- tdeio/bookmarks/kbookmarkbar.cpp | 16 +- tdeio/bookmarks/kbookmarkdombuilder.cpp | 16 +- tdeio/bookmarks/kbookmarkimporter.cpp | 16 +- tdeio/bookmarks/kbookmarkmenu.cpp | 88 +++--- tdeio/httpfilter/httpfilter.cpp | 14 +- tdeio/kpasswdserver/kpasswdserver.cpp | 8 +- tdeio/kssl/ksslcertdlg.cpp | 4 +- tdeio/kssl/ksslinfodlg.cpp | 8 +- tdeio/kssl/ksslkeygen.cpp | 6 +- tdeio/misc/kpac/discovery.cpp | 6 +- tdeio/misc/kpac/downloader.cpp | 6 +- tdeio/misc/kpac/proxyscout.cpp | 4 +- tdeio/misc/tdesendbugmail/main.cpp | 4 +- tdeio/misc/tdesendbugmail/smtp.cpp | 16 +- tdeio/misc/tdewalletd/ktimeout.cpp | 2 +- tdeio/misc/tdewalletd/tdewalletd.cpp | 20 +- tdeio/misc/uiserver.cpp | 52 ++-- tdeio/tdefile/kacleditwidget.cpp | 22 +- tdeio/tdefile/kcombiview.cpp | 4 +- tdeio/tdefile/kcustommenueditor.cpp | 10 +- tdeio/tdefile/kdirselectdialog.cpp | 40 +-- tdeio/tdefile/kdirsize.cpp | 6 +- tdeio/tdefile/kdiskfreesp.cpp | 8 +- tdeio/tdefile/kicondialog.cpp | 30 +- tdeio/tdefile/kimagefilepreview.cpp | 18 +- tdeio/tdefile/kmetaprops.cpp | 4 +- tdeio/tdefile/knotifydialog.cpp | 98 +++---- tdeio/tdefile/kopenwith.cpp | 32 +- tdeio/tdefile/kpreviewprops.cpp | 4 +- tdeio/tdefile/kpropertiesdialog.cpp | 264 ++++++++--------- tdeio/tdefile/kurlbar.cpp | 18 +- tdeio/tdefile/kurlcombobox.cpp | 2 +- tdeio/tdefile/kurlrequester.cpp | 18 +- tdeio/tdefile/kurlrequesterdlg.cpp | 6 +- tdeio/tdefile/tdediroperator.cpp | 136 ++++----- tdeio/tdefile/tdediroperator.h | 16 +- tdeio/tdefile/tdefiledetailview.cpp | 44 +-- tdeio/tdefile/tdefiledialog.cpp | 86 +++--- tdeio/tdefile/tdefiledialog.h | 2 +- tdeio/tdefile/tdefilefiltercombo.cpp | 6 +- tdeio/tdefile/tdefileiconview.cpp | 78 ++--- tdeio/tdefile/tdefilemetainfowidget.cpp | 20 +- tdeio/tdefile/tdefilepreview.cpp | 12 +- tdeio/tdefile/tdefilesharedlg.cpp | 14 +- tdeio/tdefile/tdefiletreebranch.cpp | 36 +-- tdeio/tdefile/tdefiletreeview.cpp | 40 +-- tdeio/tdefile/tdefileview.cpp | 24 +- tdeio/tdefile/tests/kfdtest.cpp | 2 +- tdeio/tdefile/tests/tdefiletreeviewtest.cpp | 20 +- tdeio/tdeio/chmodjob.cpp | 6 +- tdeio/tdeio/connection.cpp | 6 +- tdeio/tdeio/dataslave.cpp | 2 +- tdeio/tdeio/defaultprogress.cpp | 8 +- tdeio/tdeio/forwardingslavebase.cpp | 52 ++-- tdeio/tdeio/job.cpp | 246 ++++++++-------- tdeio/tdeio/jobclasses.h | 4 +- tdeio/tdeio/kautomount.cpp | 4 +- tdeio/tdeio/kdatatool.cpp | 2 +- tdeio/tdeio/kdirlister.cpp | 66 ++--- tdeio/tdeio/kdirwatch.cpp | 16 +- tdeio/tdeio/kmimetypechooser.cpp | 14 +- tdeio/tdeio/kmimetyperesolver.h | 10 +- tdeio/tdeio/knfsshare.cpp | 4 +- tdeio/tdeio/krun.cpp | 26 +- tdeio/tdeio/ksambashare.cpp | 4 +- tdeio/tdeio/kscan.h | 4 +- tdeio/tdeio/kservice.cpp | 6 +- tdeio/tdeio/kurlcompletion.cpp | 8 +- tdeio/tdeio/metainfojob.cpp | 6 +- tdeio/tdeio/netaccess.cpp | 48 +-- tdeio/tdeio/passdlg.cpp | 10 +- tdeio/tdeio/pastedialog.cpp | 10 +- tdeio/tdeio/previewjob.cpp | 4 +- tdeio/tdeio/progressbase.cpp | 128 ++++---- tdeio/tdeio/renamedlg.cpp | 22 +- tdeio/tdeio/scheduler.cpp | 52 ++-- tdeio/tdeio/skipdlg.cpp | 6 +- tdeio/tdeio/slave.cpp | 18 +- tdeio/tdeio/slaveinterface.cpp | 2 +- tdeio/tdeio/statusbarprogress.cpp | 2 +- tdeio/tdeio/tdefileshare.cpp | 12 +- tdeio/tdeioexec/main.cpp | 6 +- tdeio/tests/jobtest.cpp | 12 +- tdeio/tests/kdcopcheck.cpp | 16 +- tdeio/tests/kdirlistertest.cpp | 84 +++--- tdeio/tests/kdirwatchtest.cpp | 6 +- tdeio/tests/kdirwatchunittest.cpp | 6 +- tdeio/tests/kruntest.cpp | 6 +- tdeio/tests/previewtest.cpp | 8 +- tdeio/tests/speed.cpp | 8 +- tdeio/tests/tdeioslavetest.cpp | 42 +-- tdeioslave/file/file.cpp | 8 +- tdeioslave/http/http.cpp | 8 +- tdeioslave/http/kcookiejar/kcookieserver.cpp | 6 +- tdeioslave/http/kcookiejar/kcookiewin.cpp | 10 +- tdemdi/tdemdi/dockcontainer.cpp | 8 +- tdemdi/tdemdi/guiclient.cpp | 28 +- tdemdi/tdemdi/mainwindow.cpp | 42 +-- tdemdi/tdemdi/tabwidget.cpp | 4 +- tdemdi/tdemdi/toolviewaccessor.cpp | 4 +- tdemdi/tdemdichildfrm.cpp | 48 +-- tdemdi/tdemdichildview.cpp | 2 +- tdemdi/tdemdichildview.h | 2 +- tdemdi/tdemdidockcontainer.cpp | 12 +- tdemdi/tdemdidocumentviewtabwidget.cpp | 16 +- tdemdi/tdemdifocuslist.cpp | 4 +- tdemdi/tdemdiguiclient.cpp | 36 +-- tdemdi/tdemdimainfrm.cpp | 218 +++++++------- tdemdi/tdemditaskbar.cpp | 10 +- tdemdi/tdemditoolviewaccessor.cpp | 4 +- tdemdi/test/hello.cpp | 2 +- tdemdi/test/mainwidget.cpp | 2 +- tdenewstuff/downloaddialog.cpp | 42 +-- tdenewstuff/engine.cpp | 32 +- tdenewstuff/ghns.cpp | 4 +- tdenewstuff/knewstuffbutton.cpp | 2 +- tdenewstuff/knewstuffsecure.cpp | 12 +- tdenewstuff/provider.cpp | 22 +- tdenewstuff/security.cpp | 24 +- tdenewstuff/testnewstuff.cpp | 6 +- tdeparts/browserextension.cpp | 40 +-- tdeparts/browserextension.h | 4 +- tdeparts/browserrun.cpp | 12 +- tdeparts/dockmainwindow.cpp | 16 +- tdeparts/mainwindow.cpp | 16 +- tdeparts/part.cpp | 12 +- tdeparts/partmanager.cpp | 16 +- tdeparts/tests/example.cpp | 14 +- tdeparts/tests/ghostview.cpp | 4 +- tdeparts/tests/normalktm.cpp | 10 +- tdeparts/tests/notepad.cpp | 6 +- tdeparts/tests/plugin_spellcheck.cpp | 2 +- tdeprint/cups/cupsaddsmb2.cpp | 12 +- tdeprint/cups/cupsdconf2/browsedialog.cpp | 2 +- tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp | 46 +-- tdeprint/cups/cupsdconf2/cupsdjobspage.cpp | 2 +- tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp | 8 +- tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp | 8 +- tdeprint/cups/cupsdconf2/cupsdserverpage.cpp | 2 +- tdeprint/cups/cupsdconf2/editlist.cpp | 10 +- tdeprint/cups/cupsdconf2/locationdialog.cpp | 10 +- tdeprint/cups/cupsdconf2/qdirlineedit.cpp | 2 +- tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp | 6 +- tdeprint/cups/kmconfigcupsdir.cpp | 2 +- tdeprint/cups/kmcupsconfigwidget.cpp | 6 +- tdeprint/cups/kmcupsmanager.cpp | 20 +- tdeprint/cups/kmwippprinter.cpp | 12 +- tdeprint/cups/kmwother.cpp | 2 +- tdeprint/cups/kpimagepage.cpp | 16 +- tdeprint/cups/kpschedulepage.cpp | 2 +- tdeprint/cups/kptextpage.cpp | 4 +- tdeprint/driverview.cpp | 4 +- tdeprint/droptionview.cpp | 20 +- tdeprint/kpcopiespage.cpp | 8 +- tdeprint/kpfilterpage.cpp | 14 +- tdeprint/kpgeneralpage.cpp | 6 +- tdeprint/kpposterpage.cpp | 14 +- tdeprint/kpqtpage.cpp | 6 +- tdeprint/kprintaction.cpp | 4 +- tdeprint/kprintdialog.cpp | 28 +- tdeprint/kprinterpropertydialog.cpp | 2 +- tdeprint/kprintpreview.cpp | 8 +- tdeprint/kprintprocess.cpp | 6 +- tdeprint/lpr/editentrydialog.cpp | 12 +- tdeprint/lpr/kmlprmanager.cpp | 2 +- tdeprint/management/cjanuswidget.cpp | 2 +- tdeprint/management/kiconselectaction.cpp | 2 +- tdeprint/management/kmconfigfilter.cpp | 8 +- tdeprint/management/kmconfigfonts.cpp | 12 +- tdeprint/management/kmconfiggeneral.cpp | 8 +- tdeprint/management/kmconfigpreview.cpp | 2 +- tdeprint/management/kmdbcreator.cpp | 8 +- tdeprint/management/kmdriverdb.cpp | 2 +- tdeprint/management/kmdriverdbwidget.cpp | 30 +- tdeprint/management/kmiconview.cpp | 4 +- tdeprint/management/kminstancepage.cpp | 14 +- tdeprint/management/kmjobviewer.cpp | 56 ++-- tdeprint/management/kmlistview.cpp | 8 +- tdeprint/management/kmmainview.cpp | 62 ++-- tdeprint/management/kmprinterview.cpp | 12 +- tdeprint/management/kmpropcontainer.cpp | 6 +- tdeprint/management/kmpropertypage.cpp | 2 +- tdeprint/management/kmpropwidget.cpp | 2 +- tdeprint/management/kmspecialprinterdlg.cpp | 10 +- tdeprint/management/kmtimer.cpp | 2 +- tdeprint/management/kmwclass.cpp | 4 +- tdeprint/management/kmwdriverselect.cpp | 2 +- tdeprint/management/kmwdrivertest.cpp | 4 +- tdeprint/management/kmwizard.cpp | 8 +- tdeprint/management/kmwlocal.cpp | 4 +- tdeprint/management/kmwpassword.cpp | 4 +- tdeprint/management/kmwsmb.cpp | 8 +- tdeprint/management/kmwsocket.cpp | 10 +- tdeprint/management/kxmlcommanddlg.cpp | 62 ++-- tdeprint/management/kxmlcommandselector.cpp | 26 +- tdeprint/management/networkscanner.cpp | 16 +- tdeprint/management/pluginaction.cpp | 2 +- tdeprint/management/smbview.cpp | 6 +- tdeprint/marginvaluewidget.cpp | 2 +- tdeprint/marginwidget.cpp | 32 +- tdeprint/messagewindow.cpp | 2 +- tdeprint/plugincombobox.cpp | 2 +- tdeprint/posterpreview.cpp | 6 +- tdeprint/rlpr/kmproxywidget.cpp | 4 +- tdeprint/rlpr/kmwrlpr.cpp | 2 +- tdeprint/tdefilelist.cpp | 12 +- tdeprint/tdeprintd.cpp | 12 +- tdeprint/tests/drawdemo.cpp | 4 +- tdeprint/tests/helpwindow.cpp | 60 ++-- tdeprint/tests/main.cpp | 4 +- tdeprint/tools/escputil/escpwidget.cpp | 16 +- tderandr/ktimerdialog.cpp | 4 +- tderandr/randr.cpp | 10 +- tderesources/configdialog.cpp | 8 +- tderesources/configpage.cpp | 22 +- tderesources/kcmtderesources.cpp | 2 +- tderesources/selectdialog.cpp | 12 +- tdersync/tdersync.cpp | 8 +- tdespell2/backgroundchecker.cpp | 8 +- tdespell2/backgroundengine.cpp | 4 +- tdespell2/defaultdictionary.cpp | 4 +- tdespell2/tests/backgroundtest.cpp | 8 +- tdespell2/tests/test_dialog.cpp | 4 +- tdespell2/ui/configwidget.cpp | 2 +- tdespell2/ui/dialog.cpp | 58 ++-- tdespell2/ui/highlighter.cpp | 2 +- tdestyles/asteroid/asteroid.cpp | 2 +- .../highcontrast/config/highcontrastconfig.cpp | 2 +- tdestyles/keramik/keramik.cpp | 4 +- tdestyles/kthemestyle/kthemebase.cpp | 2 +- tdestyles/plastik/config/plastikconf.cpp | 26 +- tdestyles/plastik/plastik.cpp | 6 +- tdeui/kactivelabel.cpp | 8 +- tdeui/kanimwidget.cpp | 4 +- tdeui/kbugreport.cpp | 12 +- tdeui/kbuttonbox.cpp | 4 +- tdeui/kcharselect.cpp | 30 +- tdeui/kcmenumngr.cpp | 2 +- tdeui/kcolorbutton.cpp | 6 +- tdeui/kcolorcombo.cpp | 4 +- tdeui/kcolordialog.cpp | 76 ++--- tdeui/kcombobox.cpp | 52 ++-- tdeui/kcombobox.h | 8 +- tdeui/kcommand.cpp | 16 +- tdeui/kcursor.cpp | 12 +- tdeui/kdatepicker.cpp | 30 +- tdeui/kdatetbl.cpp | 16 +- tdeui/kdatetimewidget.cpp | 8 +- tdeui/kdatewidget.cpp | 12 +- tdeui/kdetrayproxy/kdetrayproxy.cpp | 4 +- tdeui/kdialog.cpp | 6 +- tdeui/kdialogbase.cpp | 56 ++-- tdeui/kdockwidget.cpp | 28 +- tdeui/keditcl1.cpp | 4 +- tdeui/keditcl2.cpp | 22 +- tdeui/keditlistbox.cpp | 14 +- tdeui/kedittoolbar.cpp | 52 ++-- tdeui/kedittoolbar.h | 4 +- tdeui/khelpmenu.cpp | 38 +-- tdeui/khelpmenu.h | 8 +- tdeui/kiconview.cpp | 32 +- tdeui/kiconviewsearchline.cpp | 20 +- tdeui/kinputdialog.cpp | 34 +-- tdeui/kjanuswidget.cpp | 28 +- tdeui/kkeybutton.cpp | 2 +- tdeui/kkeydialog.cpp | 28 +- tdeui/klanguagebutton.cpp | 16 +- tdeui/klineedit.cpp | 34 +-- tdeui/klineedit.h | 4 +- tdeui/klineeditdlg.cpp | 20 +- tdeui/knuminput.cpp | 34 +-- tdeui/kpanelmenu.cpp | 8 +- tdeui/kpassdlg.cpp | 8 +- tdeui/kpassivepopup.cpp | 4 +- tdeui/kpixmapregionselectorwidget.cpp | 4 +- tdeui/kprogress.cpp | 6 +- tdeui/kprogressbox.cpp | 6 +- tdeui/kpushbutton.cpp | 4 +- tdeui/krootpixmap.cpp | 10 +- tdeui/ksconfig.cpp | 20 +- tdeui/kscrollview.cpp | 2 +- tdeui/ksharedpixmap.h | 2 +- tdeui/kstatusbar.cpp | 4 +- tdeui/kstdaction.h | 16 +- tdeui/kswitchlanguagedialog.cpp | 10 +- tdeui/ksyntaxhighlighter.cpp | 30 +- tdeui/ksystemtray.cpp | 4 +- tdeui/ktabbar.cpp | 8 +- tdeui/ktabctl.cpp | 2 +- tdeui/ktabwidget.cpp | 18 +- tdeui/ktextbrowser.cpp | 4 +- tdeui/ktextedit.cpp | 22 +- tdeui/ktimewidget.cpp | 4 +- tdeui/ktip.cpp | 8 +- tdeui/kurllabel.cpp | 2 +- tdeui/kurllabel.h | 4 +- tdeui/kxmlguifactory.h | 2 +- tdeui/tdeaboutapplication.cpp | 4 +- tdeui/tdeaboutdialog.cpp | 110 +++---- tdeui/tdeaction.cpp | 32 +- tdeui/tdeaction.h | 30 +- tdeui/tdeactionclasses.cpp | 102 +++---- tdeui/tdeactionclasses.h | 76 ++--- tdeui/tdeactioncollection.cpp | 16 +- tdeui/tdeactioncollection.h | 8 +- tdeui/tdeactionselector.cpp | 24 +- tdeui/tdecmodule.cpp | 2 +- tdeui/tdecompletionbox.cpp | 12 +- tdeui/tdeconfigdialog.cpp | 20 +- tdeui/tdeconfigdialog.h | 4 +- tdeui/tdefontcombo.cpp | 2 +- tdeui/tdefontdialog.cpp | 26 +- tdeui/tdefontrequester.cpp | 2 +- tdeui/tdelistbox.cpp | 30 +- tdeui/tdelistview.cpp | 70 ++--- tdeui/tdelistviewsearchline.cpp | 40 +-- tdeui/tdemainwindow.cpp | 32 +- tdeui/tdemainwindow.h | 10 +- tdeui/tdemenubar.cpp | 18 +- tdeui/tdemessagebox.cpp | 8 +- tdeui/tdepassivepopupstack.cpp | 6 +- tdeui/tdepopupmenu.cpp | 18 +- tdeui/tdeshortcutdialog.cpp | 34 +-- tdeui/tdespell.cpp | 86 +++--- tdeui/tdespelldlg.cpp | 52 ++-- tdeui/tdetoolbar.cpp | 44 +-- tdeui/tdetoolbar.h | 4 +- tdeui/tdetoolbarbutton.cpp | 36 +-- tdeui/tdetoolbarhandler.cpp | 12 +- tdeui/tdetoolbarlabelaction.h | 16 +- tdeui/tdetoolbarradiogroup.cpp | 2 +- tdeui/tests/itemcontainertest.cpp | 28 +- tdeui/tests/kbuttonboxtest.cpp | 48 +-- tdeui/tests/kcomboboxtest.cpp | 34 +-- tdeui/tests/kcompletiontest.cpp | 18 +- tdeui/tests/kdesattest.cpp | 2 +- tdeui/tests/kdockwidgetdemo.cpp | 36 +-- tdeui/tests/kdockwidgettest.cpp | 16 +- tdeui/tests/kdualcolortest.cpp | 12 +- tdeui/tests/kjanuswidgettest.cpp | 2 +- tdeui/tests/kledtest.cpp | 8 +- tdeui/tests/klineedittest.cpp | 16 +- tdeui/tests/knuminputtest.cpp | 18 +- tdeui/tests/kpanelmenutest.cpp | 4 +- tdeui/tests/krulertest.cpp | 70 ++--- tdeui/tests/kstatusbartest.cpp | 8 +- tdeui/tests/ktabctltest.cpp | 4 +- tdeui/tests/ktabwidgettest.cpp | 56 ++-- tdeui/tests/kunbalancedgrdtest.cpp | 4 +- tdeui/tests/kwizardtest.cpp | 8 +- tdeui/tests/kxmlguitest.cpp | 2 +- tdeui/tests/qxembedtest.cpp | 2 +- tdeui/tests/tdemainwindowtest.cpp | 2 +- tdeui/tests/tdepopuptest.cpp | 2 +- tdeui/tests/twindowtest.cpp | 64 ++-- tdeui/twindowinfo.cpp | 2 +- tdeui/twindowlistmenu.cpp | 6 +- tdeunittest/tester.cpp | 6 +- tdeutils/kcmultidialog.cpp | 14 +- tdeutils/kfind.cpp | 4 +- tdeutils/kfind.h | 8 +- tdeutils/kfinddialog.cpp | 14 +- tdeutils/kfinddialog.h | 2 +- tdeutils/kpluginselector.cpp | 32 +- tdeutils/kreplace.cpp | 8 +- tdeutils/kreplace.h | 12 +- tdeutils/ksettings/README.dox | 2 +- tdeutils/ksettings/componentsdialog.cpp | 16 +- tdeutils/ksettings/dialog.cpp | 28 +- tdeutils/ksettings/dialog.h | 2 +- tdeutils/ksettings/dispatcher.cpp | 2 +- tdeutils/ksettings/dispatcher.h | 4 +- tdeutils/ksettings/pluginpage.cpp | 8 +- tdeutils/tdecmodulecontainer.cpp | 14 +- tdeutils/tdecmoduleproxy.cpp | 18 +- tdeutils/tdecmoduleproxyIfaceImpl.cpp | 8 +- tdeutils/tdemultitabbar.cpp | 4 +- tdeutils/tests/kfindtest.cpp | 8 +- tdeutils/tests/kreplacetest.cpp | 12 +- tdewallet/client/tdewallet.cpp | 4 +- tdewallet/tests/tdewalletasync.cpp | 4 +- tdewallet/tests/tdewalletboth.cpp | 4 +- 550 files changed, 5010 insertions(+), 5016 deletions(-) diff --git a/KDE3PORTING.html b/KDE3PORTING.html index d2b7bcedf..ba92f9313 100644 --- a/KDE3PORTING.html +++ b/KDE3PORTING.html @@ -155,9 +155,9 @@ not be available.
  • TDEAccel::insertItem() and TDEAccel::connectItem(). 
     	- tdeaccel->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
-	- tdeaccel->connectItem( "Scroll Up", this, TQT_SLOT(scrollUp()) );
+	- tdeaccel->connectItem( "Scroll Up", this, TQ_SLOT(scrollUp()) );
 	+ tdeaccel->insert( "Scroll Up", i18n("Scroll Up"), TQString::null,
-		Key_Up, this, TQT_SLOT(scrollUp()) );
+		Key_Up, this, TQ_SLOT(scrollUp()) );
    Note that a What's This parameter is now a part of the insert function. You might replace the TQString::null parameter with @@ -176,7 +176,7 @@ not be available. The preferred means of defining a shortcut, however, is to use TDEAction. 
     	new TDEAction( i18n("Scroll Up"), Key_Up,
-		this, TQT_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
+		this, TQ_SLOT(scrollUp()), actionCollection(), "Scroll Up" );
    TDEGlobalAccel
    diff --git a/arts/kde/kartsfloatwatch.h b/arts/kde/kartsfloatwatch.h index d8c177ee6..b8cb229f0 100644 --- a/arts/kde/kartsfloatwatch.h +++ b/arts/kde/kartsfloatwatch.h @@ -44,7 +44,7 @@ namespace Arts { class KFloatWatchProxy_impl; } * \code * StereoVolumeControl stereoVolumeControl = ...; * KArtsFloatWatch *w = new KArtsFloatWatch(stereoVolumeControl, "scaleFactor_changed", this); - * connect(w, TQT_SIGNAL(valueChanged(float)), this, TQT_SLOT(setValue(float))); + * connect(w, TQ_SIGNAL(valueChanged(float)), this, TQ_SLOT(setValue(float))); * \endcode */ class KArtsFloatWatch : public TQObject { diff --git a/arts/kde/kaudioconverter.cpp b/arts/kde/kaudioconverter.cpp index 1eb8c20e5..d387535d2 100644 --- a/arts/kde/kaudioconverter.cpp +++ b/arts/kde/kaudioconverter.cpp @@ -88,7 +88,7 @@ void KAudioConverter::requestPlayObject(const KURL &url) Arts::TDEIOInputStream_impl *inputStreamImpl = new Arts::TDEIOInputStream_impl(); inputStream = Arts::TDEIOInputStream::_from_base(inputStreamImpl); - TQObject::connect(inputStreamImpl, TQT_SIGNAL(mimeTypeFound(const TQString &)), TQT_SLOT(slotMimeType(const TQString &))); + TQObject::connect(inputStreamImpl, TQ_SIGNAL(mimeTypeFound(const TQString &)), TQ_SLOT(slotMimeType(const TQString &))); inputStream.openURL(url.url().latin1()); inputStream.streamStart(); @@ -161,9 +161,9 @@ void KAudioConverter::start() Arts::connect(m_incoming->object(), "left", m_request, "left"); Arts::connect(m_incoming->object(), "right", m_request, "right"); - TQObject::connect(requestImpl, TQT_SIGNAL(newBlockSize(long)), TQT_SIGNAL(newBlockSize(long))); - TQObject::connect(requestImpl, TQT_SIGNAL(newBlockPointer(long)), TQT_SIGNAL(newBlockPointer(long))); - TQObject::connect(requestImpl, TQT_SIGNAL(newData()), TQT_SIGNAL(newData())); + TQObject::connect(requestImpl, TQ_SIGNAL(newBlockSize(long)), TQ_SIGNAL(newBlockSize(long))); + TQObject::connect(requestImpl, TQ_SIGNAL(newBlockPointer(long)), TQ_SIGNAL(newBlockPointer(long))); + TQObject::connect(requestImpl, TQ_SIGNAL(newData()), TQ_SIGNAL(newData())); // Special mpeglib case // TODO: needed at all?? diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp index eb08abdb7..02c88411a 100644 --- a/arts/kde/kaudiorecordstream.cpp +++ b/arts/kde/kaudiorecordstream.cpp @@ -66,7 +66,7 @@ KAudioRecordStream::KAudioRecordStream( KArtsServer * kserver, const TQString & d->inqueue.setAutoDelete( true ); d->title = title; - connect( d->kserver, TQT_SIGNAL( restartedServer() ), TQT_SLOT( slotRestartedServer() ) ); + connect( d->kserver, TQ_SIGNAL( restartedServer() ), TQ_SLOT( slotRestartedServer() ) ); d->in = Arts::DynamicCast( d->kserver->server().createObject( "Arts::Synth_AMAN_RECORD" ) ); d->effectStack = Arts::DynamicCast( d->kserver->server().createObject( "Arts::StereoEffectStack" ) ); @@ -196,8 +196,8 @@ void KAudioRecordStream::start( int samplingRate, int bits, int channels ) d->receiver_base = new KByteSoundReceiver( samplingRate, bits, channels, d->title.local8Bit() ); d->receiver = Arts::ByteSoundReceiver::_from_base( d->receiver_base ); - connect( d->receiver_base, TQT_SIGNAL( data( const char *, unsigned int ) ), - TQT_SLOT( slotData( const char *, unsigned int ) ) ); + connect( d->receiver_base, TQ_SIGNAL( data( const char *, unsigned int ) ), + TQ_SLOT( slotData( const char *, unsigned int ) ) ); Arts::connect( d->convert, "outdata", d->receiver, "indata" ); d->convert.start(); diff --git a/arts/kde/kconverttest.cpp b/arts/kde/kconverttest.cpp index 647c2f320..6c5706122 100644 --- a/arts/kde/kconverttest.cpp +++ b/arts/kde/kconverttest.cpp @@ -81,13 +81,13 @@ int main(int argc, char **argv) // converter.setup(44100); converter.requestPlayObject(url); - TQObject::connect(&converter, TQT_SIGNAL(rawStreamStart()), get, TQT_SLOT(slotRawStreamStart())); + TQObject::connect(&converter, TQ_SIGNAL(rawStreamStart()), get, TQ_SLOT(slotRawStreamStart())); - TQObject::connect(&converter, TQT_SIGNAL(newBlockSize(long)), get, TQT_SLOT(slotNewBlockSize(long))); - TQObject::connect(&converter, TQT_SIGNAL(newBlockPointer(long)), get, TQT_SLOT(slotNewBlockPointer(long))); - TQObject::connect(&converter, TQT_SIGNAL(newData()), get, TQT_SLOT(slotNewData())); + TQObject::connect(&converter, TQ_SIGNAL(newBlockSize(long)), get, TQ_SLOT(slotNewBlockSize(long))); + TQObject::connect(&converter, TQ_SIGNAL(newBlockPointer(long)), get, TQ_SLOT(slotNewBlockPointer(long))); + TQObject::connect(&converter, TQ_SIGNAL(newData()), get, TQ_SLOT(slotNewData())); - TQObject::connect(&converter, TQT_SIGNAL(rawStreamFinished()), get, TQT_SLOT(slotRawStreamFinished())); + TQObject::connect(&converter, TQ_SIGNAL(rawStreamFinished()), get, TQ_SLOT(slotRawStreamFinished())); converter.start(); diff --git a/arts/kde/kioinputstream_impl.cpp b/arts/kde/kioinputstream_impl.cpp index d893675cd..38acef54d 100644 --- a/arts/kde/kioinputstream_impl.cpp +++ b/arts/kde/kioinputstream_impl.cpp @@ -80,14 +80,14 @@ void TDEIOInputStream_impl::streamStart() m_job->addMetaData("accept", "audio/x-mp3, video/mpeg, application/ogg"); m_job->addMetaData("UserAgent", TQString::fromLatin1("aRts/") + TQString::fromLatin1(ARTS_VERSION)); - TQObject::connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::connect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); - TQObject::connect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); + TQObject::connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::connect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::connect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); m_streamStarted = true; } @@ -98,14 +98,14 @@ void TDEIOInputStream_impl::streamEnd() if(m_job != 0) { - TQObject::disconnect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); - TQObject::disconnect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), - this, TQT_SLOT(slotResult(TDEIO::Job *))); - TQObject::disconnect(m_job, TQT_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); - TQObject::disconnect(m_job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), - this, TQT_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); + TQObject::disconnect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &))); + TQObject::disconnect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), + this, TQ_SLOT(slotResult(TDEIO::Job *))); + TQObject::disconnect(m_job, TQ_SIGNAL(mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT(slotScanMimeType(TDEIO::Job *, const TQString &))); + TQObject::disconnect(m_job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t)), + this, TQ_SLOT(slotTotalSize(TDEIO::Job *, TDEIO::filesize_t))); if ( m_streamPulled ) outdata.endPull(); diff --git a/arts/kde/kplayobject.cpp b/arts/kde/kplayobject.cpp index f11c0eb8f..a9b3a8a36 100644 --- a/arts/kde/kplayobject.cpp +++ b/arts/kde/kplayobject.cpp @@ -179,7 +179,7 @@ void KDE::PlayObject::play() if ( d->creator ) delete d->creator; d->creator = new KDE::PlayObjectCreator( d->server ); - d->creator->create( d->url, d->createBUS, this, TQT_SLOT( attachPlayObject( Arts::PlayObject ) ) ); + d->creator->create( d->url, d->createBUS, this, TQ_SLOT( attachPlayObject( Arts::PlayObject ) ) ); kdDebug( 400 ) << "KDE::PlayObject::play(): creator called" << endl; d->internalState = Arts::posPlaying; } diff --git a/arts/kde/kplayobjectcreator.cpp b/arts/kde/kplayobjectcreator.cpp index 039c8a3bc..4b8f0ba01 100644 --- a/arts/kde/kplayobjectcreator.cpp +++ b/arts/kde/kplayobjectcreator.cpp @@ -44,7 +44,7 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj if (m_server.isNull() || url.isEmpty() ) return false; - connect( this, TQT_SIGNAL( playObjectCreated( Arts::PlayObject ) ), + connect( this, TQ_SIGNAL( playObjectCreated( Arts::PlayObject ) ), receiver, slot ); // check if the URL is a local file @@ -57,8 +57,8 @@ bool KDE::PlayObjectCreator::create(const KURL& url, bool createBUS, const TQObj m_instream = Arts::TDEIOInputStream::_from_base(instream_impl); // signal will be called once the ioslave knows the mime-type of the stream - connect(instream_impl, TQT_SIGNAL(mimeTypeFound(const TQString &)), - this, TQT_SLOT(slotMimeType(const TQString &))); + connect(instream_impl, TQ_SIGNAL(mimeTypeFound(const TQString &)), + this, TQ_SLOT(slotMimeType(const TQString &))); // GO! m_instream.openURL(url.url().latin1()); diff --git a/arts/kde/kplayobjectfactory.cpp b/arts/kde/kplayobjectfactory.cpp index 708fe516e..ef10a925b 100644 --- a/arts/kde/kplayobjectfactory.cpp +++ b/arts/kde/kplayobjectfactory.cpp @@ -179,7 +179,7 @@ KDE::PlayObject *KDE::PlayObjectFactory::createPlayObject(const KURL& _url, cons d->helper->po = d->playObj; d->helper->ap = d->amanPlay; if( d->playObj->object().isNull() && d->amanPlay ) - TQObject::connect( d->playObj, TQT_SIGNAL( playObjectCreated() ), d->helper, TQT_SLOT( connectAmanPlay() ) ); + TQObject::connect( d->playObj, TQ_SIGNAL( playObjectCreated() ), d->helper, TQ_SLOT( connectAmanPlay() ) ); else d->helper->connectAmanPlay(); } diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp index 2e0f77aea..aaf6c63e1 100644 --- a/arts/kde/kvideowidget.cpp +++ b/arts/kde/kvideowidget.cpp @@ -102,16 +102,16 @@ void KVideoWidget::init(void) // Setup actions new TDEToggleAction( i18n("Fullscreen &Mode"), "view-fullscreen", - CTRL+SHIFT+Key_F, this, TQT_SLOT(fullscreenActivated()), + CTRL+SHIFT+Key_F, this, TQ_SLOT(fullscreenActivated()), actionCollection(), "fullscreen_mode" ); new TDERadioAction( i18n("&Half Size"), ALT+Key_0, - this, TQT_SLOT(halfSizeActivated()), + this, TQ_SLOT(halfSizeActivated()), actionCollection(), "half_size" ); new TDERadioAction( i18n("&Normal Size"), ALT+Key_1, - this, TQT_SLOT(normalSizeActivated()), + this, TQ_SLOT(normalSizeActivated()), actionCollection(), "normal_size" ); new TDERadioAction( i18n("&Double Size"), ALT+Key_2, - this, TQT_SLOT(doubleSizeActivated()), + this, TQ_SLOT(doubleSizeActivated()), actionCollection(), "double_size" ); ((TDEToggleAction *)action( "half_size" ))->setExclusiveGroup( "KVideoWidget::zoom" ); @@ -379,20 +379,20 @@ void KVideoWidget::fullscreenActivated() fullscreenWidget = new KFullscreenVideoWidget( this ); // Interconnect mouse button signals - connect( fullscreenWidget, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )), - this, TQT_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) ); + connect( fullscreenWidget, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int )), + this, TQ_SIGNAL(mouseButtonPressed( int, const TQPoint &, int)) ); - connect( fullscreenWidget, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )), - this, TQT_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) ); + connect( fullscreenWidget, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )), + this, TQ_SIGNAL(mouseButtonDoubleClick( const TQPoint &, int )) ); // ### Remove in KDE4 - connect( fullscreenWidget, TQT_SIGNAL(rightButtonPressed(const TQPoint &)), - this, TQT_SIGNAL(rightButtonPressed(const TQPoint &)) ); + connect( fullscreenWidget, TQ_SIGNAL(rightButtonPressed(const TQPoint &)), + this, TQ_SIGNAL(rightButtonPressed(const TQPoint &)) ); // Leave fullscreen mode with key TQAccel *a = new TQAccel( fullscreenWidget ); a->connectItem( a->insertItem( Key_Escape ), - this, TQT_SLOT(setWindowed()) ); + this, TQ_SLOT(setWindowed()) ); fullscreenWidget->setFocus(); fullscreenWidget->showFullScreen(); diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp index 101c7967b..176559bea 100644 --- a/arts/knotify/knotify.cpp +++ b/arts/knotify/knotify.cpp @@ -247,7 +247,7 @@ KNotify::KNotify( bool useArts ) d->playObjects.setAutoDelete(true); d->audioManager = 0; if( useArts ) { - connect( soundServer, TQT_SIGNAL( restartedServer() ), this, TQT_SLOT( restartedArtsd() ) ); + connect( soundServer, TQ_SIGNAL( restartedServer() ), this, TQ_SLOT( restartedArtsd() ) ); restartedArtsd(); //started allready need to initialize d->audioManager } #endif @@ -530,7 +530,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int if ( !d->playTimer ) { d->playTimer = new TQTimer( this ); - connect( d->playTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( playTimeout() ) ); + connect( d->playTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( playTimeout() ) ); } if ( !d->playTimer->isActive() ) { d->playTimer->start( 1000 ); @@ -543,7 +543,7 @@ bool KNotify::notifyBySound( const TQString &sound, const TQString &appname, int TDEProcess *proc = d->externalPlayerProc; if (!proc) { proc = d->externalPlayerProc = new TDEProcess; - connect( proc, TQT_SIGNAL( processExited( TDEProcess * )), TQT_SLOT( slotPlayerProcessExited( TDEProcess * ))); + connect( proc, TQ_SIGNAL( processExited( TDEProcess * )), TQ_SLOT( slotPlayerProcessExited( TDEProcess * ))); } if (proc->isRunning()) { soundFinished( eventId, PlayerBusy ); diff --git a/dcop/dcop_deadlock_test.cpp b/dcop/dcop_deadlock_test.cpp index 6b32688ef..515aca6a1 100644 --- a/dcop/dcop_deadlock_test.cpp +++ b/dcop/dcop_deadlock_test.cpp @@ -33,7 +33,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. MyDCOPObject::MyDCOPObject(const TQCString &name, const TQCString &remoteName) : TQObject(0, name), DCOPObject(name), m_remoteName(remoteName) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout())); } bool MyDCOPObject::process(const TQCString &fun, const TQByteArray &data, diff --git a/dcop/dcopclient.cpp b/dcop/dcopclient.cpp index 0aae67b7a..d309014ee 100644 --- a/dcop/dcopclient.cpp +++ b/dcop/dcopclient.cpp @@ -334,10 +334,10 @@ void DCOPClient::handleAsyncReply(ReplyStruct *replyStruct) { if (replyStruct->replyObject) { - TQObject::connect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), + TQObject::connect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), replyStruct->replyObject, replyStruct->replySlot); emit callBack(replyStruct->replyId, *(replyStruct->replyType), *(replyStruct->replyData)); - TQObject::disconnect(this, TQT_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), + TQObject::disconnect(this, TQ_SIGNAL(callBack(int, const TQCString&, const TQByteArray &)), replyStruct->replyObject, replyStruct->replySlot); } delete replyStruct; @@ -625,8 +625,8 @@ DCOPClient::DCOPClient() d->qt_bridge_enabled = true; d->transactionList = 0L; d->transactionId = 0; - TQObject::connect( &d->postMessageTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( processPostedMessagesInternal() ) ); - TQObject::connect( &d->eventLoopTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( eventLoopTimeout() ) ); + TQObject::connect( &d->postMessageTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( processPostedMessagesInternal() ) ); + TQObject::connect( &d->eventLoopTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( eventLoopTimeout() ) ); if ( !mainClient() ) setMainClient( this ); @@ -693,8 +693,8 @@ void DCOPClient::bindToApp() delete d->notifier; d->notifier = new TQSocketNotifier(socket(), TQSocketNotifier::Read, 0, 0); - TQObject::connect(d->notifier, TQT_SIGNAL(activated(int)), - TQT_SLOT(processSocketData(int))); + TQObject::connect(d->notifier, TQ_SIGNAL(activated(int)), + TQ_SLOT(processSocketData(int))); } } @@ -1856,7 +1856,7 @@ int DCOPClient::callAsync(const TQCString &remApp, const TQCString &remObjId, if (replyStruct->transactionId == 0) { // Call is finished already - TQTimer::singleShot(0, this, TQT_SLOT(asyncReplyReady())); + TQTimer::singleShot(0, this, TQ_SLOT(asyncReplyReady())); d->asyncReplyQueue.append(replyStruct); } diff --git a/dcop/dcopserver.cpp b/dcop/dcopserver.cpp index a565df405..99c3cba67 100644 --- a/dcop/dcopserver.cpp +++ b/dcop/dcopserver.cpp @@ -306,8 +306,8 @@ tqWarning("[dcopserver] waitForOutputReady fd = %d datasize = %d start = %d", so if (!outputBufferNotifier) { outputBufferNotifier = new TQSocketNotifier(socket(), Write); - connect(outputBufferNotifier, TQT_SIGNAL(activated(int)), - the_server, TQT_SLOT(slotOutputReady(int))); + connect(outputBufferNotifier, TQ_SIGNAL(activated(int)), + the_server, TQ_SLOT(slotOutputReady(int))); } outputBufferNotifier->setEnabled(true); return; @@ -1055,16 +1055,16 @@ DCOPServer::DCOPServer(bool _suicide) for ( int i = 0; i < numTransports; i++) { con = new DCOPListener( listenObjs[i] ); listener.append( con ); - connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( newClient(int) ) ); + connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( newClient(int) ) ); } char c = 0; write(ready[1], &c, 1); // dcopserver is started close(ready[1]); m_timer = new TQTimer(this); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) ); m_deadConnectionTimer = new TQTimer(this); - connect( m_deadConnectionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCleanDeadConnections()) ); + connect( m_deadConnectionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCleanDeadConnections()) ); #ifdef Q_OS_WIN char szEventName[256]; @@ -1183,7 +1183,7 @@ void DCOPServer::newClient( int /*socket*/ ) void* DCOPServer::watchConnection( IceConn iceConn ) { DCOPConnection* con = new DCOPConnection( iceConn ); - connect( con, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( processData(int) ) ); + connect( con, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( processData(int) ) ); clients.insert(iceConn, con ); fd_clients.insert( IceConnectionNumber(iceConn), con); @@ -1293,8 +1293,8 @@ void DCOPServer::slotTerminate() #endif TQByteArray data; dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false); - disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotSuicide()) ); + disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotSuicide()) ); system(findDcopserverShutdown()+" --nokill"); } @@ -1321,8 +1321,8 @@ void DCOPServer::slotShutdown() TQByteArray data; dcopSignals->emitSignal(0L /* dcopserver */, "terminateTDE()", data, false); m_timer->start( 10000 ); // if within 10 seconds nothing happens, we'll terminate - disconnect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTerminate()) ); - connect( m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotExit()) ); + disconnect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTerminate()) ); + connect( m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotExit()) ); if (appIds.isEmpty()) slotExit(); // Exit now } @@ -1779,7 +1779,7 @@ extern "C" DCOP_EXPORT int kdemain( int argc, char* argv[] ) SetConsoleCtrlHandler(DCOPServer::dcopServerConsoleProc,TRUE); #else TQSocketNotifier DEATH(pipeOfDeath[0], TQSocketNotifier::Read, 0, 0); - server->connect(&DEATH, TQT_SIGNAL(activated(int)), TQT_SLOT(slotShutdown())); + server->connect(&DEATH, TQ_SIGNAL(activated(int)), TQ_SLOT(slotShutdown())); #endif int ret = a.exec(); diff --git a/dcop/testdcop.cpp b/dcop/testdcop.cpp index 1a18eaff3..583a0255b 100644 --- a/dcop/testdcop.cpp +++ b/dcop/testdcop.cpp @@ -84,13 +84,13 @@ tqDebug("countDown() countDownAction = %p", countDownAction); { countDownCount = 10; countDownAction = client->beginTransaction(); - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout())); } else { countDownCount2 = 10; countDownAction2 = client->beginTransaction(); - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2())); } return true; } @@ -113,7 +113,7 @@ void MyDCOPObject::slotTimeout() } else { - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout())); } } @@ -132,7 +132,7 @@ void MyDCOPObject::slotTimeout2() } else { - TQTimer::singleShot(1000, this, TQT_SLOT(slotTimeout2())); + TQTimer::singleShot(1000, this, TQ_SLOT(slotTimeout2())); } } @@ -146,7 +146,7 @@ QCStringList MyDCOPObject::functions() TestObject::TestObject(const TQCString& app) : m_app(app) { - TQTimer::singleShot(2500, this, TQT_SLOT(slotTimeout())); + TQTimer::singleShot(2500, this, TQ_SLOT(slotTimeout())); } void TestObject::slotTimeout() @@ -191,10 +191,10 @@ int main(int argc, char **argv) TQCString appId = argv[1]; TestObject obj(appId); tqWarning("#1 Calling countDown"); - int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); + int result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); tqDebug("#1 countDown() call id = %d", result); tqWarning("#2 Calling countDown"); - result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQT_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); + result = client->callAsync(appId, "object1", "countDown()", data, &obj, TQ_SLOT(slotCallBack(int, const TQCString&, const TQByteArray&))); tqDebug("#2 countDown() call id = %d", result); app.exec(); @@ -234,11 +234,11 @@ int main(int argc, char **argv) int n = client->registeredApplications().count(); tqDebug("number of attached applications = %d", n ); - TQObject::connect( client, TQT_SIGNAL( applicationRegistered( const TQCString&)), - obj1, TQT_SLOT( registered( const TQCString& ))); + TQObject::connect( client, TQ_SIGNAL( applicationRegistered( const TQCString&)), + obj1, TQ_SLOT( registered( const TQCString& ))); - TQObject::connect( client, TQT_SIGNAL( applicationRemoved( const TQCString&)), - obj1, TQT_SLOT( unregistered( const TQCString& ))); + TQObject::connect( client, TQ_SIGNAL( applicationRemoved( const TQCString&)), + obj1, TQ_SLOT( unregistered( const TQCString& ))); // Enable the above signals client->setNotifications( true ); diff --git a/dcop/tests/driver.cpp b/dcop/tests/driver.cpp index a129d7d6f..74dee9edd 100644 --- a/dcop/tests/driver.cpp +++ b/dcop/tests/driver.cpp @@ -39,7 +39,7 @@ void Driver::test() } ++count; - TQTimer::singleShot( 100, this, TQT_SLOT( test() ) ); + TQTimer::singleShot( 100, this, TQ_SLOT( test() ) ); } #include "driver.moc" @@ -58,7 +58,7 @@ int main(int argc, char** argv) app.dcopClient()->attach( ); app.dcopClient()->registerAs( "TestAppDriver" ); Driver * object = new Driver( appname ); - TQTimer::singleShot( 10, object, TQT_SLOT( test() ) ); + TQTimer::singleShot( 10, object, TQ_SLOT( test() ) ); return app.exec(); } diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp index 229d56f7f..78cc2783a 100644 --- a/dnssd/domainbrowser.cpp +++ b/dnssd/domainbrowser.cpp @@ -86,8 +86,8 @@ DomainBrowser::DomainBrowser(TQObject *parent) : TQObject(parent) d->m_domains+="local."; d->m_browseLAN=true; } - connect(TDEApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this, - TQT_SLOT(domainListChanged(int,int))); + connect(TDEApplication::kApplication(),TQ_SIGNAL(kipcMessage(int,int)),this, + TQ_SLOT(domainListChanged(int,int))); } DomainBrowser::DomainBrowser(const TQStringList& domains, bool recursive, TQObject *parent) : TQObject(parent) diff --git a/dnssd/publicservice.cpp b/dnssd/publicservice.cpp index 05b891258..dcfc68e30 100644 --- a/dnssd/publicservice.cpp +++ b/dnssd/publicservice.cpp @@ -82,7 +82,7 @@ PublicService::PublicService(const TQString& name, const TQString& type, unsigne #ifdef HAVE_DNSSD if (Responder::self().client()) { d->m_group = avahi_entry_group_new(Responder::self().client(), publish_callback,this); - connect(&Responder::self(),TQT_SIGNAL(stateChanged(AvahiClientState)),this,TQT_SLOT(clientState(AvahiClientState))); + connect(&Responder::self(),TQ_SIGNAL(stateChanged(AvahiClientState)),this,TQ_SLOT(clientState(AvahiClientState))); } #endif if (domain.isNull()) diff --git a/dnssd/publicservice.h b/dnssd/publicservice.h index 56c3aeb87..6dad448b4 100644 --- a/dnssd/publicservice.h +++ b/dnssd/publicservice.h @@ -49,7 +49,7 @@ Asynchronous publishing is better for responsiveness. Example: \code DNSSD::PublicService *service = new DNSSD::PublicService("My files","_http._tcp",80); -connect(service,TQT_SIGNAL(published(bool)),this,TQT_SLOT(wasPublished(bool))); +connect(service,TQ_SIGNAL(published(bool)),this,TQ_SLOT(wasPublished(bool))); service->publishAsync(); \endcode diff --git a/dnssd/query.cpp b/dnssd/query.cpp index 3306dc256..2afa62401 100644 --- a/dnssd/query.cpp +++ b/dnssd/query.cpp @@ -74,7 +74,7 @@ public: Query::Query(const TQString& type, const TQString& domain) { d = new QueryPrivate(type,domain); - connect(&d->timeout,TQT_SIGNAL(timeout()),this,TQT_SLOT(timeout())); + connect(&d->timeout,TQ_SIGNAL(timeout()),this,TQ_SLOT(timeout())); } diff --git a/dnssd/servicebrowser.cpp b/dnssd/servicebrowser.cpp index 3c64ffe66..58dd4c30f 100644 --- a/dnssd/servicebrowser.cpp +++ b/dnssd/servicebrowser.cpp @@ -69,9 +69,9 @@ void ServiceBrowser::init(const TQStringList& type,DomainBrowser* domains,int fl d->m_types=type; d->m_flags=flags; d->m_domains = domains; - connect(d->m_domains,TQT_SIGNAL(domainAdded(const TQString& )),this,TQT_SLOT(addDomain(const TQString& ))); - connect(d->m_domains,TQT_SIGNAL(domainRemoved(const TQString& )),this, - TQT_SLOT(removeDomain(const TQString& ))); + connect(d->m_domains,TQ_SIGNAL(domainAdded(const TQString& )),this,TQ_SLOT(addDomain(const TQString& ))); + connect(d->m_domains,TQ_SIGNAL(domainRemoved(const TQString& )),this, + TQ_SLOT(removeDomain(const TQString& ))); } ServiceBrowser::ServiceBrowser(const TQString& type,const TQString& domain,bool autoResolve) { @@ -110,7 +110,7 @@ void ServiceBrowser::serviceResolved(bool success) { TQObject* sender_obj = const_cast(sender()); RemoteService* svr = static_cast(sender_obj); - disconnect(svr,TQT_SIGNAL(resolved(bool)),this,TQT_SLOT(serviceResolved(bool))); + disconnect(svr,TQ_SIGNAL(resolved(bool)),this,TQ_SLOT(serviceResolved(bool))); TQValueList::Iterator it = d->m_duringResolve.begin(); TQValueList::Iterator itEnd = d->m_duringResolve.end(); while ( it!= itEnd && svr!= (*it)) ++it; @@ -140,7 +140,7 @@ void ServiceBrowser::gotNewService(RemoteService::Ptr svr) { if (findDuplicate(svr)==(d->m_services.end())) { if (d->m_flags & AutoResolve) { - connect(svr,TQT_SIGNAL(resolved(bool )),this,TQT_SLOT(serviceResolved(bool ))); + connect(svr,TQ_SIGNAL(resolved(bool )),this,TQ_SLOT(serviceResolved(bool ))); d->m_duringResolve+=svr; svr->resolveAsync(); } else { @@ -179,11 +179,11 @@ void ServiceBrowser::addDomain(const TQString& domain) TQStringList::ConstIterator itEnd = d->m_types.end(); for (TQStringList::ConstIterator it=d->m_types.begin(); it!=itEnd; ++it) { Query* b = new Query((*it),domain); - connect(b,TQT_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, - TQT_SLOT(gotNewService(DNSSD::RemoteService::Ptr))); - connect(b,TQT_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr )),this, - TQT_SLOT(gotRemoveService(DNSSD::RemoteService::Ptr))); - connect(b,TQT_SIGNAL(finished()),this,TQT_SLOT(queryFinished())); + connect(b,TQ_SIGNAL(serviceAdded(DNSSD::RemoteService::Ptr)),this, + TQ_SLOT(gotNewService(DNSSD::RemoteService::Ptr))); + connect(b,TQ_SIGNAL(serviceRemoved(DNSSD::RemoteService::Ptr )),this, + TQ_SLOT(gotRemoveService(DNSSD::RemoteService::Ptr))); + connect(b,TQ_SIGNAL(finished()),this,TQ_SLOT(queryFinished())); b->startQuery(); d->resolvers.insert(domain,b); } diff --git a/dnssd/servicebrowser.h b/dnssd/servicebrowser.h index 04f2592ed..01e9d0ccd 100644 --- a/dnssd/servicebrowser.h +++ b/dnssd/servicebrowser.h @@ -38,8 +38,8 @@ Suppose that you need list of web servers running. Example: \code DNSSD::ServiceBrowser* browser = new DNSSD::ServiceBrowser("_http._tcp"); -connect(browser,TQT_SIGNAL(serviceAdded(RemoteService::Ptr)),this,TQT_SLOT(addService(RemoteService::Ptr))); -connect(browser,TQT_SIGNAL(serviceRemoved(RemoteService::Ptr)),this,TQT_SLOT(delService(RemoteService::Ptr))); +connect(browser,TQ_SIGNAL(serviceAdded(RemoteService::Ptr)),this,TQ_SLOT(addService(RemoteService::Ptr))); +connect(browser,TQ_SIGNAL(serviceRemoved(RemoteService::Ptr)),this,TQ_SLOT(delService(RemoteService::Ptr))); browser->startBrowse(); \endcode diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h index 06749c4fe..bfeaa43e5 100644 --- a/interfaces/khexedit/byteseditinterface.h +++ b/interfaces/khexedit/byteseditinterface.h @@ -206,7 +206,7 @@ inline BytesEditInterface *bytesEditInterface( T *t ) * � if( Clipboard ) * � { * � � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky... - * � � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) ); + * � � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) ); * � } * } * \endcode diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h index ca69baf8c..ec77b1a48 100644 --- a/interfaces/khexedit/clipboardinterface.h +++ b/interfaces/khexedit/clipboardinterface.h @@ -35,7 +35,7 @@ namespace KHE * if( Clipboard ) * { * � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky... - * � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) ); + * � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) ); * } * \endcode * diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h index c58ab7dc9..fbdc22de6 100644 --- a/interfaces/kregexpeditor/kregexpeditorinterface.h +++ b/interfaces/kregexpeditor/kregexpeditorinterface.h @@ -41,7 +41,7 @@ * * Note: signals and slots must be connected to the editorDialog object, not to the editor object: * \code - * connect( editorDialog, TQT_SIGNAL( canUndo( bool ) ), undoBut, TQT_SLOT( setEnabled( bool ) ) ); + * connect( editorDialog, TQ_SIGNAL( canUndo( bool ) ), undoBut, TQ_SLOT( setEnabled( bool ) ) ); * \endcode * * If you want to create an instance of the editor widget, i.e. not the diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp index fb2db0eb4..022737ed4 100644 --- a/interfaces/tdeimproxy/library/tdeimproxy.cpp +++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp @@ -181,8 +181,8 @@ KIMProxy::KIMProxy( DCOPClient* dc ) : DCOPObject( "KIMProxyIface" ), TQObject() d->dc = dc; m_initialized = false; - connect( d->dc, TQT_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); - connect( d->dc, TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) ); + connect( d->dc, TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( d->dc, TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) ); d->dc->setNotifications( true ); d->presence_strings.append( "Unknown" ); diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp index 72f870c7e..be0f92111 100644 --- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp +++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp @@ -93,7 +93,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name ) m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box ); TDEConfigGroup config( TDEGlobal::config(), ConfigGroup ); m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) ); - connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); + connect( m_autoPlay, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) ); } KFileAudioPreview::~KFileAudioPreview() diff --git a/interfaces/tdescript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp index 766613551..64cf89bb8 100644 --- a/interfaces/tdescript/sample/shellscript.cpp +++ b/interfaces/tdescript/sample/shellscript.cpp @@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" ) ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent) { m_script = new TDEProcess(); - connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *))); - connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int ))); - connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int ))); + connect ( m_script, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(Exit(TDEProcess *))); + connect ( m_script, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(stdOut(TDEProcess *, char *, int ))); + connect ( m_script, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(stdErr(TDEProcess *, char *, int ))); // Connect feedback signals and slots //kdDebug() << "Building new script engine" << endl; } diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp index c21f1f794..62bd33605 100644 --- a/interfaces/tdescript/scriptloader.cpp +++ b/interfaces/tdescript/scriptloader.cpp @@ -40,7 +40,7 @@ ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent) m_theAction = new TDESelectAction ( i18n("TDE Scripts"), 0, this, - TQT_SLOT(runAction()), + TQ_SLOT(runAction()), m_parent->actionCollection(), "scripts"); } diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h index 406fdf1ec..b0f2b9d5f 100644 --- a/interfaces/terminal/kde_terminal_interface.h +++ b/interfaces/terminal/kde_terminal_interface.h @@ -78,8 +78,8 @@ class TQStrList; * // or connect to one of the signals. Connect to the Part object, * // not to the TerminalInterface, since the latter is no TQObject, * // and as such cannot have signals..: - * // connect( p, TQT_SIGNAL( processExited( int ) ), - * // this, TQT_SLOT( shellExited( int ) ) ); + * // connect( p, TQ_SIGNAL( processExited( int ) ), + * // this, TQ_SLOT( shellExited( int ) ) ); * // etc. * * \endcode diff --git a/interfaces/terminal/test/main.cpp b/interfaces/terminal/test/main.cpp index 07e31bead..f0d51b259 100644 --- a/interfaces/terminal/test/main.cpp +++ b/interfaces/terminal/test/main.cpp @@ -26,8 +26,8 @@ Win::Win() // l.append( "python" ); // t->startProgram( TQString::fromUtf8( "/usr/bin/python" ), l ); - connect( p, TQT_SIGNAL( processExited( int ) ), - this, TQT_SLOT( pythonExited( int ) ) ); + connect( p, TQ_SIGNAL( processExited( int ) ), + this, TQ_SLOT( pythonExited( int ) ) ); } @@ -48,8 +48,8 @@ void Win::pythonExited() std::cerr << "hee, " << p << std::endl; std::cerr << ( ::tqt_cast(p) ) << std::endl; // KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) ); - disconnect(p, TQT_SIGNAL( processExited() ), - this, TQT_SLOT( pythonExited() )); + disconnect(p, TQ_SIGNAL( processExited() ), + this, TQ_SLOT( pythonExited() )); TerminalInterface* t = ::tqt_cast( p ); TQStrList l; l.append( "echo" ); diff --git a/kab/addressbook.cpp b/kab/addressbook.cpp index 017621ac7..1a6655266 100644 --- a/kab/addressbook.cpp +++ b/kab/addressbook.cpp @@ -420,10 +420,10 @@ AddressBook::AddressBook(TQWidget* parent, const char* name, bool loadit) i18n("Out of Memory")); kapp->quit(); // It is critical, but will possibly never happen. } - connect(data, TQT_SIGNAL(fileChanged()), TQT_SLOT(dataFileChanged())); - connect(data, TQT_SIGNAL(changed(QConfigDB*)), - TQT_SLOT(reloaded(QConfigDB*))); - connect(config, TQT_SIGNAL(fileChanged()), TQT_SLOT(configFileChanged())); + connect(data, TQ_SIGNAL(fileChanged()), TQ_SLOT(dataFileChanged())); + connect(data, TQ_SIGNAL(changed(QConfigDB*)), + TQ_SLOT(reloaded(QConfigDB*))); + connect(config, TQ_SIGNAL(fileChanged()), TQ_SLOT(configFileChanged())); // ----- set style: filename = locate( "data", STD_CONFIGFILENAME); diff --git a/kab/kabapi.cpp b/kab/kabapi.cpp index 62a50f162..2008f1f88 100644 --- a/kab/kabapi.cpp +++ b/kab/kabapi.cpp @@ -43,8 +43,8 @@ KabAPI::KabAPI(TQWidget* parent, const char* name) setMainWidget(listbox); showButtonApply(false); enableButtonSeparator(true); - connect(listbox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(entrySelected(int))); - connect(listbox, TQT_SIGNAL(doubleClicked ( TQListBoxItem * )),TQT_SLOT(slotDoubleClicked ( TQListBoxItem * ))); + connect(listbox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(entrySelected(int))); + connect(listbox, TQ_SIGNAL(doubleClicked ( TQListBoxItem * )),TQ_SLOT(slotDoubleClicked ( TQListBoxItem * ))); } @@ -90,8 +90,8 @@ AddressBook::ErrorCode KabAPI::init() book=new AddressBook(0, "KABAPI::book", true); //change parent from "this" to "0" //dsweet if(book->getState()==AddressBook::NoError) { - connect(book, TQT_SIGNAL(setStatus(const TQString&)), - TQT_SLOT(setStatusSlot(const TQString&))); + connect(book, TQ_SIGNAL(setStatus(const TQString&)), + TQ_SLOT(setStatusSlot(const TQString&))); return AddressBook::NoError; } else { return AddressBook::InternError; diff --git a/kab/qconfigDB.cpp b/kab/qconfigDB.cpp index f04763df2..1112f7c7d 100644 --- a/kab/qconfigDB.cpp +++ b/kab/qconfigDB.cpp @@ -2221,7 +2221,7 @@ QConfigDB::watch(bool state) if(timer==0) { timer=new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(checkFileChanged())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(checkFileChanged())); } timer->start(1000); } else { // stop timer diff --git a/kate/data/isocpp.xml b/kate/data/isocpp.xml index 34b6e4c4e..3d3736723 100644 --- a/kate/data/isocpp.xml +++ b/kate/data/isocpp.xml @@ -156,8 +156,8 @@ Q_SIGNALS Q_SLOTS Q_UNUSED - SIGNAL - SLOT + Q_SIGNAL + Q_SLOT TRUE FALSE TQ_ARG @@ -202,8 +202,6 @@ TQ_SLOT TQ_SLOTS TQ_UNUSED - TQT_SIGNAL - TQT_SLOT connect disconnect emit diff --git a/kate/data/objectivec.xml b/kate/data/objectivec.xml index 59dfba5ad..7d36b3d0c 100644 --- a/kate/data/objectivec.xml +++ b/kate/data/objectivec.xml @@ -79,8 +79,8 @@ Q_SIGNALS Q_SLOTS Q_UNUSED - SIGNAL - SLOT + Q_SIGNAL + Q_SLOT TRUE FALSE TQ_ARG @@ -125,8 +125,6 @@ TQ_SLOT TQ_SLOTS TQ_UNUSED - TQT_SIGNAL - TQT_SLOT connect disconnect emit diff --git a/kate/data/objectivecpp.xml b/kate/data/objectivecpp.xml index 6b8246afc..472d17bf6 100644 --- a/kate/data/objectivecpp.xml +++ b/kate/data/objectivecpp.xml @@ -124,8 +124,8 @@ Q_SIGNALS Q_SLOTS Q_UNUSED - SIGNAL - SLOT + Q_SIGNAL + Q_SLOT TRUE FALSE TQ_ARG @@ -170,8 +170,6 @@ TQ_SLOT TQ_SLOTS TQ_UNUSED - TQT_SIGNAL - TQT_SLOT connect disconnect emit diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml index 7942a6afa..d1e4ed488 100644 --- a/kate/data/qt4.xml +++ b/kate/data/qt4.xml @@ -34,8 +34,8 @@ slots foreach forever - SIGNAL - SLOT + Q_SIGNAL + Q_SLOT qApp diff --git a/kate/part/katearbitraryhighlight.cpp b/kate/part/katearbitraryhighlight.cpp index 927380979..1f526b7af 100644 --- a/kate/part/katearbitraryhighlight.cpp +++ b/kate/part/katearbitraryhighlight.cpp @@ -73,8 +73,8 @@ KateAttribute KateArbitraryHighlightRange::merge(TQPtrList range void KateArbitraryHighlight::addHighlightToDocument(KateSuperRangeList* list) { m_docHLs.append(list); - connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotRangeEliminated(KateSuperRange*))); - connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*))); + connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotRangeEliminated(KateSuperRange*))); + connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*))); } void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateView* view) @@ -84,9 +84,9 @@ void KateArbitraryHighlight::addHighlightToView(KateSuperRangeList* list, KateVi m_viewHLs[view]->append(list); - connect(list, TQT_SIGNAL(rangeEliminated(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*))); - connect(list, TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SLOT(slotTagRange(KateSuperRange*))); - connect(list, TQT_SIGNAL(destroyed(TQObject*)),TQT_SLOT(slotRangeListDeleted(TQObject*))); + connect(list, TQ_SIGNAL(rangeEliminated(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*))); + connect(list, TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SLOT(slotTagRange(KateSuperRange*))); + connect(list, TQ_SIGNAL(destroyed(TQObject*)),TQ_SLOT(slotRangeListDeleted(TQObject*))); } void KateArbitraryHighlight::slotRangeListDeleted(TQObject* obj) { diff --git a/kate/part/kateautoindent.cpp b/kate/part/kateautoindent.cpp index e39aba16c..b6abe9b84 100644 --- a/kate/part/kateautoindent.cpp +++ b/kate/part/kateautoindent.cpp @@ -161,7 +161,7 @@ KateAutoIndent::~KateAutoIndent () KateViewIndentationAction::KateViewIndentationAction(KateDocument *_doc, const TQString& text, TQObject* parent, const char* name) : TDEActionMenu (text, parent, name), doc(_doc) { - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewIndentationAction::slotAboutToShow() @@ -170,7 +170,7 @@ void KateViewIndentationAction::slotAboutToShow() popupMenu()->clear (); for (uint z=0; zinsertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQT_SLOT(setMode(int)), 0, z); + popupMenu()->insertItem ( '&' + KateAutoIndent::modeDescription(z).replace('&', "&&"), this, TQ_SLOT(setMode(int)), 0, z); popupMenu()->setItemChecked (doc->config()->indentationMode(), true); } @@ -187,7 +187,7 @@ KateNormalIndent::KateNormalIndent (KateDocument *_doc) : KateAutoIndent (_doc) { // if highlighting changes, update attributes - connect(_doc, TQT_SIGNAL(hlChanged()), this, TQT_SLOT(updateConfig())); + connect(_doc, TQ_SIGNAL(hlChanged()), this, TQ_SLOT(updateConfig())); } KateNormalIndent::~KateNormalIndent () @@ -2174,8 +2174,8 @@ KateVarIndent::KateVarIndent( KateDocument *doc ) slotVariableChanged( "var-indent-handle-couples", doc->variable( "var-indent-handle-couples" ) ); // update if a setting is changed - connect( doc, TQT_SIGNAL(variableChanged( const TQString&, const TQString&) ), - this, TQT_SLOT(slotVariableChanged( const TQString&, const TQString& )) ); + connect( doc, TQ_SIGNAL(variableChanged( const TQString&, const TQString&) ), + this, TQ_SLOT(slotVariableChanged( const TQString&, const TQString& )) ); } KateVarIndent::~KateVarIndent() diff --git a/kate/part/katebookmarks.cpp b/kate/part/katebookmarks.cpp index cc1dcf4c5..25f00d71b 100644 --- a/kate/part/katebookmarks.cpp +++ b/kate/part/katebookmarks.cpp @@ -62,7 +62,7 @@ KateBookmarks::KateBookmarks( KateView* view, Sorting sort ) , m_view( view ) , m_sorting( sort ) { - connect (view->getDoc(), TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged())); + connect (view->getDoc(), TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged())); _tries=0; m_bookmarksMenu = 0L; } @@ -75,26 +75,26 @@ void KateBookmarks::createActions( TDEActionCollection* ac ) { m_bookmarkToggle = new TDEToggleAction( i18n("Set &Bookmark"), "bookmark", CTRL+Key_B, - this, TQT_SLOT(toggleBookmark()), + this, TQ_SLOT(toggleBookmark()), ac, "bookmarks_toggle" ); m_bookmarkToggle->setWhatsThis(i18n("If a line has no bookmark then add one, otherwise remove it.")); m_bookmarkToggle->setCheckedState( i18n("Clear &Bookmark") ); m_bookmarkClear = new TDEAction( i18n("Clear &All Bookmarks"), 0, - this, TQT_SLOT(clearBookmarks()), + this, TQ_SLOT(clearBookmarks()), ac, "bookmarks_clear"); m_bookmarkClear->setWhatsThis(i18n("Remove all bookmarks of the current document.")); m_goNext = new TDEAction( i18n("Next Bookmark"), "go-next", ALT + Key_PageDown, - this, TQT_SLOT(goNext()), + this, TQ_SLOT(goNext()), ac, "bookmarks_next"); m_goNext->setWhatsThis(i18n("Go to the next bookmark.")); m_goPrevious = new TDEAction( i18n("Previous Bookmark"), "go-previous", ALT + Key_PageUp, - this, TQT_SLOT(goPrevious()), + this, TQ_SLOT(goPrevious()), ac, "bookmarks_previous"); m_goPrevious->setWhatsThis(i18n("Go to the previous bookmark.")); @@ -102,14 +102,14 @@ void KateBookmarks::createActions( TDEActionCollection* ac ) //connect the aboutToShow() and aboutToHide() signals with //the bookmarkMenuAboutToShow() and bookmarkMenuAboutToHide() slots - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(bookmarkMenuAboutToShow())); - connect( m_bookmarksMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(bookmarkMenuAboutToHide()) ); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(bookmarkMenuAboutToShow())); + connect( m_bookmarksMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(bookmarkMenuAboutToHide()) ); marksChanged (); bookmarkMenuAboutToHide(); - connect( m_view, TQT_SIGNAL( gotFocus( Kate::View * ) ), this, TQT_SLOT( slotViewGotFocus( Kate::View * ) ) ); - connect( m_view, TQT_SIGNAL( lostFocus( Kate::View * ) ), this, TQT_SLOT( slotViewLostFocus( Kate::View * ) ) ); + connect( m_view, TQ_SIGNAL( gotFocus( Kate::View * ) ), this, TQ_SLOT( slotViewGotFocus( Kate::View * ) ) ); + connect( m_view, TQ_SIGNAL( lostFocus( Kate::View * ) ), this, TQ_SLOT( slotViewLostFocus( Kate::View * ) ) ); } void KateBookmarks::toggleBookmark () @@ -181,7 +181,7 @@ void KateBookmarks::insertBookmarks( TQPopupMenu& menu ) menu.insertItem( TQString("%1 - \"%2\"").arg( (*it)->line+1 ).arg( bText ), - m_view, TQT_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx ); + m_view, TQ_SLOT(gotoLineNumber(int)), 0, (*it)->line, idx ); if ( (*it)->line < line ) { diff --git a/kate/part/katecodecompletion.cpp b/kate/part/katecodecompletion.cpp index 41d57dc29..0a3dfe771 100644 --- a/kate/part/katecodecompletion.cpp +++ b/kate/part/katecodecompletion.cpp @@ -129,11 +129,11 @@ KateCodeCompletion::KateCodeCompletion( KateView* view ) m_completionPopup->setFocusProxy( m_view->m_viewInternal ); m_pArgHint = new KateArgHint( m_view ); - connect( m_pArgHint, TQT_SIGNAL(argHintHidden()), - this, TQT_SIGNAL(argHintHidden()) ); + connect( m_pArgHint, TQ_SIGNAL(argHintHidden()), + this, TQ_SIGNAL(argHintHidden()) ); - connect( m_view, TQT_SIGNAL(cursorPositionChanged()), - this, TQT_SLOT(slotCursorPosChanged()) ); + connect( m_view, TQ_SIGNAL(cursorPositionChanged()), + this, TQ_SLOT(slotCursorPosChanged()) ); } KateCodeCompletion::~KateCodeCompletion() @@ -185,7 +185,7 @@ bool KateCodeCompletion::eventFilter( TQObject *o, TQEvent *e ) } if ( e->type() == TQEvent::MouseButtonPress ) { - TQTimer::singleShot(0, this, TQT_SLOT(showComment())); + TQTimer::singleShot(0, this, TQ_SLOT(showComment())); return false; } @@ -207,7 +207,7 @@ void KateCodeCompletion::handleKey (TQKeyEvent *e) (e->key() == Key_Home ) || (e->key() == Key_End) || (e->key() == Key_Prior) || (e->key() == Key_Next )) { - TQTimer::singleShot(0,this,TQT_SLOT(showComment())); + TQTimer::singleShot(0,this,TQ_SLOT(showComment())); TQApplication::sendEvent( m_completionListBox, (TQEvent*)e ); return; } @@ -324,7 +324,7 @@ void KateCodeCompletion::updateBox( bool ) m_completionListBox->setFocus(); m_completionPopup->show(); - TQTimer::singleShot(0,this,TQT_SLOT(showComment())); + TQTimer::singleShot(0,this,TQ_SLOT(showComment())); } void KateCodeCompletion::showArgHint ( TQStringList functionList, const TQString& strWrapping, const TQString& strDelimiter ) diff --git a/kate/part/katedialogs.cpp b/kate/part/katedialogs.cpp index a56e1a728..a77ecf8d7 100644 --- a/kate/part/katedialogs.cpp +++ b/kate/part/katedialogs.cpp @@ -117,7 +117,7 @@ KateConfigPage::KateConfigPage ( TQWidget *parent, const char *name ) : Kate::ConfigPage (parent, name) , m_changed (false) { - connect (this, TQT_SIGNAL(changed()), this, TQT_SLOT(somethingHasChanged ())); + connect (this, TQ_SIGNAL(changed()), this, TQ_SLOT(somethingHasChanged ())); } KateConfigPage::~KateConfigPage () @@ -235,27 +235,27 @@ KateIndentConfigTab::KateIndentConfigTab(TQWidget *parent) // after initial reload, connect the stuff for the changed () signal // - connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect(m_indentMode, TQT_SIGNAL(activated(int)), this, TQT_SLOT(indenterSelected(int))); + connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect(m_indentMode, TQ_SIGNAL(activated(int)), this, TQ_SLOT(indenterSelected(int))); - connect( opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(somethingToggled())); + connect( opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(somethingToggled())); - connect( opt[0], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[1], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[2], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[3], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[4], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[5], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[6], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( opt[7], TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); + connect( opt[0], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[1], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[2], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[3], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[4], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[5], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[6], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( opt[7], TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); - connect(indentationWidth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(indentationWidth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb3, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb3, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); - connect(m_configPage, TQT_SIGNAL(clicked()), this, TQT_SLOT(configPage())); + connect(m_configPage, TQ_SIGNAL(clicked()), this, TQ_SLOT(configPage())); } void KateIndentConfigTab::somethingToggled() { @@ -292,7 +292,7 @@ void KateIndentConfigTab::configPage() if (!page) return; box->setStretchFactor(page, 1); - connect( &dlg, TQT_SIGNAL(okClicked()), page, TQT_SLOT(apply()) ); + connect( &dlg, TQ_SIGNAL(okClicked()), page, TQ_SLOT(apply()) ); dlg.resize(400, 300); dlg.exec(); @@ -357,20 +357,20 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent) opt[0] = new TQCheckBox(i18n("Smart ho&me and smart end"), gbCursor); opt[0]->setChecked(configFlags & KateDocumentConfig::cfSmartHome); - connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); opt[1] = new TQCheckBox(i18n("Wrap c&ursor"), gbCursor); opt[1]->setChecked(configFlags & KateDocumentConfig::cfWrapCursor); - connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e6 = new TQCheckBox(i18n("&PageUp/PageDown moves cursor"), gbCursor); e6->setChecked(KateDocumentConfig::global()->pageUpDownMovesCursor()); - connect(e6, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(e6, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e4 = new KIntNumInput(KateViewConfig::global()->autoCenterLines(), gbCursor); e4->setRange(0, 1000000, 1, false); e4->setLabel(i18n("Autocenter cursor (lines):"), AlignVCenter); - connect(e4, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e4, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); layout->addWidget(gbCursor); @@ -416,8 +416,8 @@ KateSelectConfigTab::KateSelectConfigTab(TQWidget *parent) // after initial reload, connect the stuff for the changed () signal // - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); } void KateSelectConfigTab::apply () @@ -473,16 +473,16 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent) opt[3] = new TQCheckBox( i18n("&Insert spaces instead of tabulators"), gbWhiteSpace ); opt[3]->setChecked( configFlags & KateDocumentConfig::cfReplaceTabsDyn ); - connect( opt[3], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) ); + connect( opt[3], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) ); opt[2] = new TQCheckBox(i18n("&Show tabulators"), gbWhiteSpace); opt[2]->setChecked(configFlags & flags[2]); - connect(opt[2], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[2], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e2 = new KIntNumInput(KateDocumentConfig::global()->tabWidth(), gbWhiteSpace); e2->setRange(1, 16, 1, false); e2->setLabel(i18n("Tab width:"), AlignVCenter); - connect(e2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); mainLayout->addWidget(gbWhiteSpace); @@ -490,35 +490,35 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent) opt[0] = new TQCheckBox(i18n("Enable static &word wrap"), gbWordWrap); opt[0]->setChecked(KateDocumentConfig::global()->wordWrap()); - connect(opt[0], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[0], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); m_wwmarker = new TQCheckBox( i18n("&Show static word wrap marker (if applicable)"), gbWordWrap ); m_wwmarker->setChecked( KateRendererConfig::global()->wordWrapMarker() ); - connect(m_wwmarker, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(m_wwmarker, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e1 = new KIntNumInput(KateDocumentConfig::global()->wordWrapAt(), gbWordWrap); e1->setRange(20, 200, 1, false); e1->setLabel(i18n("Wrap words at:"), AlignVCenter); - connect(e1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); mainLayout->addWidget(gbWordWrap); opt[4] = new TQCheckBox( i18n("Remove &trailing spaces"), this ); mainLayout->addWidget( opt[4] ); opt[4]->setChecked( configFlags & KateDocumentConfig::cfRemoveTrailingDyn ); - connect( opt[4], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) ); + connect( opt[4], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) ); opt[1] = new TQCheckBox(i18n("Auto &brackets"), this); mainLayout->addWidget(opt[1]); opt[1]->setChecked(configFlags & flags[1]); - connect(opt[1], TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(opt[1], TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); e3 = new KIntNumInput(e2, KateDocumentConfig::global()->undoSteps(), this); e3->setRange(0, 1000000, 1, false); e3->setSpecialValueText( i18n("Unlimited") ); e3->setLabel(i18n("Maximum undo steps:"), AlignVCenter); mainLayout->addWidget(e3); - connect(e3, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); + connect(e3, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); TQHBoxLayout *e5Layout = new TQHBoxLayout(mainLayout); TQLabel *e5Label = new TQLabel(i18n("Smart search t&ext from:"), this); @@ -532,7 +532,7 @@ KateEditConfigTab::KateEditConfigTab(TQWidget *parent) e5->setCurrentItem(KateViewConfig::global()->textToSearchMode()); e5Layout->addWidget(e5); e5Label->setBuddy(e5); - connect(e5, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); + connect(e5, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); mainLayout->addStretch(); @@ -744,17 +744,17 @@ KateViewDefaultsConfig::KateViewDefaultsConfig(TQWidget *parent) // after initial reload, connect the stuff for the changed () signal // - connect(m_dynwrap, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_dynwrapIndicatorsCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect(m_dynwrapAlignLevel, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - connect(m_icons, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_scrollBarMarks, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_line, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_folding, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_collapseTopLevel, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged()) ); - connect(rb1, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(rb2, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect(m_showIndentLines, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); + connect(m_dynwrap, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_dynwrapIndicatorsCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect(m_dynwrapAlignLevel, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); + connect(m_icons, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_scrollBarMarks, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_line, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_folding, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_collapseTopLevel, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged()) ); + connect(rb1, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(rb2, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect(m_showIndentLines, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); } KateViewDefaultsConfig::~KateViewDefaultsConfig() @@ -821,7 +821,7 @@ void KateEditKeyConfiguration::showEvent ( TQShowEvent * ) KateView* view = (KateView*)m_doc->views().at(0); m_ac = view->editActionCollection(); m_keyChooser = new KKeyChooser( m_ac, this, false ); - connect( m_keyChooser, TQT_SIGNAL( keyChange() ), this, TQT_SLOT( slotChanged() ) ); + connect( m_keyChooser, TQ_SIGNAL( keyChange() ), this, TQ_SLOT( slotChanged() ) ); m_keyChooser->show (); m_ready = true; @@ -947,16 +947,16 @@ KateSaveConfigTab::KateSaveConfigTab( TQWidget *parent ) // after initial reload, connect the stuff for the changed () signal // - connect(m_encoding, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect(m_eol, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChanged())); - connect( allowEolDetection, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect(blockCount, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - connect(removeSpaces, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged())); - connect( cbLocalFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect( cbRemoteFiles, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( slotChanged() ) ); - connect(dirSearchDepth, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged())); - connect( leBuPrefix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( leBuSuffix, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); + connect(m_encoding, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect(m_eol, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChanged())); + connect( allowEolDetection, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect(blockCount, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); + connect(removeSpaces, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged())); + connect( cbLocalFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect( cbRemoteFiles, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( slotChanged() ) ); + connect(dirSearchDepth, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged())); + connect( leBuPrefix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( leBuSuffix, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); } void KateSaveConfigTab::apply() @@ -1131,12 +1131,12 @@ KatePartPluginConfigPage::KatePartPluginConfigPage (TQWidget *parent) : KateConf btnConfigure = new TQPushButton( i18n("Configure..."), this ); btnConfigure->setEnabled( false ); grid->addWidget( btnConfigure, 1, 0, TQt::AlignRight ); - connect( btnConfigure, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotConfigure()) ); + connect( btnConfigure, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotConfigure()) ); - connect( listView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); - connect( listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)), - this, TQT_SLOT(slotStateChanged(KatePartPluginListItem *, bool))); - connect(listView, TQT_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQT_SLOT(slotChanged())); + connect( listView, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) ); + connect( listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)), + this, TQ_SLOT(slotStateChanged(KatePartPluginListItem *, bool))); + connect(listView, TQ_SIGNAL(stateChange(KatePartPluginListItem *, bool)), this, TQ_SLOT(slotChanged())); } KatePartPluginConfigPage::~KatePartPluginConfigPage () @@ -1266,8 +1266,8 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl ); hlCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( hlCombo ); - connect( hlCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(hlChanged(int)) ); + connect( hlCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(hlChanged(int)) ); for( int i = 0; i < KateHlManager::self()->highlights(); i++) { if (KateHlManager::self()->hlSection(i).length() > 0) @@ -1312,7 +1312,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) TQToolButton *btnMTW = new TQToolButton(hbMT); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); // download/new buttons TQHBox *hbBtns = new TQHBox( this ); @@ -1321,7 +1321,7 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) ((TQBoxLayout*)hbBtns->layout())->addStretch(1); // hmm. hbBtns->setSpacing( KDialog::spacingHint() ); TQPushButton *btnDl = new TQPushButton(i18n("Do&wnload..."), hbBtns); - connect( btnDl, TQT_SIGNAL(clicked()), this, TQT_SLOT(hlDownload()) ); + connect( btnDl, TQ_SIGNAL(clicked()), this, TQ_SLOT(hlDownload()) ); int currentHl = m_doc ? m_doc->hlMode() : 0; hlCombo->setCurrentItem( currentHl ); @@ -1347,9 +1347,9 @@ KateHlConfigPage::KateHlConfigPage (TQWidget *parent, KateDocument *doc) layout->addStretch (); - connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); } KateHlConfigPage::~KateHlConfigPage () @@ -1453,8 +1453,8 @@ KateHlDownloadDialog::KateHlDownloadDialog(TQWidget *parent, const char *name, b actionButton (User1)->setIconSet(SmallIconSet("ok")); transferJob = TDEIO::get(KURL(TQString(HLDOWNLOADPATH)), true, true); - connect(transferJob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &))); + connect(transferJob, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(listDataReceived(TDEIO::Job *, const TQByteArray &))); // void data( TDEIO::Job *, const TQByteArray &data); resize(450, 400); } @@ -1616,7 +1616,7 @@ KateModOnHdPrompt::KateModOnHdPrompt( KateDocument *doc, TQPushButton *btnDiff = new TQPushButton( i18n("&View Difference"), w ); lo2->addStretch( 1 ); lo2->addWidget( btnDiff ); - connect( btnDiff, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDiff()) ); + connect( btnDiff, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDiff()) ); TQWhatsThis::add( btnDiff, i18n( "Calculates the difference between the editor contents and the disk " "file using diff(1) and opens the diff file with the default application " @@ -1639,8 +1639,8 @@ void KateModOnHdPrompt::slotDiff() KProcIO *p = new KProcIO(); p->setComm( TDEProcess::All ); *p << "diff" << "-u" << "-" << m_doc->url().path(); - connect( p, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotPDone(TDEProcess*)) ); - connect( p, TQT_SIGNAL(readReady(KProcIO*)), this, TQT_SLOT(slotPRead(KProcIO*)) ); + connect( p, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotPDone(TDEProcess*)) ); + connect( p, TQ_SIGNAL(readReady(KProcIO*)), this, TQ_SLOT(slotPRead(KProcIO*)) ); setCursor( WaitCursor ); diff --git a/kate/part/katedocument.cpp b/kate/part/katedocument.cpp index 4309386e2..1dc57a1ac 100644 --- a/kate/part/katedocument.cpp +++ b/kate/part/katedocument.cpp @@ -171,7 +171,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, setMarksUserChangable( markType01 ); m_undoMergeTimer = new TQTimer(this); - connect(m_undoMergeTimer, TQT_SIGNAL(timeout()), TQT_SLOT(undoCancel())); + connect(m_undoMergeTimer, TQ_SIGNAL(timeout()), TQ_SLOT(undoCancel())); clearMarks (); clearUndo (); @@ -189,24 +189,24 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, m_indenter->updateConfig (); // some nice signals from the buffer - connect(m_buffer, TQT_SIGNAL(tagLines(int,int)), this, TQT_SLOT(tagLines(int,int))); - connect(m_buffer, TQT_SIGNAL(codeFoldingUpdated()),this,TQT_SIGNAL(codeFoldingUpdated())); + connect(m_buffer, TQ_SIGNAL(tagLines(int,int)), this, TQ_SLOT(tagLines(int,int))); + connect(m_buffer, TQ_SIGNAL(codeFoldingUpdated()),this,TQ_SIGNAL(codeFoldingUpdated())); // if the user changes the highlight with the dialog, notify the doc - connect(KateHlManager::self(),TQT_SIGNAL(changed()),TQT_SLOT(internalHlChanged())); + connect(KateHlManager::self(),TQ_SIGNAL(changed()),TQ_SLOT(internalHlChanged())); // signal for the arbitrary HL - connect(m_arbitraryHL, TQT_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQT_SLOT(tagArbitraryLines(KateView*, KateSuperRange*))); + connect(m_arbitraryHL, TQ_SIGNAL(tagLines(KateView*, KateSuperRange*)), TQ_SLOT(tagArbitraryLines(KateView*, KateSuperRange*))); // signals for mod on hd - connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(dirty (const TQString &)), - this, TQT_SLOT(slotModOnHdDirty (const TQString &)) ); + connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(dirty (const TQString &)), + this, TQ_SLOT(slotModOnHdDirty (const TQString &)) ); - connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(created (const TQString &)), - this, TQT_SLOT(slotModOnHdCreated (const TQString &)) ); + connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(created (const TQString &)), + this, TQ_SLOT(slotModOnHdCreated (const TQString &)) ); - connect( KateFactory::self()->dirWatch(), TQT_SIGNAL(deleted (const TQString &)), - this, TQT_SLOT(slotModOnHdDeleted (const TQString &)) ); + connect( KateFactory::self()->dirWatch(), TQ_SIGNAL(deleted (const TQString &)), + this, TQ_SLOT(slotModOnHdDeleted (const TQString &)) ); // update doc name setDocName (""); @@ -220,7 +220,7 @@ KateDocument::KateDocument ( bool bSingleViewMode, bool bBrowserView, setWidget( view ); } - connect(this,TQT_SIGNAL(sigQueryClose(bool *, bool*)),this,TQT_SLOT(slotQueryClose_save(bool *, bool*))); + connect(this,TQ_SIGNAL(sigQueryClose(bool *, bool*)),this,TQ_SLOT(slotQueryClose_save(bool *, bool*))); m_isasking = 0; @@ -356,9 +356,9 @@ void KateDocument::disablePluginGUI (KTextEditor::Plugin *plugin) KTextEditor::View *KateDocument::createView( TQWidget *parent, const char *name ) { KateView* newView = new KateView( this, parent, name); - connect(newView, TQT_SIGNAL(cursorPositionChanged()), TQT_SLOT(undoCancel())); + connect(newView, TQ_SIGNAL(cursorPositionChanged()), TQ_SLOT(undoCancel())); if ( s_fileChangedDialogsActivated ) - connect( newView, TQT_SIGNAL(gotFocus( Kate::View * )), this, TQT_SLOT(slotModifiedOnDisk()) ); + connect( newView, TQ_SIGNAL(gotFocus( Kate::View * )), this, TQ_SLOT(slotModifiedOnDisk()) ); return newView; } @@ -2305,11 +2305,11 @@ bool KateDocument::openURL( const KURL &url ) m_job = TDEIO::get ( url, false, isProgressInfoEnabled() ); // connect to slots - connect( m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotDataKate( TDEIO::Job*, const TQByteArray& ) ) ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinishedKate( TDEIO::Job* ) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinishedKate( TDEIO::Job* ) ) ); TQWidget *w = widget (); if (!w && !m_views.isEmpty ()) diff --git a/kate/part/katedocumenthelpers.cpp b/kate/part/katedocumenthelpers.cpp index ff4184685..9296773d5 100644 --- a/kate/part/katedocumenthelpers.cpp +++ b/kate/part/katedocumenthelpers.cpp @@ -31,8 +31,8 @@ KateBrowserExtension::KateBrowserExtension( KateDocument* doc ) : KParts::BrowserExtension( doc, "katepartbrowserextension" ), m_doc (doc) { - connect( doc, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); + connect( doc, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); emit enableAction( "print", true ); } diff --git a/kate/part/katefiletype.cpp b/kate/part/katefiletype.cpp index 7df5b6be5..eeecce36a 100644 --- a/kate/part/katefiletype.cpp +++ b/kate/part/katefiletype.cpp @@ -273,14 +273,14 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) TQLabel *lHl = new TQLabel( i18n("&Filetype:"), hbHl ); typeCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( typeCombo ); - connect( typeCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(typeChanged(int)) ); + connect( typeCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(typeChanged(int)) ); TQPushButton *btnnew = new TQPushButton( i18n("&New"), hbHl ); - connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newType()) ); + connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newType()) ); btndel = new TQPushButton( i18n("&Delete"), hbHl ); - connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteType()) ); + connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteType()) ); gbProps = new TQGroupBox( 2, TQt::Horizontal, i18n("Properties"), this ); layout->add (gbProps); @@ -312,7 +312,7 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) TQToolButton *btnMTW = new TQToolButton(hbMT); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); TQLabel *lprio = new TQLabel( i18n("Prio&rity:"), gbProps); priority = new KIntNumInput( gbProps ); @@ -322,12 +322,12 @@ KateFileTypeConfigTab::KateFileTypeConfigTab( TQWidget *parent ) reload(); - connect( name, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( section, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( varLine, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( wildcards, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( mimetypes, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotChanged() ) ); - connect( priority, TQT_SIGNAL( valueChanged ( int ) ), this, TQT_SLOT( slotChanged() ) ); + connect( name, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( section, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( varLine, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( wildcards, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( mimetypes, TQ_SIGNAL( textChanged ( const TQString & ) ), this, TQ_SLOT( slotChanged() ) ); + connect( priority, TQ_SIGNAL( valueChanged ( int ) ), this, TQ_SLOT( slotChanged() ) ); TQWhatsThis::add( btnnew, i18n("Create a new file type.") ); TQWhatsThis::add( btndel, i18n("Delete the current file type.") ); @@ -519,9 +519,9 @@ void KateViewFileTypeAction::init() m_doc = 0; subMenus.setAutoDelete( true ); - popupMenu()->insertItem ( i18n("None"), this, TQT_SLOT(setType(int)), 0, 0); + popupMenu()->insertItem ( i18n("None"), this, TQ_SLOT(setType(int)), 0, 0); - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewFileTypeAction::updateMenu (Kate::Document *doc) @@ -551,12 +551,12 @@ void KateViewFileTypeAction::slotAboutToShow() int m = subMenusName.findIndex (hlSection); names << hlName; - subMenus.at(m)->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); + subMenus.at(m)->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0, z+1); } else if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( hlName, this, TQT_SLOT(setType(int)), 0, z+1); + popupMenu()->insertItem ( hlName, this, TQ_SLOT(setType(int)), 0, z+1); } } diff --git a/kate/part/katehighlight.cpp b/kate/part/katehighlight.cpp index 9e453aca1..1f432468d 100644 --- a/kate/part/katehighlight.cpp +++ b/kate/part/katehighlight.cpp @@ -3405,7 +3405,7 @@ void KateViewHighlightAction::init() m_doc = 0; subMenus.setAutoDelete( true ); - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewHighlightAction::updateMenu (Kate::Document *doc) @@ -3437,12 +3437,12 @@ void KateViewHighlightAction::slotAboutToShow() int m = subMenusName.findIndex (hlSection); names << hlName; - subMenus.at(m)->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); + subMenus.at(m)->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0, z); } else if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( '&' + hlName, this, TQT_SLOT(setHl(int)), 0, z); + popupMenu()->insertItem ( '&' + hlName, this, TQ_SLOT(setHl(int)), 0, z); } } } diff --git a/kate/part/kateprinter.cpp b/kate/part/kateprinter.cpp index 45fc60c25..09debacb6 100644 --- a/kate/part/kateprinter.cpp +++ b/kate/part/kateprinter.cpp @@ -719,7 +719,7 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * lo2->setStretchFactor( lFontPreview, 1 ); TQPushButton *btnChooseFont = new TQPushButton( i18n("Choo&se Font..."), this ); lo2->addWidget( btnChooseFont ); - connect( btnChooseFont, TQT_SIGNAL(clicked()), this, TQT_SLOT(setHFFont()) ); + connect( btnChooseFont, TQ_SIGNAL(clicked()), this, TQ_SLOT(setHFFont()) ); // header gbHeader = new TQGroupBox( 2, TQt::Horizontal, i18n("Header Properties"), this ); lo->addWidget( gbHeader ); @@ -764,10 +764,10 @@ KatePrintHeaderFooter::KatePrintHeaderFooter( KPrinter * /*printer*/, TQWidget * lo->addStretch( 1 ); // user friendly - connect( cbEnableHeader, TQT_SIGNAL(toggled(bool)), gbHeader, TQT_SLOT(setEnabled(bool)) ); - connect( cbEnableFooter, TQT_SIGNAL(toggled(bool)), gbFooter, TQT_SLOT(setEnabled(bool)) ); - connect( cbHeaderEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQT_SLOT(setEnabled(bool)) ); - connect( cbFooterEnableBgColor, TQT_SIGNAL(toggled(bool)), kcbtnFooterBg, TQT_SLOT(setEnabled(bool)) ); + connect( cbEnableHeader, TQ_SIGNAL(toggled(bool)), gbHeader, TQ_SLOT(setEnabled(bool)) ); + connect( cbEnableFooter, TQ_SIGNAL(toggled(bool)), gbFooter, TQ_SLOT(setEnabled(bool)) ); + connect( cbHeaderEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnHeaderBg, TQ_SLOT(setEnabled(bool)) ); + connect( cbFooterEnableBgColor, TQ_SIGNAL(toggled(bool)), kcbtnFooterBg, TQ_SLOT(setEnabled(bool)) ); // set defaults cbEnableHeader->setChecked( true ); @@ -937,7 +937,7 @@ KatePrintLayout::KatePrintLayout( KPrinter * /*printer*/, TQWidget *parent, cons kcbtnBoxColor = new KColorButton( gbBoxProps ); lBoxColor->setBuddy( kcbtnBoxColor ); - connect( cbEnableBox, TQT_SIGNAL(toggled(bool)), gbBoxProps, TQT_SLOT(setEnabled(bool)) ); + connect( cbEnableBox, TQ_SIGNAL(toggled(bool)), gbBoxProps, TQ_SLOT(setEnabled(bool)) ); lo->addStretch( 1 ); // set defaults: diff --git a/kate/part/kateschema.cpp b/kate/part/kateschema.cpp index cea62b652..6716d079d 100644 --- a/kate/part/kateschema.cpp +++ b/kate/part/kateschema.cpp @@ -310,7 +310,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char m_combobox->insertItem(i18n("Error")); // markType07 m_combobox->setCurrentItem(0); m_markers = new KColorButton(b, "marker_color_button"); - connect( m_combobox, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotComboBoxChanged( int ) ) ); + connect( m_combobox, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotComboBoxChanged( int ) ) ); blay->addWidget(gbTextArea); @@ -351,7 +351,7 @@ KateSchemaConfigColorTab::KateSchemaConfigColorTab( TQWidget *parent, const char blay->addStretch(); // connect signal changed(); changed is emitted by a ColorButton change! - connect( this, TQT_SIGNAL( changed() ), parent->parentWidget(), TQT_SLOT( slotChanged() ) ); + connect( this, TQ_SIGNAL( changed() ), parent->parentWidget(), TQ_SLOT( slotChanged() ) ); // TQWhatsThis help TQWhatsThis::add(m_back, i18n("

    Sets the background color of the editing area.

    ")); @@ -405,15 +405,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) m_schema = newSchema; // first disconnect all signals otherwise setColor emits changed - m_back ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_selected ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_current ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_bracket ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_wwmarker ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_iconborder->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_tmarker ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_markers ->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); - m_linenumber->disconnect( TQT_SIGNAL( changed( const TQColor & ) ) ); + m_back ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_selected ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_current ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_bracket ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_wwmarker ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_iconborder->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_tmarker ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_markers ->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); + m_linenumber->disconnect( TQ_SIGNAL( changed( const TQColor & ) ) ); // If we havent this schema, read in from config file if ( ! m_schemas.contains( newSchema ) ) @@ -475,15 +475,15 @@ void KateSchemaConfigColorTab::schemaChanged ( int newSchema ) } m_markers->setColor( m_schemas [ newSchema ].markerColors[ m_combobox->currentItem() ] ); - connect( m_back , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_selected , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_current , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_bracket , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_wwmarker , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_iconborder, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_tmarker , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_linenumber, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SIGNAL( changed() ) ); - connect( m_markers , TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); + connect( m_back , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_selected , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_current , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_bracket , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_wwmarker , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_iconborder, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_tmarker , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_linenumber, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SIGNAL( changed() ) ); + connect( m_markers , TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); } void KateSchemaConfigColorTab::apply () @@ -527,9 +527,9 @@ void KateSchemaConfigColorTab::slotMarkerColorChanged( const TQColor& color) void KateSchemaConfigColorTab::slotComboBoxChanged(int index) { // temporarily disconnect the changed-signal because setColor emits changed as well - m_markers->disconnect( TQT_SIGNAL( changed( const TQColor& ) ) ); + m_markers->disconnect( TQ_SIGNAL( changed( const TQColor& ) ) ); m_markers->setColor( m_schemas[m_schema].markerColors[index] ); - connect( m_markers, TQT_SIGNAL( changed( const TQColor& ) ), TQT_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); + connect( m_markers, TQ_SIGNAL( changed( const TQColor& ) ), TQ_SLOT( slotMarkerColorChanged( const TQColor& ) ) ); } //END KateSchemaConfigColorTab @@ -544,7 +544,7 @@ KateSchemaConfigFontTab::KateSchemaConfigFontTab( TQWidget *parent, const char * m_fontchooser = new TDEFontChooser ( this, 0L, false, TQStringList(), false ); grid->addWidget( m_fontchooser, 0, 0); - connect (this, TQT_SIGNAL( changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (this, TQ_SIGNAL( changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); m_schema = -1; } @@ -582,7 +582,7 @@ void KateSchemaConfigFontTab::schemaChanged( int newSchema ) m_fontchooser->disconnect ( this ); m_fontchooser->setFont ( KateFactory::self()->schemaManager()->schema( newSchema )->readFontEntry("Font", &f) ); m_fonts[ newSchema ] = m_fontchooser->font(); - connect (m_fontchooser, TQT_SIGNAL (fontSelected( const TQFont & )), this, TQT_SLOT (slotFontSelected( const TQFont & ))); + connect (m_fontchooser, TQ_SIGNAL (fontSelected( const TQFont & )), this, TQ_SLOT (slotFontSelected( const TQFont & ))); } //END FontConfig @@ -598,7 +598,7 @@ KateSchemaConfigFontColorTab::KateSchemaConfigFontColorTab( TQWidget *parent, co m_defaultStyles = new KateStyleListView( this, false ); grid->addWidget( m_defaultStyles, 0, 0); - connect (m_defaultStyles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_defaultStyles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); TQWhatsThis::add( m_defaultStyles, i18n( "This list displays the default styles for the current schema and " @@ -688,8 +688,8 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co TQLabel *lHl = new TQLabel( i18n("H&ighlight:"), hbHl ); hlCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( hlCombo ); - connect( hlCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(hlChanged(int)) ); + connect( hlCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(hlChanged(int)) ); for( int i = 0; i < KateHlManager::self()->highlights(); i++) { if (KateHlManager::self()->hlSection(i).length() > 0) @@ -715,7 +715,7 @@ KateSchemaConfigHighlightTab::KateSchemaConfigHighlightTab( TQWidget *parent, co "to edit from the popup menu.

    You can unset the Background and Selected " "Background colors from the context menu when appropriate.") ); - connect (m_styles, TQT_SIGNAL (changed()), parent->parentWidget(), TQT_SLOT (slotChanged())); + connect (m_styles, TQ_SIGNAL (changed()), parent->parentWidget(), TQ_SLOT (slotChanged())); } KateSchemaConfigHighlightTab::~KateSchemaConfigHighlightTab() @@ -833,20 +833,20 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc TQLabel *lHl = new TQLabel( i18n("&Schema:"), hbHl ); schemaCombo = new TQComboBox( false, hbHl ); lHl->setBuddy( schemaCombo ); - connect( schemaCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(schemaChanged(int)) ); + connect( schemaCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(schemaChanged(int)) ); TQPushButton *btnnew = new TQPushButton( i18n("&New..."), hbHl ); - connect( btnnew, TQT_SIGNAL(clicked()), this, TQT_SLOT(newSchema()) ); + connect( btnnew, TQ_SIGNAL(clicked()), this, TQ_SLOT(newSchema()) ); btndel = new TQPushButton( i18n("&Delete"), hbHl ); - connect( btndel, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSchema()) ); + connect( btndel, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSchema()) ); m_tabWidget = new TQTabWidget ( this ); m_tabWidget->setMargin (KDialog::marginHint()); layout->add (m_tabWidget); - connect (m_tabWidget, TQT_SIGNAL (currentChanged (TQWidget *)), this, TQT_SLOT (newCurrentPage (TQWidget *))); + connect (m_tabWidget, TQ_SIGNAL (currentChanged (TQWidget *)), this, TQ_SLOT (newCurrentPage (TQWidget *))); m_colorTab = new KateSchemaConfigColorTab (m_tabWidget); m_tabWidget->addTab (m_colorTab, i18n("Colors")); @@ -873,8 +873,8 @@ KateSchemaConfigPage::KateSchemaConfigPage( TQWidget *parent, KateDocument *doc reload(); - connect( defaultSchemaCombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChanged()) ); + connect( defaultSchemaCombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChanged()) ); } KateSchemaConfigPage::~KateSchemaConfigPage () @@ -1003,7 +1003,7 @@ void KateViewSchemaAction::init() m_view = 0; last = 0; - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewSchemaAction::updateMenu (KateView *view) @@ -1023,7 +1023,7 @@ void KateViewSchemaAction::slotAboutToShow() if (names.contains(hlName) < 1) { names << hlName; - popupMenu()->insertItem ( hlName, this, TQT_SLOT(setSchema(int)), 0, z+1); + popupMenu()->insertItem ( hlName, this, TQ_SLOT(setSchema(int)), 0, z+1); } } @@ -1060,10 +1060,10 @@ KateStyleListView::KateStyleListView( TQWidget *parent, bool showUseDefaults ) addColumn( i18n("Background Selected") ); if ( showUseDefaults ) addColumn( i18n("Use Default Style") ); - connect( this, TQT_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); - connect( this, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), - this, TQT_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); + connect( this, TQ_SIGNAL(mouseButtonPressed(int, TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT(slotMousePressed(int, TQListViewItem*, const TQPoint&, int)) ); + connect( this, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&, int)), + this, TQ_SLOT(showPopupMenu(TQListViewItem*, const TQPoint&)) ); // grap the bg color, selected color and default font normalcol = TDEGlobalSettings::textColor(); bgcol = KateRendererConfig::global()->backgroundColor(); @@ -1093,21 +1093,21 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob if ( showtitle ) m.insertTitle( i->contextName(), KateStyleListItem::ContextName ); - id = m.insertItem( i18n("&Bold"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold ); + id = m.insertItem( i18n("&Bold"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Bold ); m.setItemChecked( id, is->bold() ); - id = m.insertItem( i18n("&Italic"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic ); + id = m.insertItem( i18n("&Italic"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Italic ); m.setItemChecked( id, is->italic() ); - id = m.insertItem( i18n("&Underline"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline ); + id = m.insertItem( i18n("&Underline"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Underline ); m.setItemChecked( id, is->underline() ); - id = m.insertItem( i18n("S&trikeout"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout ); + id = m.insertItem( i18n("S&trikeout"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Strikeout ); m.setItemChecked( id, is->strikeOut() ); m.insertSeparator(); - m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color ); - m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor ); - m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor ); - m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor ); + m.insertItem( TQIconSet(cl), i18n("Normal &Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::Color ); + m.insertItem( TQIconSet(scl), i18n("&Selected Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelColor ); + m.insertItem( TQIconSet(bgcl), i18n("&Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::BgColor ); + m.insertItem( TQIconSet(sbgcl), i18n("S&elected Background Color..."), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::SelBgColor ); // Unset [some] colors. I could show one only if that button was clicked, but that // would disable setting this with the keyboard (how many aren't doing just @@ -1118,14 +1118,14 @@ void KateStyleListView::showPopupMenu( KateStyleListItem *i, const TQPoint &glob { m.insertSeparator(); if ( style->itemSet( KateAttribute::BGColor) ) - m.insertItem( i18n("Unset Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 100 ); + m.insertItem( i18n("Unset Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 100 ); if ( style->itemSet( KateAttribute::SelectedBGColor ) ) - m.insertItem( i18n("Unset Selected Background Color"), this, TQT_SLOT(unsetColor(int)), 0, 101 ); + m.insertItem( i18n("Unset Selected Background Color"), this, TQ_SLOT(unsetColor(int)), 0, 101 ); } if ( ! i->isDefault() && ! i->defStyle() ) { m.insertSeparator(); - id = m.insertItem( i18n("Use &Default Style"), this, TQT_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle ); + id = m.insertItem( i18n("Use &Default Style"), this, TQ_SLOT(mSlotPopupHandler(int)), 0, KateStyleListItem::UseDefStyle ); m.setItemChecked( id, i->defStyle() ); } m.exec( globalPos ); diff --git a/kate/part/kateschema.h b/kate/part/kateschema.h index 55f03ebee..63cc210b5 100644 --- a/kate/part/kateschema.h +++ b/kate/part/kateschema.h @@ -198,7 +198,7 @@ class KateSchemaConfigColorTab : public TQWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged) protected slots: void slotMarkerColorChanged(const TQColor&); @@ -223,7 +223,7 @@ class KateSchemaConfigFontTab : public TQWidget void schemaChanged( int newSchema ); signals: - void changed(); // connected to parentWidget()->parentWidget() TQT_SLOT(slotChanged) + void changed(); // connected to parentWidget()->parentWidget() TQ_SLOT(slotChanged) private: class TDEFontChooser *m_fontchooser; diff --git a/kate/part/katesearch.cpp b/kate/part/katesearch.cpp index 187bc2fa2..b76af856b 100644 --- a/kate/part/katesearch.cpp +++ b/kate/part/katesearch.cpp @@ -58,7 +58,7 @@ KateSearch::KateSearch( KateView* view ) m_arbitraryHLList = new KateSuperRangeList(); if (arbitraryHLExample) m_doc->arbitraryHL()->addHighlightToView(m_arbitraryHLList, m_view); - connect(replacePrompt,TQT_SIGNAL(clicked()),this,TQT_SLOT(replaceSlot())); + connect(replacePrompt,TQ_SIGNAL(clicked()),this,TQ_SLOT(replaceSlot())); } KateSearch::~KateSearch() @@ -68,13 +68,13 @@ KateSearch::~KateSearch() void KateSearch::createActions( TDEActionCollection* ac ) { - KStdAction::find( this, TQT_SLOT(find()), ac )->setWhatsThis( + KStdAction::find( this, TQ_SLOT(find()), ac )->setWhatsThis( i18n("Look up the first occurrence of a piece of text or regular expression.")); - KStdAction::findNext( this, TQT_SLOT(slotFindNext()), ac )->setWhatsThis( + KStdAction::findNext( this, TQ_SLOT(slotFindNext()), ac )->setWhatsThis( i18n("Look up the next occurrence of the search phrase.")); - KStdAction::findPrev( this, TQT_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis( + KStdAction::findPrev( this, TQ_SLOT(slotFindPrev()), ac, "edit_find_prev" )->setWhatsThis( i18n("Look up the previous occurrence of the search phrase.")); - KStdAction::replace( this, TQT_SLOT(replace()), ac )->setWhatsThis( + KStdAction::replace( this, TQ_SLOT(replace()), ac )->setWhatsThis( i18n("Look up a piece of text or regular expression and replace the result with some given text.")); } @@ -732,7 +732,7 @@ bool KateSearch::doSearch( const TQString& text ) hl->setTextColor(TQt::white); hl->setBGColor(TQt::black); // destroy the highlight upon change - connect(hl, TQT_SIGNAL(contentsChanged()), hl, TQT_SIGNAL(eliminated())); + connect(hl, TQ_SIGNAL(contentsChanged()), hl, TQ_SIGNAL(eliminated())); m_arbitraryHLList->append(hl); } diff --git a/kate/part/katespell.cpp b/kate/part/katespell.cpp index 84b4337d9..e19f4fb94 100644 --- a/kate/part/katespell.cpp +++ b/kate/part/katespell.cpp @@ -53,11 +53,11 @@ KateSpell::~KateSpell() void KateSpell::createActions( TDEActionCollection* ac ) { - KStdAction::spelling( this, TQT_SLOT(spellcheck()), ac ); - TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); + KStdAction::spelling( this, TQ_SLOT(spellcheck()), ac ); + TDEAction *a = new TDEAction( i18n("Spelling (from cursor)..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckFromCursor()), ac, "tools_spelling_from_cursor" ); a->setWhatsThis(i18n("Check the document's spelling from the cursor and forward")); - m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQT_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); + m_spellcheckSelection = new TDEAction( i18n("Spellcheck Selection..."), "tools-check-spelling", 0, this, TQ_SLOT(spellcheckSelection()), ac, "tools_spelling_selection" ); m_spellcheckSelection->setWhatsThis(i18n("Check spelling of the selected text")); } @@ -123,17 +123,17 @@ void KateSpell::spellcheck( const KateTextCursor &from, const KateTextCursor &to kdDebug(13020)<<"KateSpell::spellCheck(): using encoding: "<(d), TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(slotDeleted(TQObject*))); - connect(static_cast(d), TQT_SIGNAL(eliminated()), TQT_SLOT(slotEliminated())); - connect(static_cast(d), TQT_SIGNAL(tagRange(KateSuperRange*)), TQT_SIGNAL(tagRange(KateSuperRange*))); + connect(static_cast(d), TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(slotDeleted(TQObject*))); + connect(static_cast(d), TQ_SIGNAL(eliminated()), TQ_SLOT(slotEliminated())); + connect(static_cast(d), TQ_SIGNAL(tagRange(KateSuperRange*)), TQ_SIGNAL(tagRange(KateSuperRange*))); // HACK HACK static_cast(d)->slotTagRange(); diff --git a/kate/part/katetemplatehandler.cpp b/kate/part/katetemplatehandler.cpp index 9607f6b9a..5403d0308 100644 --- a/kate/part/katetemplatehandler.cpp +++ b/kate/part/katetemplatehandler.cpp @@ -38,7 +38,7 @@ KateTemplateHandler::KateTemplateHandler( , m_initOk( false ) , m_recursion( false ) { - connect( m_doc, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDocumentDestroyed() ) ); + connect( m_doc, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDocumentDestroyed() ) ); m_ranges = new KateSuperRangeList( false, this ); //false/*,this*/); if ( !m_doc->setTabInterceptor( this ) ) @@ -116,13 +116,13 @@ KateTemplateHandler::KateTemplateHandler( m_doc->tagLines( ( *it ) ->start().line(), ( *it ) ->end().line() ); } - /* connect(doc,TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this, - TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&))); - connect(doc,TQT_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this, - TQT_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/ - connect( doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) ); - connect( doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); - connect( doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) ); + /* connect(doc,TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)),this, + TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&))); + connect(doc,TQ_SIGNAL(charactersSemiInteractivelyInserted(int ,int ,const TQString&)),this, + TQ_SLOT(slotCharactersInteractivlyInserted(int,int,const TQString&)));*/ + connect( doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) ); + connect( doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); + connect( doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) ); ( *this ) ( TQt::Key_Tab ); } @@ -324,9 +324,9 @@ void KateTemplateHandler::slotAboutToRemoveText( const KateTextRange &range ) if ( m_doc ) { - disconnect( m_doc, TQT_SIGNAL( textInserted( int, int ) ), this, TQT_SLOT( slotTextInserted( int, int ) ) ); - disconnect( m_doc, TQT_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQT_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); - disconnect( m_doc, TQT_SIGNAL( textRemoved() ), this, TQT_SLOT( slotTextRemoved() ) ); + disconnect( m_doc, TQ_SIGNAL( textInserted( int, int ) ), this, TQ_SLOT( slotTextInserted( int, int ) ) ); + disconnect( m_doc, TQ_SIGNAL( aboutToRemoveText( const KateTextRange& ) ), this, TQ_SLOT( slotAboutToRemoveText( const KateTextRange& ) ) ); + disconnect( m_doc, TQ_SIGNAL( textRemoved() ), this, TQ_SLOT( slotTextRemoved() ) ); } deleteLater(); diff --git a/kate/part/kateview.cpp b/kate/part/kateview.cpp index abf2941c7..95e9d1eae 100644 --- a/kate/part/kateview.cpp +++ b/kate/part/kateview.cpp @@ -159,8 +159,8 @@ KateView::KateView( KateDocument *doc, TQWidget *parent, const char * name ) slotHlChanged(); /*test texthint - connect(this,TQT_SIGNAL(needTextHint(int, int, TQString &)), - this,TQT_SLOT(slotNeedTextHint(int, int, TQString &))); + connect(this,TQ_SIGNAL(needTextHint(int, int, TQString &)), + this,TQ_SLOT(slotNeedTextHint(int, int, TQString &))); enableTextHints(1000); test texthint*/ } @@ -186,22 +186,22 @@ KateView::~KateView() void KateView::setupConnections() { - connect( m_doc, TQT_SIGNAL(undoChanged()), - this, TQT_SLOT(slotNewUndo()) ); - connect( m_doc, TQT_SIGNAL(hlChanged()), - this, TQT_SLOT(slotHlChanged()) ); - connect( m_doc, TQT_SIGNAL(canceled(const TQString&)), - this, TQT_SLOT(slotSaveCanceled(const TQString&)) ); - connect( m_viewInternal, TQT_SIGNAL(dropEventPass(TQDropEvent*)), - this, TQT_SIGNAL(dropEventPass(TQDropEvent*)) ); - connect(this,TQT_SIGNAL(cursorPositionChanged()),this,TQT_SLOT(slotStatusMsg())); - connect(this,TQT_SIGNAL(newStatus()),this,TQT_SLOT(slotStatusMsg())); - connect(m_doc, TQT_SIGNAL(undoChanged()), this, TQT_SLOT(slotStatusMsg())); + connect( m_doc, TQ_SIGNAL(undoChanged()), + this, TQ_SLOT(slotNewUndo()) ); + connect( m_doc, TQ_SIGNAL(hlChanged()), + this, TQ_SLOT(slotHlChanged()) ); + connect( m_doc, TQ_SIGNAL(canceled(const TQString&)), + this, TQ_SLOT(slotSaveCanceled(const TQString&)) ); + connect( m_viewInternal, TQ_SIGNAL(dropEventPass(TQDropEvent*)), + this, TQ_SIGNAL(dropEventPass(TQDropEvent*)) ); + connect(this,TQ_SIGNAL(cursorPositionChanged()),this,TQ_SLOT(slotStatusMsg())); + connect(this,TQ_SIGNAL(newStatus()),this,TQ_SLOT(slotStatusMsg())); + connect(m_doc, TQ_SIGNAL(undoChanged()), this, TQ_SLOT(slotStatusMsg())); if ( m_doc->browserView() ) { - connect( this, TQT_SIGNAL(dropEventPass(TQDropEvent*)), - this, TQT_SLOT(slotDropEventPass(TQDropEvent*)) ); + connect( this, TQ_SIGNAL(dropEventPass(TQDropEvent*)), + this, TQ_SLOT(slotDropEventPass(TQDropEvent*)) ); } } @@ -212,84 +212,84 @@ void KateView::setupActions() m_toggleWriteLock = 0; - m_cut = a=KStdAction::cut(this, TQT_SLOT(cut()), ac); + m_cut = a=KStdAction::cut(this, TQ_SLOT(cut()), ac); a->setWhatsThis(i18n("Cut the selected text and move it to the clipboard")); - m_paste = a=KStdAction::pasteText(this, TQT_SLOT(paste()), ac); + m_paste = a=KStdAction::pasteText(this, TQ_SLOT(paste()), ac); a->setWhatsThis(i18n("Paste previously copied or cut clipboard contents")); - m_copy = a=KStdAction::copy(this, TQT_SLOT(copy()), ac); + m_copy = a=KStdAction::copy(this, TQ_SLOT(copy()), ac); a->setWhatsThis(i18n( "Use this command to copy the currently selected text to the system clipboard.")); - m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, this, TQT_SLOT(copyHTML()), ac, "edit_copy_html"); + m_copyHTML = a = new TDEAction(i18n("Copy as &HTML"), "edit-copy", 0, this, TQ_SLOT(copyHTML()), ac, "edit_copy_html"); a->setWhatsThis(i18n( "Use this command to copy the currently selected text as HTML to the system clipboard.")); if (!m_doc->readOnly()) { - a=KStdAction::save(this, TQT_SLOT(save()), ac); + a=KStdAction::save(this, TQ_SLOT(save()), ac); a->setWhatsThis(i18n("Save the current document")); - a=m_editUndo = KStdAction::undo(m_doc, TQT_SLOT(undo()), ac); + a=m_editUndo = KStdAction::undo(m_doc, TQ_SLOT(undo()), ac); a->setWhatsThis(i18n("Revert the most recent editing actions")); - a=m_editRedo = KStdAction::redo(m_doc, TQT_SLOT(redo()), ac); + a=m_editRedo = KStdAction::redo(m_doc, TQ_SLOT(redo()), ac); a->setWhatsThis(i18n("Revert the most recent undo operation")); - (new TDEAction(i18n("&Word Wrap Document"), "", 0, this, TQT_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( + (new TDEAction(i18n("&Word Wrap Document"), "", 0, this, TQ_SLOT(applyWordWrap()), ac, "tools_apply_wordwrap"))->setWhatsThis( i18n("Use this command to wrap all lines of the current document which are longer than the width of the" " current view, to fit into this view.

    This is a static word wrap, meaning it is not updated" " when the view is resized.")); // setup Tools menu - a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, this, TQT_SLOT(indent()), ac, "tools_indent"); + a=new TDEAction(i18n("&Indent"), "format-indent-more", TQt::CTRL+TQt::Key_I, this, TQ_SLOT(indent()), ac, "tools_indent"); a->setWhatsThis(i18n("Use this to indent a selected block of text.

    " "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, this, TQT_SLOT(unIndent()), ac, "tools_unindent"); + a=new TDEAction(i18n("&Unindent"), "format-indent-less", TQt::CTRL+TQt::SHIFT+TQt::Key_I, this, TQ_SLOT(unIndent()), ac, "tools_unindent"); a->setWhatsThis(i18n("Use this to unindent a selected block of text.")); - a=new TDEAction(i18n("&Clean Indentation"), 0, this, TQT_SLOT(cleanIndent()), ac, "tools_cleanIndent"); + a=new TDEAction(i18n("&Clean Indentation"), 0, this, TQ_SLOT(cleanIndent()), ac, "tools_cleanIndent"); a->setWhatsThis(i18n("Use this to clean the indentation of a selected block of text (only tabs/only spaces)

    " "You can configure whether tabs should be honored and used or replaced with spaces, in the configuration dialog.")); - a=new TDEAction(i18n("&Align"), 0, this, TQT_SLOT(align()), ac, "tools_align"); + a=new TDEAction(i18n("&Align"), 0, this, TQ_SLOT(align()), ac, "tools_align"); a->setWhatsThis(i18n("Use this to align the current line or block of text to its proper indent level.")); - a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, this, TQT_SLOT(comment()), + a=new TDEAction(i18n("C&omment"), CTRL+TQt::Key_D, this, TQ_SLOT(comment()), ac, "tools_comment"); a->setWhatsThis(i18n("This command comments out the current line or a selected block of text.

    " "The characters for single/multiple line comments are defined within the language's highlighting.")); - a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, this, TQT_SLOT(uncomment()), + a=new TDEAction(i18n("Unco&mment"), CTRL+SHIFT+TQt::Key_D, this, TQ_SLOT(uncomment()), ac, "tools_uncomment"); a->setWhatsThis(i18n("This command removes comments from the current line or a selected block of text.

    " "The characters for single/multiple line comments are defined within the language's highlighting.")); a = m_toggleWriteLock = new TDEToggleAction( i18n("&Read Only Mode"), 0, 0, - this, TQT_SLOT( toggleWriteLock() ), + this, TQ_SLOT( toggleWriteLock() ), ac, "tools_toggle_write_lock" ); a->setWhatsThis( i18n("Lock/unlock the document for writing") ); a = new TDEAction( i18n("Uppercase"), CTRL + TQt::Key_U, this, - TQT_SLOT(uppercase()), ac, "tools_uppercase" ); + TQ_SLOT(uppercase()), ac, "tools_uppercase" ); a->setWhatsThis( i18n("Convert the selection to uppercase, or the character to the " "right of the cursor if no text is selected.") ); a = new TDEAction( i18n("Lowercase"), CTRL + SHIFT + TQt::Key_U, this, - TQT_SLOT(lowercase()), ac, "tools_lowercase" ); + TQ_SLOT(lowercase()), ac, "tools_lowercase" ); a->setWhatsThis( i18n("Convert the selection to lowercase, or the character to the " "right of the cursor if no text is selected.") ); a = new TDEAction( i18n("Capitalize"), CTRL + ALT + TQt::Key_U, this, - TQT_SLOT(capitalize()), ac, "tools_capitalize" ); + TQ_SLOT(capitalize()), ac, "tools_capitalize" ); a->setWhatsThis( i18n("Capitalize the selection, or the word under the " "cursor if no text is selected.") ); a = new TDEAction( i18n("Delete Line"), 0, this, - TQT_SLOT( killLine() ), ac, "tools_delete_line"); + TQ_SLOT( killLine() ), ac, "tools_delete_line"); a->setWhatsThis(i18n("Use this to delete the current line.")); a = new TDEAction( i18n("Join Lines"), CTRL + TQt::Key_J, this, - TQT_SLOT( joinLines() ), ac, "tools_join_lines" ); + TQ_SLOT( joinLines() ), ac, "tools_join_lines" ); a->setWhatsThis(i18n("Use this to join lines together.")); } else @@ -300,19 +300,19 @@ void KateView::setupActions() m_editRedo = 0; } - a=KStdAction::print( m_doc, TQT_SLOT(print()), ac ); + a=KStdAction::print( m_doc, TQ_SLOT(print()), ac ); a->setWhatsThis(i18n("Print the current document.")); - a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), this, TQT_SLOT(reloadFile()), ac, "file_reload"); + a=new TDEAction(i18n("Reloa&d"), "reload", TDEStdAccel::reload(), this, TQ_SLOT(reloadFile()), ac, "file_reload"); a->setWhatsThis(i18n("Reload the current document from disk.")); - a=KStdAction::saveAs(this, TQT_SLOT(saveAs()), ac); + a=KStdAction::saveAs(this, TQ_SLOT(saveAs()), ac); a->setWhatsThis(i18n("Save the current document to disk, with a name of your choice.")); - a=KStdAction::gotoLine(this, TQT_SLOT(gotoLine()), ac); + a=KStdAction::gotoLine(this, TQ_SLOT(gotoLine()), ac); a->setWhatsThis(i18n("This command opens a dialog and lets you choose a line that you want the cursor to move to.")); - a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQT_SLOT(configDialog()),ac, "set_confdlg"); + a=new TDEAction(i18n("&Configure Editor..."), 0, m_doc, TQ_SLOT(configDialog()),ac, "set_confdlg"); a->setWhatsThis(i18n("Configure various aspects of this editor.")); KateViewHighlightAction *menu = new KateViewHighlightAction (i18n("&Highlighting"), ac, "set_highlight"); @@ -329,45 +329,45 @@ void KateView::setupActions() new KateViewIndentationAction (m_doc, i18n("&Indentation"),ac,"tools_indentation"); // html export - a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, this, TQT_SLOT(exportAsHTML()), ac, "file_export_html"); + a = new TDEAction(i18n("E&xport as HTML..."), 0, 0, this, TQ_SLOT(exportAsHTML()), ac, "file_export_html"); a->setWhatsThis(i18n("This command allows you to export the current document" " with all highlighting information into a HTML document.")); - m_selectAll = a=KStdAction::selectAll(this, TQT_SLOT(selectAll()), ac); + m_selectAll = a=KStdAction::selectAll(this, TQ_SLOT(selectAll()), ac); a->setWhatsThis(i18n("Select the entire text of the current document.")); - m_deSelect = a=KStdAction::deselect(this, TQT_SLOT(clearSelection()), ac); + m_deSelect = a=KStdAction::deselect(this, TQ_SLOT(clearSelection()), ac); a->setWhatsThis(i18n("If you have selected something within the current document, this will no longer be selected.")); - a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, m_viewInternal, TQT_SLOT(slotIncFontSizes()), ac, "incFontSizes"); + a=new TDEAction(i18n("Enlarge Font"), "zoom-in", 0, m_viewInternal, TQ_SLOT(slotIncFontSizes()), ac, "incFontSizes"); a->setWhatsThis(i18n("This increases the display font size.")); - a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, m_viewInternal, TQT_SLOT(slotDecFontSizes()), ac, "decFontSizes"); + a=new TDEAction(i18n("Shrink Font"), "zoom-out", 0, m_viewInternal, TQ_SLOT(slotDecFontSizes()), ac, "decFontSizes"); a->setWhatsThis(i18n("This decreases the display font size.")); a= m_toggleBlockSelection = new TDEToggleAction( i18n("Bl&ock Selection Mode"), CTRL + SHIFT + Key_B, - this, TQT_SLOT(toggleBlockSelectionMode()), + this, TQ_SLOT(toggleBlockSelectionMode()), ac, "set_verticalSelect"); a->setWhatsThis(i18n("This command allows switching between the normal (line based) selection mode and the block selection mode.")); a= m_toggleInsert = new TDEToggleAction( i18n("Overwr&ite Mode"), Key_Insert, - this, TQT_SLOT(toggleInsert()), + this, TQ_SLOT(toggleInsert()), ac, "set_insert" ); a->setWhatsThis(i18n("Choose whether you want the text you type to be inserted or to overwrite existing text.")); TDEToggleAction *toggleAction; a= m_toggleDynWrap = toggleAction = new TDEToggleAction( i18n("&Dynamic Word Wrap"), Key_F10, - this, TQT_SLOT(toggleDynWordWrap()), + this, TQ_SLOT(toggleDynWordWrap()), ac, "view_dynamic_word_wrap" ); a->setWhatsThis(i18n("If this option is checked, the text lines will be wrapped at the view border on the screen.")); a= m_setDynWrapIndicators = new TDESelectAction(i18n("Dynamic Word Wrap Indicators"), 0, ac, "dynamic_word_wrap_indicators"); a->setWhatsThis(i18n("Choose when the Dynamic Word Wrap Indicators should be displayed")); - connect(m_setDynWrapIndicators, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDynWrapIndicators(int))); + connect(m_setDynWrapIndicators, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDynWrapIndicators(int))); TQStringList list2; list2.append(i18n("&Off")); list2.append(i18n("Follow &Line Numbers")); @@ -376,14 +376,14 @@ void KateView::setupActions() a= toggleAction=m_toggleFoldingMarkers = new TDEToggleAction( i18n("Show Folding &Markers"), Key_F9, - this, TQT_SLOT(toggleFoldingMarkers()), + this, TQ_SLOT(toggleFoldingMarkers()), ac, "view_folding_markers" ); a->setWhatsThis(i18n("You can choose if the codefolding marks should be shown, if codefolding is possible.")); toggleAction->setCheckedState(i18n("Hide Folding &Markers")); a= m_toggleIconBar = toggleAction = new TDEToggleAction( i18n("Show &Icon Border"), Key_F6, - this, TQT_SLOT(toggleIconBorder()), + this, TQ_SLOT(toggleIconBorder()), ac, "view_border"); a=toggleAction; a->setWhatsThis(i18n("Show/hide the icon border.

    The icon border shows bookmark symbols, for instance.")); @@ -391,21 +391,21 @@ void KateView::setupActions() a= toggleAction=m_toggleLineNumbers = new TDEToggleAction( i18n("Show &Line Numbers"), Key_F11, - this, TQT_SLOT(toggleLineNumbersOn()), + this, TQ_SLOT(toggleLineNumbersOn()), ac, "view_line_numbers" ); a->setWhatsThis(i18n("Show/hide the line numbers on the left hand side of the view.")); toggleAction->setCheckedState(i18n("Hide &Line Numbers")); a= m_toggleScrollBarMarks = toggleAction = new TDEToggleAction( i18n("Show Scroll&bar Marks"), 0, - this, TQT_SLOT(toggleScrollBarMarks()), + this, TQ_SLOT(toggleScrollBarMarks()), ac, "view_scrollbar_marks"); a->setWhatsThis(i18n("Show/hide the marks on the vertical scrollbar.

    The marks, for instance, show bookmarks.")); toggleAction->setCheckedState(i18n("Hide Scroll&bar Marks")); a = toggleAction = m_toggleWWMarker = new TDEToggleAction( i18n("Show Static &Word Wrap Marker"), 0, - this, TQT_SLOT( toggleWWMarker() ), + this, TQ_SLOT( toggleWWMarker() ), ac, "view_word_wrap_marker" ); a->setWhatsThis( i18n( "Show/hide the Word Wrap Marker, a vertical line drawn at the word " @@ -414,7 +414,7 @@ void KateView::setupActions() a= m_switchCmdLine = new TDEAction( i18n("Switch to Command Line"), Key_F7, - this, TQT_SLOT(switchToCmdLine()), + this, TQ_SLOT(switchToCmdLine()), ac, "switch_to_cmd_line" ); a->setWhatsThis(i18n("Show/hide the command line on the bottom of the view.")); @@ -426,7 +426,7 @@ void KateView::setupActions() list.append("&Macintosh"); m_setEndOfLine->setItems(list); m_setEndOfLine->setCurrentItem (m_doc->config()->eol()); - connect(m_setEndOfLine, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setEol(int))); + connect(m_setEndOfLine, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setEol(int))); // encoding menu new KateViewEncodingAction (m_doc, this, i18n("E&ncoding"), ac, "set_encoding"); @@ -437,7 +437,7 @@ void KateView::setupActions() slotSelectionChanged (); - connect (this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotSelectionChanged())); + connect (this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotSelectionChanged())); } void KateView::setupEditActions() @@ -447,134 +447,134 @@ void KateView::setupEditActions() new TDEAction( i18n("Move Word Left"), CTRL + Key_Left, - this,TQT_SLOT(wordLeft()), + this,TQ_SLOT(wordLeft()), ac, "word_left" ); new TDEAction( i18n("Select Character Left"), SHIFT + Key_Left, - this,TQT_SLOT(shiftCursorLeft()), + this,TQ_SLOT(shiftCursorLeft()), ac, "select_char_left" ); new TDEAction( i18n("Select Word Left"), SHIFT + CTRL + Key_Left, - this, TQT_SLOT(shiftWordLeft()), + this, TQ_SLOT(shiftWordLeft()), ac, "select_word_left" ); new TDEAction( i18n("Move Word Right"), CTRL + Key_Right, - this, TQT_SLOT(wordRight()), + this, TQ_SLOT(wordRight()), ac, "word_right" ); new TDEAction( i18n("Select Character Right"), SHIFT + Key_Right, - this, TQT_SLOT(shiftCursorRight()), + this, TQ_SLOT(shiftCursorRight()), ac, "select_char_right" ); new TDEAction( i18n("Select Word Right"), SHIFT + CTRL + Key_Right, - this,TQT_SLOT(shiftWordRight()), + this,TQ_SLOT(shiftWordRight()), ac, "select_word_right" ); new TDEAction( i18n("Move to Beginning of Line"), Key_Home, - this, TQT_SLOT(home()), + this, TQ_SLOT(home()), ac, "beginning_of_line" ); new TDEAction( i18n("Move to Beginning of Document"), TDEStdAccel::home(), - this, TQT_SLOT(top()), + this, TQ_SLOT(top()), ac, "beginning_of_document" ); new TDEAction( i18n("Select to Beginning of Line"), SHIFT + Key_Home, - this, TQT_SLOT(shiftHome()), + this, TQ_SLOT(shiftHome()), ac, "select_beginning_of_line" ); new TDEAction( i18n("Select to Beginning of Document"), SHIFT + CTRL + Key_Home, - this, TQT_SLOT(shiftTop()), + this, TQ_SLOT(shiftTop()), ac, "select_beginning_of_document" ); new TDEAction( i18n("Move to End of Line"), Key_End, - this, TQT_SLOT(end()), + this, TQ_SLOT(end()), ac, "end_of_line" ); new TDEAction( i18n("Move to End of Document"), TDEStdAccel::end(), - this, TQT_SLOT(bottom()), + this, TQ_SLOT(bottom()), ac, "end_of_document" ); new TDEAction( i18n("Select to End of Line"), SHIFT + Key_End, - this, TQT_SLOT(shiftEnd()), + this, TQ_SLOT(shiftEnd()), ac, "select_end_of_line" ); new TDEAction( i18n("Select to End of Document"), SHIFT + CTRL + Key_End, - this, TQT_SLOT(shiftBottom()), + this, TQ_SLOT(shiftBottom()), ac, "select_end_of_document" ); new TDEAction( i18n("Select to Previous Line"), SHIFT + Key_Up, - this, TQT_SLOT(shiftUp()), + this, TQ_SLOT(shiftUp()), ac, "select_line_up" ); new TDEAction( i18n("Scroll Line Up"),"", CTRL + Key_Up, - this, TQT_SLOT(scrollUp()), + this, TQ_SLOT(scrollUp()), ac, "scroll_line_up" ); - new TDEAction(i18n("Move to Next Line"), Key_Down, this, TQT_SLOT(down()), + new TDEAction(i18n("Move to Next Line"), Key_Down, this, TQ_SLOT(down()), ac, "move_line_down"); - new TDEAction(i18n("Move to Previous Line"), Key_Up, this, TQT_SLOT(up()), + new TDEAction(i18n("Move to Previous Line"), Key_Up, this, TQ_SLOT(up()), ac, "move_line_up"); new TDEAction(i18n("Move Character Right"), Key_Right, this, - TQT_SLOT(cursorRight()), ac, "move_cursor_right"); + TQ_SLOT(cursorRight()), ac, "move_cursor_right"); - new TDEAction(i18n("Move Character Left"), Key_Left, this, TQT_SLOT(cursorLeft()), + new TDEAction(i18n("Move Character Left"), Key_Left, this, TQ_SLOT(cursorLeft()), ac, "move_cusor_left"); new TDEAction( i18n("Select to Next Line"), SHIFT + Key_Down, - this, TQT_SLOT(shiftDown()), + this, TQ_SLOT(shiftDown()), ac, "select_line_down" ); new TDEAction( i18n("Scroll Line Down"), CTRL + Key_Down, - this, TQT_SLOT(scrollDown()), + this, TQ_SLOT(scrollDown()), ac, "scroll_line_down" ); new TDEAction( i18n("Scroll Page Up"), TDEStdAccel::prior(), - this, TQT_SLOT(pageUp()), + this, TQ_SLOT(pageUp()), ac, "scroll_page_up" ); new TDEAction( i18n("Select Page Up"), SHIFT + Key_PageUp, - this, TQT_SLOT(shiftPageUp()), + this, TQ_SLOT(shiftPageUp()), ac, "select_page_up" ); new TDEAction( i18n("Move to Top of View"), CTRL + Key_PageUp, - this, TQT_SLOT(topOfView()), + this, TQ_SLOT(topOfView()), ac, "move_top_of_view" ); new TDEAction( i18n("Select to Top of View"), CTRL + SHIFT + Key_PageUp, - this, TQT_SLOT(shiftTopOfView()), + this, TQ_SLOT(shiftTopOfView()), ac, "select_top_of_view" ); new TDEAction( i18n("Scroll Page Down"), TDEStdAccel::next(), - this, TQT_SLOT(pageDown()), + this, TQ_SLOT(pageDown()), ac, "scroll_page_down" ); new TDEAction( i18n("Select Page Down"), SHIFT + Key_PageDown, - this, TQT_SLOT(shiftPageDown()), + this, TQ_SLOT(shiftPageDown()), ac, "select_page_down" ); new TDEAction( i18n("Move to Bottom of View"), CTRL + Key_PageDown, - this, TQT_SLOT(bottomOfView()), + this, TQ_SLOT(bottomOfView()), ac, "move_bottom_of_view" ); new TDEAction( i18n("Select to Bottom of View"), CTRL + SHIFT + Key_PageDown, - this, TQT_SLOT(shiftBottomOfView()), + this, TQ_SLOT(shiftBottomOfView()), ac, "select_bottom_of_view" ); new TDEAction( i18n("Move to Matching Bracket"), CTRL + Key_6, - this, TQT_SLOT(toMatchingBracket()), + this, TQ_SLOT(toMatchingBracket()), ac, "to_matching_bracket" ); new TDEAction( i18n("Select to Matching Bracket"), SHIFT + CTRL + Key_6, - this, TQT_SLOT(shiftToMatchingBracket()), + this, TQ_SLOT(shiftToMatchingBracket()), ac, "select_matching_bracket" ); // anders: shortcuts doing any changes should not be created in browserextension @@ -582,40 +582,40 @@ void KateView::setupEditActions() { new TDEAction( i18n("Transpose Characters"), CTRL + Key_T, - this, TQT_SLOT(transpose()), + this, TQ_SLOT(transpose()), ac, "transpose_char" ); new TDEAction( i18n("Delete Line"), CTRL + Key_K, - this, TQT_SLOT(killLine()), + this, TQ_SLOT(killLine()), ac, "delete_line" ); new TDEAction( i18n("Delete Word Left"), TDEStdAccel::deleteWordBack(), - this, TQT_SLOT(deleteWordLeft()), + this, TQ_SLOT(deleteWordLeft()), ac, "delete_word_left" ); new TDEAction( i18n("Delete Word Right"), TDEStdAccel::deleteWordForward(), - this, TQT_SLOT(deleteWordRight()), + this, TQ_SLOT(deleteWordRight()), ac, "delete_word_right" ); new TDEAction(i18n("Delete Next Character"), Key_Delete, - this, TQT_SLOT(keyDelete()), + this, TQ_SLOT(keyDelete()), ac, "delete_next_character"); TDEAction *a = new TDEAction(i18n("Backspace"), Key_Backspace, - this, TQT_SLOT(backspace()), + this, TQ_SLOT(backspace()), ac, "backspace"); TDEShortcut cut = a->shortcut(); cut.append( KKey( SHIFT + Key_Backspace ) ); a->setShortcut( cut ); } - connect( this, TQT_SIGNAL(gotFocus(Kate::View*)), - this, TQT_SLOT(slotGotFocus()) ); - connect( this, TQT_SIGNAL(lostFocus(Kate::View*)), - this, TQT_SLOT(slotLostFocus()) ); + connect( this, TQ_SIGNAL(gotFocus(Kate::View*)), + this, TQ_SLOT(slotGotFocus()) ); + connect( this, TQ_SIGNAL(lostFocus(Kate::View*)), + this, TQ_SLOT(slotLostFocus()) ); m_editActions->readShortcutSettings( "Katepart Shortcuts" ); @@ -631,18 +631,18 @@ void KateView::setupCodeFolding() { TDEActionCollection *ac=this->actionCollection(); new TDEAction( i18n("Collapse Toplevel"), CTRL+SHIFT+Key_Minus, - m_doc->foldingTree(),TQT_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); + m_doc->foldingTree(),TQ_SLOT(collapseToplevelNodes()),ac,"folding_toplevel"); new TDEAction( i18n("Expand Toplevel"), CTRL+SHIFT+Key_Plus, - this,TQT_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); + this,TQ_SLOT(slotExpandToplevel()),ac,"folding_expandtoplevel"); new TDEAction( i18n("Collapse One Local Level"), CTRL+Key_Minus, - this,TQT_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); + this,TQ_SLOT(slotCollapseLocal()),ac,"folding_collapselocal"); new TDEAction( i18n("Expand One Local Level"), CTRL+Key_Plus, - this,TQT_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); + this,TQ_SLOT(slotExpandLocal()),ac,"folding_expandlocal"); #ifdef DEBUGACCELS TDEAccel* debugAccels = new TDEAccel(this,this); - debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQT_SLOT(dumpRegionTree())); - debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQT_SLOT(testTemplateCode())); + debugAccels->insert("KATE_DUMP_REGION_TREE",i18n("Show the code folding region tree"),"","Ctrl+Shift+Alt+D",m_doc,TQ_SLOT(dumpRegionTree())); + debugAccels->insert("KATE_TEMPLATE_TEST",i18n("Basic template code test"),"","Ctrl+Shift+Alt+T",m_doc,TQ_SLOT(testTemplateCode())); debugAccels->setEnabled(true); #endif } @@ -669,16 +669,16 @@ void KateView::slotExpandLocal() void KateView::setupCodeCompletion() { m_codeCompletion = new KateCodeCompletion(this); - connect( m_codeCompletion, TQT_SIGNAL(completionAborted()), - this, TQT_SIGNAL(completionAborted())); - connect( m_codeCompletion, TQT_SIGNAL(completionDone()), - this, TQT_SIGNAL(completionDone())); - connect( m_codeCompletion, TQT_SIGNAL(argHintHidden()), - this, TQT_SIGNAL(argHintHidden())); - connect( m_codeCompletion, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry)), - this, TQT_SIGNAL(completionDone(KTextEditor::CompletionEntry))); - connect( m_codeCompletion, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), - this, TQT_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); + connect( m_codeCompletion, TQ_SIGNAL(completionAborted()), + this, TQ_SIGNAL(completionAborted())); + connect( m_codeCompletion, TQ_SIGNAL(completionDone()), + this, TQ_SIGNAL(completionDone())); + connect( m_codeCompletion, TQ_SIGNAL(argHintHidden()), + this, TQ_SIGNAL(argHintHidden())); + connect( m_codeCompletion, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry)), + this, TQ_SIGNAL(completionDone(KTextEditor::CompletionEntry))); + connect( m_codeCompletion, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*)), + this, TQ_SIGNAL(filterInsertString(KTextEditor::CompletionEntry*,TQString*))); } void KateView::slotGotFocus() diff --git a/kate/part/kateviewhelpers.cpp b/kate/part/kateviewhelpers.cpp index eb09efe41..872e7467c 100644 --- a/kate/part/kateviewhelpers.cpp +++ b/kate/part/kateviewhelpers.cpp @@ -65,8 +65,8 @@ KateScrollBar::KateScrollBar (Orientation orientation, KateViewInternal* parent, , m_savVisibleLines(0) , m_showMarks(false) { - connect(this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(sliderMaybeMoved(int))); - connect(m_doc, TQT_SIGNAL(marksChanged()), this, TQT_SLOT(marksChanged())); + connect(this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(sliderMaybeMoved(int))); + connect(m_doc, TQ_SIGNAL(marksChanged()), this, TQ_SLOT(marksChanged())); m_lines.setAutoDelete(true); } @@ -295,8 +295,8 @@ KateCmdLine::KateCmdLine (KateView *view) , m_command( 0L ) , m_oldCompletionObject( 0L ) { - connect (this, TQT_SIGNAL(returnPressed(const TQString &)), - this, TQT_SLOT(slotReturnPressed(const TQString &))); + connect (this, TQ_SIGNAL(returnPressed(const TQString &)), + this, TQ_SLOT(slotReturnPressed(const TQString &))); completionObject()->insertItems (KateCmd::self()->cmds()); setAutoDeleteCompletionObject( false ); @@ -375,7 +375,7 @@ void KateCmdLine::slotReturnPressed ( const TQString& text ) m_cmdend = 0; m_view->setFocus (); - TQTimer::singleShot( 4000, this, TQT_SLOT(hideMe()) ); + TQTimer::singleShot( 4000, this, TQ_SLOT(hideMe()) ); } void KateCmdLine::hideMe () // unless i have focus ;) @@ -716,7 +716,7 @@ void KateIconBorder::setIconBorderOn( bool enable ) updateGeometry(); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } void KateIconBorder::setLineNumbersOn( bool enable ) @@ -729,7 +729,7 @@ void KateIconBorder::setLineNumbersOn( bool enable ) updateGeometry(); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } void KateIconBorder::setDynWrapIndicators( int state ) @@ -742,7 +742,7 @@ void KateIconBorder::setDynWrapIndicators( int state ) updateGeometry (); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } void KateIconBorder::setFoldingMarkersOn( bool enable ) @@ -754,7 +754,7 @@ void KateIconBorder::setFoldingMarkersOn( bool enable ) updateGeometry(); - TQTimer::singleShot( 0, this, TQT_SLOT(update()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(update()) ); } TQSize KateIconBorder::sizeHint() const @@ -1170,7 +1170,7 @@ void KateIconBorder::showMarkMenu( uint line, const TQPoint& pos ) KateViewEncodingAction::KateViewEncodingAction(KateDocument *_doc, KateView *_view, const TQString& text, TQObject* parent, const char* name) : TDEActionMenu (text, parent, name), doc(_doc), view (_view) { - connect(popupMenu(),TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(slotAboutToShow())); + connect(popupMenu(),TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(slotAboutToShow())); } void KateViewEncodingAction::slotAboutToShow() @@ -1180,7 +1180,7 @@ void KateViewEncodingAction::slotAboutToShow() popupMenu()->clear (); for (uint z=0; zinsertItem ( modes[z], this, TQT_SLOT(setMode(int)), 0, z); + popupMenu()->insertItem ( modes[z], this, TQ_SLOT(setMode(int)), 0, z); bool found = false; TQTextCodec *codecForEnc = TDEGlobal::charsets()->codecForName(TDEGlobal::charsets()->encodingForName(modes[z]), found); diff --git a/kate/part/kateviewinternal.cpp b/kate/part/kateviewinternal.cpp index 8a1ab6f05..0f12f8562 100644 --- a/kate/part/kateviewinternal.cpp +++ b/kate/part/kateviewinternal.cpp @@ -116,14 +116,14 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) m_lineLayout->addWidget(m_dummy); // Hijack the line scroller's controls, so we can scroll nicely for word-wrap - connect(m_lineScroll, TQT_SIGNAL(prevPage()), TQT_SLOT(scrollPrevPage())); - connect(m_lineScroll, TQT_SIGNAL(nextPage()), TQT_SLOT(scrollNextPage())); + connect(m_lineScroll, TQ_SIGNAL(prevPage()), TQ_SLOT(scrollPrevPage())); + connect(m_lineScroll, TQ_SIGNAL(nextPage()), TQ_SLOT(scrollNextPage())); - connect(m_lineScroll, TQT_SIGNAL(prevLine()), TQT_SLOT(scrollPrevLine())); - connect(m_lineScroll, TQT_SIGNAL(nextLine()), TQT_SLOT(scrollNextLine())); + connect(m_lineScroll, TQ_SIGNAL(prevLine()), TQ_SLOT(scrollPrevLine())); + connect(m_lineScroll, TQ_SIGNAL(nextLine()), TQ_SLOT(scrollNextLine())); - connect(m_lineScroll, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(scrollLines(int))); - connect(m_lineScroll, TQT_SIGNAL(sliderMMBMoved(int)), TQT_SLOT(scrollLines(int))); + connect(m_lineScroll, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(scrollLines(int))); + connect(m_lineScroll, TQ_SIGNAL(sliderMMBMoved(int)), TQ_SLOT(scrollLines(int))); // catch wheel events, completing the hijack m_lineScroll->installEventFilter(this); @@ -142,8 +142,8 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) m_columnScroll->setTracking(true); m_startX = 0; - connect( m_columnScroll, TQT_SIGNAL( valueChanged (int) ), - this, TQT_SLOT( scrollColumns (int) ) ); + connect( m_columnScroll, TQ_SIGNAL( valueChanged (int) ), + this, TQ_SLOT( scrollColumns (int) ) ); // // iconborder ;) @@ -151,13 +151,13 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) leftBorder = new KateIconBorder( this, m_view ); leftBorder->show (); - connect( leftBorder, TQT_SIGNAL(toggleRegionVisibility(unsigned int)), - m_doc->foldingTree(), TQT_SLOT(toggleRegionVisibility(unsigned int))); + connect( leftBorder, TQ_SIGNAL(toggleRegionVisibility(unsigned int)), + m_doc->foldingTree(), TQ_SLOT(toggleRegionVisibility(unsigned int))); - connect( doc->foldingTree(), TQT_SIGNAL(regionVisibilityChangedAt(unsigned int)), - this, TQT_SLOT(slotRegionVisibilityChangedAt(unsigned int))); - connect( doc, TQT_SIGNAL(codeFoldingUpdated()), - this, TQT_SLOT(slotCodeFoldingChanged()) ); + connect( doc->foldingTree(), TQ_SIGNAL(regionVisibilityChangedAt(unsigned int)), + this, TQ_SLOT(slotRegionVisibilityChangedAt(unsigned int))); + connect( doc, TQ_SIGNAL(codeFoldingUpdated()), + this, TQ_SLOT(slotCodeFoldingChanged()) ); displayCursor.setPos(0, 0); cursor.setPos(0, 0); @@ -182,21 +182,21 @@ KateViewInternal::KateViewInternal(KateView *view, KateDocument *doc) dragInfo.state = diNone; // timers - connect( &m_dragScrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( doDragScroll() ) ); + connect( &m_dragScrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( doDragScroll() ) ); - connect( &m_scrollTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( scrollTimeout() ) ); + connect( &m_scrollTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( scrollTimeout() ) ); - connect( &m_cursorTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( cursorTimeout() ) ); + connect( &m_cursorTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( cursorTimeout() ) ); - connect( &m_textHintTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( textHintTimeout() ) ); + connect( &m_textHintTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( textHintTimeout() ) ); // selection changed to set anchor - connect( m_view, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( viewSelectionChanged() ) ); + connect( m_view, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( viewSelectionChanged() ) ); // this is a work arround for RTL desktops @@ -2902,7 +2902,7 @@ void KateViewInternal::mouseDoubleClickEvent(TQMouseEvent *e) } possibleTripleClick = true; - TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQT_SLOT(tripleClickTimeout()) ); + TQTimer::singleShot ( TQApplication::doubleClickInterval(), this, TQ_SLOT(tripleClickTimeout()) ); scrollX = 0; scrollY = 0; diff --git a/kate/part/test_regression.cpp b/kate/part/test_regression.cpp index be91d6d32..4f4e5692d 100644 --- a/kate/part/test_regression.cpp +++ b/kate/part/test_regression.cpp @@ -549,10 +549,10 @@ int main(int argc, char *argv[]) baseDir, args->getOption("output"), args->isSet("genoutput")); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), - regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )), - regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int ))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), + regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )), + regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int ))); regressionTest->m_keepOutput = args->isSet("keep-output"); regressionTest->m_showGui = args->isSet("show"); diff --git a/kate/plugins/autobookmarker/autobookmarker.cpp b/kate/plugins/autobookmarker/autobookmarker.cpp index 24d4a122c..06d7c12d2 100644 --- a/kate/plugins/autobookmarker/autobookmarker.cpp +++ b/kate/plugins/autobookmarker/autobookmarker.cpp @@ -66,7 +66,7 @@ AutoBookmarker::AutoBookmarker( TQObject *parent, KTextEditor::ConfigInterfaceExtension() { if ( parent ) - connect( parent, TQT_SIGNAL( completed() ), this, TQT_SLOT( slotCompleted() ) ); + connect( parent, TQ_SIGNAL( completed() ), this, TQ_SLOT( slotCompleted() ) ); } void AutoBookmarker::addView(KTextEditor::View */*view*/) @@ -292,7 +292,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark TQWhatsThis::add( lePattern, i18n( "

    A regular expression. Matching lines will be bookmarked.

    " ) ); - connect( lePattern, TQT_SIGNAL(textChanged ( const TQString & ) ),this, TQT_SLOT( slotPatternChanged( const TQString& ) ) ); + connect( lePattern, TQ_SIGNAL(textChanged ( const TQString & ) ),this, TQ_SLOT( slotPatternChanged( const TQString& ) ) ); cbCS = new TQCheckBox( i18n("Case &sensitive"), w ); lo->addMultiCellWidget( cbCS, 1, 1, 0, 2 ); @@ -334,7 +334,7 @@ AutoBookmarkerEntEditor::AutoBookmarkerEntEditor( TQWidget *parent, AutoBookmark TQToolButton *btnMTW = new TQToolButton(w); lo->addWidget( btnMTW, 4, 2 ); btnMTW->setIconSet(TQIconSet(SmallIcon("wizard"))); - connect(btnMTW, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMTDlg())); + connect(btnMTW, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMTDlg())); TQWhatsThis::add( btnMTW, i18n( "

    Click this button to display a checkable list of mimetypes available " "on your system. When used, the file masks entry above will be filled in " @@ -419,10 +419,10 @@ AutoBookmarkerConfigPage::AutoBookmarkerConfigPage( TQWidget *parent, const char lo1->addStretch( 1 ); - connect( btnNew, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()) ); - connect( btnDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDel()) ); - connect( btnEdit, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotEdit()) ); - connect( lvPatterns, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotEdit()) ); + connect( btnNew, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()) ); + connect( btnDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDel()) ); + connect( btnEdit, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotEdit()) ); + connect( lvPatterns, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotEdit()) ); m_ents = new ABEntityList(); m_ents->setAutoDelete( true ); diff --git a/kate/plugins/insertfile/insertfileplugin.cpp b/kate/plugins/insertfile/insertfileplugin.cpp index e2e3d354a..ed6cd3c6f 100644 --- a/kate/plugins/insertfile/insertfileplugin.cpp +++ b/kate/plugins/insertfile/insertfileplugin.cpp @@ -76,7 +76,7 @@ InsertFilePluginView::InsertFilePluginView( KTextEditor::View *view, const char view->insertChildClient( this ); setInstance( KGenericFactory::instance() ); _job = 0; - (void) new TDEAction( i18n("Insert File..."), 0, this, TQT_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); + (void) new TDEAction( i18n("Insert File..."), 0, this, TQ_SLOT(slotInsertFile()), actionCollection(), "tools_insert_file" ); setXMLFile( "tdetexteditor_insertfileui.rc" ); } @@ -104,7 +104,7 @@ void InsertFilePluginView::slotInsertFile() KURL destURL; destURL.setPath( _tmpfile ); _job = TDEIO::file_copy( _file, destURL, 0600, true, false, true ); - connect( _job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished ( TDEIO::Job * ) ) ); + connect( _job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinished ( TDEIO::Job * ) ) ); } } diff --git a/kate/plugins/isearch/ISearchPlugin.cpp b/kate/plugins/isearch/ISearchPlugin.cpp index a7982f63c..306fcf596 100644 --- a/kate/plugins/isearch/ISearchPlugin.cpp +++ b/kate/plugins/isearch/ISearchPlugin.cpp @@ -66,11 +66,11 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) m_searchForwardAction = new TDEAction( i18n("Search Incrementally"), CTRL+ALT+Key_F, - this, TQT_SLOT(slotSearchForwardAction()), + this, TQ_SLOT(slotSearchForwardAction()), actionCollection(), "edit_isearch" ); m_searchBackwardAction = new TDEAction( i18n("Search Incrementally Backwards"), CTRL+ALT+SHIFT+Key_F, - this, TQT_SLOT(slotSearchBackwardAction()), + this, TQ_SLOT(slotSearchBackwardAction()), actionCollection(), "edit_isearch_reverse" ); m_label = new TQLabel( i18n("I-Search:"), 0L, "tde toolbar widget" ); @@ -84,12 +84,12 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) m_combo->setDuplicatesEnabled( false ); m_combo->setMaximumWidth( 300 ); m_combo->lineEdit()->installEventFilter( this ); - connect( m_combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotTextChanged(const TQString&)) ); - connect( m_combo, TQT_SIGNAL(returnPressed(const TQString&)), - this, TQT_SLOT(slotReturnPressed(const TQString&)) ); - connect( m_combo, TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), - this, TQT_SLOT(slotAddContextMenuItems(TQPopupMenu*)) ); + connect( m_combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotTextChanged(const TQString&)) ); + connect( m_combo, TQ_SIGNAL(returnPressed(const TQString&)), + this, TQ_SLOT(slotReturnPressed(const TQString&)) ); + connect( m_combo, TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), + this, TQ_SLOT(slotAddContextMenuItems(TQPopupMenu*)) ); m_comboAction = new KWidgetAction( m_combo, i18n("Search"), 0, 0, 0, @@ -106,8 +106,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) i18n("Case Sensitive"), TDEShortcut(), actionCollection(), "isearch_case_sensitive" ); action->setShortcutConfigurable( false ); - connect( action, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setCaseSensitive(bool)) ); + connect( action, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setCaseSensitive(bool)) ); action->setChecked( m_caseSensitive ); optionMenu->insert( action ); @@ -115,8 +115,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) i18n("From Beginning"), TDEShortcut(), actionCollection(), "isearch_from_beginning" ); action->setShortcutConfigurable( false ); - connect( action, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setFromBeginning(bool)) ); + connect( action, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setFromBeginning(bool)) ); action->setChecked( m_fromBeginning ); optionMenu->insert( action ); @@ -124,8 +124,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) i18n("Regular Expression"), TDEShortcut(), actionCollection(), "isearch_reg_exp" ); action->setShortcutConfigurable( false ); - connect( action, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(setRegExp(bool)) ); + connect( action, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(setRegExp(bool)) ); action->setChecked( m_regExp ); optionMenu->insert( action ); @@ -134,8 +134,8 @@ ISearchPluginView::ISearchPluginView( KTextEditor::View *view ) // action = new TDEToggleAction( // i18n("Auto-Wrap Search"), TDEShortcut(), // actionCollection(), "isearch_auto_wrap" ); -// connect( action, TQT_SIGNAL(toggled(bool)), -// this, TQT_SLOT(setAutoWrap(bool)) ); +// connect( action, TQ_SIGNAL(toggled(bool)), +// this, TQ_SLOT(setAutoWrap(bool)) ); // action->setChecked( m_autoWrap ); // optionMenu->insert( action ); @@ -410,13 +410,13 @@ void ISearchPluginView::slotAddContextMenuItems( TQPopupMenu *menu ) if( menu ) { menu->insertSeparator(); menu->insertItem( i18n("Case Sensitive"), this, - TQT_SLOT(setCaseSensitive(bool))); + TQ_SLOT(setCaseSensitive(bool))); menu->insertItem( i18n("From Beginning"), this, - TQT_SLOT(setFromBeginning(bool))); + TQ_SLOT(setFromBeginning(bool))); menu->insertItem( i18n("Regular Expression"), this, - TQT_SLOT(setRegExp(bool))); + TQ_SLOT(setRegExp(bool))); //menu->insertItem( i18n("Auto-Wrap Search"), this, - // TQT_SLOT(setAutoWrap(bool))); + // TQ_SLOT(setAutoWrap(bool))); } } diff --git a/kate/plugins/kdatatool/kate_kdatatool.cpp b/kate/plugins/kdatatool/kate_kdatatool.cpp index 607ba33a4..00edb8ced 100644 --- a/kate/plugins/kdatatool/kate_kdatatool.cpp +++ b/kate/plugins/kdatatool/kate_kdatatool.cpp @@ -76,7 +76,7 @@ KDataToolPluginView::KDataToolPluginView( KTextEditor::View *view ) setInstance( KGenericFactory::instance() ); m_menu = new TDEActionMenu(i18n("Data Tools"), actionCollection(), "popup_dataTool"); - connect(m_menu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(aboutToShow())); + connect(m_menu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(aboutToShow())); setXMLFile("tdetexteditor_kdatatoolui.rc"); m_view = view; @@ -151,7 +151,7 @@ void KDataToolPluginView::aboutToShow() m_singleWord_line = line; } else { m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, - TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); + TQ_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); return; } @@ -165,7 +165,7 @@ void KDataToolPluginView::aboutToShow() tools += KDataToolInfo::query( "TQString", "application/x-singleword", inst ); m_actionList = KDataToolAction::dataToolActionList( tools, this, - TQT_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); + TQ_SLOT( slotToolActivated( const KDataToolInfo &, const TQString & ) ) ); for ( ac = m_actionList.first(); ac; ac = m_actionList.next() ) { m_menu->insert(ac); @@ -173,7 +173,7 @@ void KDataToolPluginView::aboutToShow() if( m_actionList.isEmpty() ) { m_notAvailable = new TDEAction(i18n("(not available)"), TQString::null, 0, this, - TQT_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); + TQ_SLOT(slotNotAvailable()), actionCollection(),"dt_n_av"); m_menu->insert(m_notAvailable); } } diff --git a/kate/plugins/wordcompletion/docwordcompletion.cpp b/kate/plugins/wordcompletion/docwordcompletion.cpp index 793f9820c..83933bfce 100644 --- a/kate/plugins/wordcompletion/docwordcompletion.cpp +++ b/kate/plugins/wordcompletion/docwordcompletion.cpp @@ -146,15 +146,15 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au setInstance( KGenericFactory::instance() ); (void) new TDEAction( i18n("Reuse Word Above"), CTRL+Key_8, this, - TQT_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" ); + TQ_SLOT(completeBackwards()), actionCollection(), "doccomplete_bw" ); (void) new TDEAction( i18n("Reuse Word Below"), CTRL+Key_9, this, - TQT_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" ); + TQ_SLOT(completeForwards()), actionCollection(), "doccomplete_fw" ); (void) new TDEAction( i18n("Pop Up Completion List"), 0, this, - TQT_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" ); + TQ_SLOT(popupCompletionList()), actionCollection(), "doccomplete_pu" ); (void) new TDEAction( i18n("Shell Completion"), 0, this, - TQT_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" ); + TQ_SLOT(shellComplete()), actionCollection(), "doccomplete_sh" ); d->autopopup = new TDEToggleAction( i18n("Automatic Completion Popup"), 0, this, - TQT_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" ); + TQ_SLOT(toggleAutoPopup()), actionCollection(), "enable_autopopup" ); d->autopopup->setChecked( autopopup ); toggleAutoPopup(); @@ -168,8 +168,8 @@ DocWordCompletionPluginView::DocWordCompletionPluginView( uint treshold, bool au if ( ! e.isEmpty() ) d->autopopup->setEnabled( e == "true" ); - connect( view->document(), TQT_SIGNAL(variableChanged(const TQString &, const TQString &)), - this, TQT_SLOT(slotVariableChanged(const TQString &, const TQString &)) ); + connect( view->document(), TQ_SIGNAL(variableChanged(const TQString &, const TQString &)), + this, TQ_SLOT(slotVariableChanged(const TQString &, const TQString &)) ); } } @@ -203,15 +203,15 @@ void DocWordCompletionPluginView::popupCompletionList( TQString w ) void DocWordCompletionPluginView::toggleAutoPopup() { if ( d->autopopup->isChecked() ) { - if ( ! connect( m_view->document(), TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), - this, TQT_SLOT(autoPopupCompletionList()) )) + if ( ! connect( m_view->document(), TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), + this, TQ_SLOT(autoPopupCompletionList()) )) { - connect( m_view->document(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(autoPopupCompletionList()) ); + connect( m_view->document(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(autoPopupCompletionList()) ); } } else { - disconnect( m_view->document(), TQT_SIGNAL(textChanged()), this, TQT_SLOT(autoPopupCompletionList()) ); - disconnect( m_view->document(), TQT_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), - this, TQT_SLOT(autoPopupCompletionList()) ); + disconnect( m_view->document(), TQ_SIGNAL(textChanged()), this, TQ_SLOT(autoPopupCompletionList()) ); + disconnect( m_view->document(), TQ_SIGNAL(charactersInteractivelyInserted(int ,int ,const TQString&)), + this, TQ_SLOT(autoPopupCompletionList()) ); } } diff --git a/kded/kded.cpp b/kded/kded.cpp index e1b3b6b33..d9a6eac55 100644 --- a/kded/kded.cpp +++ b/kded/kded.cpp @@ -110,9 +110,9 @@ Kded::Kded(bool checkUpdates, bool new_startup) else cPath = tdesycoca_env; m_pTimer = new TQTimer(this); - connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(recreate())); + connect(m_pTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(recreate())); - TQTimer::singleShot(100, this, TQT_SLOT(installCrashHandler())); + TQTimer::singleShot(100, this, TQ_SLOT(installCrashHandler())); m_pDirWatch = 0; @@ -316,7 +316,7 @@ KDEDModule *Kded::loadModule(const KService *s, bool onDemand) { m_modules.insert(obj, module); m_libs.insert(obj, lib); - connect(module, TQT_SIGNAL(moduleDeleted(KDEDModule *)), TQT_SLOT(slotKDEDModuleRemoved(KDEDModule *))); + connect(module, TQ_SIGNAL(moduleDeleted(KDEDModule *)), TQ_SLOT(slotKDEDModuleRemoved(KDEDModule *))); kdDebug(7020) << "Successfully loaded module '" << obj << "'\n"; return module; } @@ -400,12 +400,12 @@ void Kded::updateDirWatch() delete m_pDirWatch; m_pDirWatch = new KDirWatch; - TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(update(const TQString&))); - TQObject::connect( m_pDirWatch, TQT_SIGNAL(created(const TQString&)), - this, TQT_SLOT(update(const TQString&))); - TQObject::connect( m_pDirWatch, TQT_SIGNAL(deleted(const TQString&)), - this, TQT_SLOT(dirDeleted(const TQString&))); + TQObject::connect( m_pDirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(update(const TQString&))); + TQObject::connect( m_pDirWatch, TQ_SIGNAL(created(const TQString&)), + this, TQ_SLOT(update(const TQString&))); + TQObject::connect( m_pDirWatch, TQ_SIGNAL(deleted(const TQString&)), + this, TQ_SLOT(dirDeleted(const TQString&))); // For each resource for( TQStringList::ConstIterator it = m_allResourceDirs.begin(); @@ -480,7 +480,7 @@ void Kded::recreate(bool initial) if (!initial) { updateDirWatch(); // Update tree first, to be sure to miss nothing. - runBuildSycoca(this, TQT_SLOT(recreateDone())); + runBuildSycoca(this, TQ_SLOT(recreateDone())); } else { @@ -491,7 +491,7 @@ void Kded::recreate(bool initial) if(delayedCheck) { // do a proper tdesycoca check after a delay - TQTimer::singleShot( 60000, this, TQT_SLOT( runDelayedCheck())); + TQTimer::singleShot( 60000, this, TQ_SLOT( runDelayedCheck())); m_needDelayedCheck = true; delayedCheck = false; } @@ -667,9 +667,9 @@ KUpdateD::KUpdateD() { m_pDirWatch = new KDirWatch; m_pTimer = new TQTimer; - connect(m_pTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(runKonfUpdate())); - TQObject::connect( m_pDirWatch, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotNewUpdateFile())); + connect(m_pTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(runKonfUpdate())); + TQObject::connect( m_pDirWatch, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotNewUpdateFile())); TQStringList dirs = TDEGlobal::dirs()->findDirs("data", "tdeconf_update"); for( TQStringList::ConstIterator it = dirs.begin(); @@ -704,7 +704,7 @@ void KUpdateD::slotNewUpdateFile() KHostnameD::KHostnameD(int pollInterval) { m_Timer.start(pollInterval, false /* repetitive */ ); - connect(&m_Timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkHostname())); + connect(&m_Timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(checkHostname())); checkHostname(); } @@ -785,7 +785,7 @@ public: if( Kded::self()->newStartup()) Kded::self()->initModules(); else - TQTimer::singleShot(500, Kded::self(), TQT_SLOT(initModules())); + TQTimer::singleShot(500, Kded::self(), TQ_SLOT(initModules())); } else runBuildSycoca(); @@ -955,8 +955,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) (void) new KHostnameD(HostnamePollInterval); // Watch for hostname changes DCOPClient *client = kapp->dcopClient(); - TQObject::connect(client, TQT_SIGNAL(applicationRemoved(const TQCString&)), - kded, TQT_SLOT(slotApplicationRemoved(const TQCString&))); + TQObject::connect(client, TQ_SIGNAL(applicationRemoved(const TQCString&)), + kded, TQ_SLOT(slotApplicationRemoved(const TQCString&))); client->setNotifications(true); client->setDaemonMode( true ); diff --git a/kded/kdedmodule.cpp b/kded/kdedmodule.cpp index 61da755b3..230f08db2 100644 --- a/kded/kdedmodule.cpp +++ b/kded/kdedmodule.cpp @@ -41,7 +41,7 @@ KDEDModule::KDEDModule(const TQCString &name) : TQObject(), DCOPObject(name) d = new KDEDModulePrivate; d->objMap = 0; d->timeout = 0; - connect(&(d->timer), TQT_SIGNAL(timeout()), this, TQT_SLOT(idle())); + connect(&(d->timer), TQ_SIGNAL(timeout()), this, TQ_SLOT(idle())); } KDEDModule::~KDEDModule() diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp index 14ec8a89f..5917bf762 100644 --- a/kded/tdebuildsycoca.cpp +++ b/kded/tdebuildsycoca.cpp @@ -376,8 +376,8 @@ bool KBuildSycoca::build() if (!m_trackId.isEmpty()) g_vfolder->setTrackId(m_trackId); - connect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)), - this, TQT_SLOT(slotCreateEntry(const TQString &, KService **))); + connect(g_vfolder, TQ_SIGNAL(newService(const TQString &, KService **)), + this, TQ_SLOT(slotCreateEntry(const TQString &, KService **))); VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("tde-applications.menu", true); @@ -390,8 +390,8 @@ bool KBuildSycoca::build() (void) existingResourceDirs(); *g_allResourceDirs += g_vfolder->allDirectories(); - disconnect(g_vfolder, TQT_SIGNAL(newService(const TQString &, KService **)), - this, TQT_SLOT(slotCreateEntry(const TQString &, KService **))); + disconnect(g_vfolder, TQ_SIGNAL(newService(const TQString &, KService **)), + this, TQ_SLOT(slotCreateEntry(const TQString &, KService **))); if (g_changed || !g_allEntries) { @@ -790,8 +790,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv) while (dcopClient->isApplicationRegistered(appName)) { WaitForSignal *obj = new WaitForSignal; - obj->connect(dcopClient, TQT_SIGNAL(applicationRemoved(const TQCString &)), - TQT_SLOT(deleteLater())); + obj->connect(dcopClient, TQ_SIGNAL(applicationRemoved(const TQCString &)), + TQ_SLOT(deleteLater())); kapp->eventLoop()->enterLoop(); } dcopClient->setNotifications( false ); diff --git a/libtdescreensaver/tdescreensaver.cpp b/libtdescreensaver/tdescreensaver.cpp index bedb124cd..7441a5fcb 100644 --- a/libtdescreensaver/tdescreensaver.cpp +++ b/libtdescreensaver/tdescreensaver.cpp @@ -122,7 +122,7 @@ KBlankEffect::KBlankEffect( TQObject *parent ) : TQObject( parent ) d->currentEffect = &KBlankEffect::blankNormal; d->effectProgress = 0; d->timer = new TQTimer( this ); - connect( d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout()) ); + connect( d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout()) ); } diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp index 41bff9edb..7060477c1 100644 --- a/networkstatus/networkstatus.cpp +++ b/networkstatus/networkstatus.cpp @@ -73,8 +73,8 @@ NetworkStatusModule::NetworkStatusModule( const TQCString & obj ) : KDEDModule( d = new Private; /* d->clientIface = new ClientIfaceImpl( this ); d->serviceIface = new ServiceIfaceImpl( this );*/ - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( kapp->dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) ); } NetworkStatusModule::~NetworkStatusModule() diff --git a/networkstatus/networkstatusindicator.cpp b/networkstatus/networkstatusindicator.cpp index a77f1c1fd..92613626d 100644 --- a/networkstatus/networkstatusindicator.cpp +++ b/networkstatus/networkstatusindicator.cpp @@ -38,8 +38,8 @@ StatusBarNetworkStatusIndicator::StatusBarNetworkStatusIndicator( label->setPixmap( SmallIcon("connect_no") ); TQToolTip::add( label, i18n( "The desktop is offline" ) ); - connect( ConnectionManager::self(), TQT_SIGNAL( statusChanged( const TQString &, NetworkStatus::EnumStatus ) ), - TQT_SLOT( networkStatusChanged( const TQString &, NetworkStatus::EnumStatus) ) ); + connect( ConnectionManager::self(), TQ_SIGNAL( statusChanged( const TQString &, NetworkStatus::EnumStatus ) ), + TQ_SLOT( networkStatusChanged( const TQString &, NetworkStatus::EnumStatus) ) ); } diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp index 6f713cf29..93dc096e5 100644 --- a/networkstatus/testservice.cpp +++ b/networkstatus/testservice.cpp @@ -58,7 +58,7 @@ int TestService::establish( const TQString & network ) m_status = NetworkStatus::Establishing; m_service->setNetworkStatus( "test_net", (int)m_status ); m_nextStatus = NetworkStatus::Online; - TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( slotStatusChange() ) ); return (int)NetworkStatus::RequestAccepted; } @@ -68,7 +68,7 @@ int TestService::shutdown( const TQString & network ) m_status = NetworkStatus::ShuttingDown; m_service->setNetworkStatus( "test_net", (int)m_status ); m_nextStatus = NetworkStatus::Offline; - TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) ); + TQTimer::singleShot( 5000, this, TQ_SLOT( slotStatusChange() ) ); return (int)NetworkStatus::RequestAccepted; } diff --git a/tdeabc/HOWTO b/tdeabc/HOWTO index 199e48646..d53cd8725 100644 --- a/tdeabc/HOWTO +++ b/tdeabc/HOWTO @@ -365,8 +365,8 @@ changed. So to make your application aware of changes use the following code: #include - 1: connect( TDEABC::DistributionListWatcher::self(), SIGNAL( changed() ), - 2: this, SLOT( slotDistributionListChanged() ) ); + 1: connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ), + 2: this, TQ_SLOT( slotDistributionListChanged() ) ); You see, as usual, easy ;) diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp index b9d239ef4..a472b2bd0 100644 --- a/tdeabc/addressbook.cpp +++ b/tdeabc/addressbook.cpp @@ -711,15 +711,15 @@ bool AddressBook::addResource( Resource *resource ) d->mManager->add( resource ); resource->setAddressBook( this ); - connect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ), - this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) ); - connect( resource, TQT_SIGNAL( savingFinished( Resource* ) ), - this, TQT_SLOT( resourceSavingFinished( Resource* ) ) ); + connect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ), + this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) ); + connect( resource, TQ_SIGNAL( savingFinished( Resource* ) ), + this, TQ_SLOT( resourceSavingFinished( Resource* ) ) ); - connect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); - connect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); + connect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + connect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); return true; } @@ -733,15 +733,15 @@ bool AddressBook::removeResource( Resource *resource ) resource->setAddressBook( 0 ); - disconnect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ), - this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) ); - disconnect( resource, TQT_SIGNAL( savingFinished( Resource* ) ), - this, TQT_SLOT( resourceSavingFinished( Resource* ) ) ); + disconnect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ), + this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) ); + disconnect( resource, TQ_SIGNAL( savingFinished( Resource* ) ), + this, TQ_SLOT( resourceSavingFinished( Resource* ) ) ); - disconnect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); - disconnect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + disconnect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + disconnect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); d->mManager->remove( resource ); diff --git a/tdeabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp index 657878546..73e7b7172 100644 --- a/tdeabc/addresseedialog.cpp +++ b/tdeabc/addresseedialog.cpp @@ -72,15 +72,15 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : mAddresseeList->setAllColumnsShowFocus( true ); mAddresseeList->setFullWidth( true ); listLayout->addWidget( mAddresseeList ); - connect( mAddresseeList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( mAddresseeList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( updateEdit( TQListViewItem * ) ) ); + connect( mAddresseeList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( mAddresseeList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( updateEdit( TQListViewItem * ) ) ); mAddresseeEdit = new KLineEdit( topWidget ); mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ), - TQT_SLOT( selectItem( const TQString & ) ) ); + connect( mAddresseeEdit->completionObject(), TQ_SIGNAL( match( const TQString & ) ), + TQ_SLOT( selectItem( const TQString & ) ) ); mAddresseeEdit->setFocus(); mAddresseeEdit->completionObject()->setIgnoreCase( true ); listLayout->addWidget( mAddresseeEdit ); @@ -101,23 +101,23 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) : mSelectedList->addColumn( i18n("Email") ); mSelectedList->setAllColumnsShowFocus( true ); mSelectedList->setFullWidth( true ); - connect( mSelectedList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( removeSelected() ) ); + connect( mSelectedList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( removeSelected() ) ); TQPushButton *unselectButton = new TQPushButton( i18n("Unselect"), selectedGroup ); - connect ( unselectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelected() ) ); + connect ( unselectButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSelected() ) ); - connect( mAddresseeList, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( addSelected( TQListViewItem * ) ) ); + connect( mAddresseeList, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( addSelected( TQListViewItem * ) ) ); setInitialSize( TQSize( 650, 350 ) ); } mAddressBook = StdAddressBook::self( true ); - connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ), - TQT_SLOT( addressBookChanged() ) ); - connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ), - TQT_SLOT( addressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ), + TQ_SLOT( addressBookChanged() ) ); + connect( mAddressBook, TQ_SIGNAL( loadingFinished( Resource* ) ), + TQ_SLOT( addressBookChanged() ) ); loadAddressBook(); } diff --git a/tdeabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp index 1b4911318..ef6537e28 100644 --- a/tdeabc/addresslineedit.cpp +++ b/tdeabc/addresslineedit.cpp @@ -104,22 +104,22 @@ void AddressLineEdit::init() ldapSearchDeleter.setObject( s_LDAPSearch, new LdapSearch ); ldapTextDeleter.setObject( s_LDAPText, new TQString ); } - connect( s_LDAPTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotStartLDAPLookup())); - connect( s_LDAPSearch, TQT_SIGNAL( searchData( const TQStringList& )), - TQT_SLOT( slotLDAPSearchData( const TQStringList& ))); + connect( s_LDAPTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotStartLDAPLookup())); + connect( s_LDAPSearch, TQ_SIGNAL( searchData( const TQStringList& )), + TQ_SLOT( slotLDAPSearchData( const TQStringList& ))); } if ( m_useCompletion && !m_completionInitialized ) { setCompletionObject( s_completion, false ); // we handle it ourself - connect( this, TQT_SIGNAL( completion(const TQString&)), - this, TQT_SLOT(slotCompletion() )); + connect( this, TQ_SIGNAL( completion(const TQString&)), + this, TQ_SLOT(slotCompletion() )); TDECompletionBox *box = completionBox(); - connect( box, TQT_SIGNAL( highlighted( const TQString& )), - this, TQT_SLOT( slotPopupCompletion( const TQString& ) )); - connect( box, TQT_SIGNAL( userCancelled( const TQString& )), - TQT_SLOT( userCancelled( const TQString& ))); + connect( box, TQ_SIGNAL( highlighted( const TQString& )), + this, TQ_SLOT( slotPopupCompletion( const TQString& ) )); + connect( box, TQ_SIGNAL( userCancelled( const TQString& )), + TQ_SLOT( userCancelled( const TQString& ))); m_completionInitialized = true; // don't connect muliple times. That's // ugly, tho, better have completionBox() diff --git a/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp index 496883d15..3456418de 100644 --- a/tdeabc/distributionlist.cpp +++ b/tdeabc/distributionlist.cpp @@ -275,7 +275,7 @@ DistributionListWatcher::DistributionListWatcher() mDirWatch = new KDirWatch; mDirWatch->addFile( locateLocal( "data", "tdeabc/distlists" ) ); - connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) ); + connect( mDirWatch, TQ_SIGNAL( dirty( const TQString& ) ), TQ_SIGNAL( changed() ) ); mDirWatch->startScan(); } diff --git a/tdeabc/distributionlist.h b/tdeabc/distributionlist.h index acd4ee22b..ef1b1fece 100644 --- a/tdeabc/distributionlist.h +++ b/tdeabc/distributionlist.h @@ -182,7 +182,7 @@ class KABC_EXPORT DistributionListManager \code TDEABC::DistributionListWatcher *watchdog = TDEABC::DistributionListWatcher::self() - connect( watchdog, TQT_SIGNAL( changed() ), TQT_SLOT( doSomething() ) ); + connect( watchdog, TQ_SIGNAL( changed() ), TQ_SLOT( doSomething() ) ); \endcode */ diff --git a/tdeabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp index 5db7c976e..9d424a927 100644 --- a/tdeabc/distributionlistdialog.cpp +++ b/tdeabc/distributionlistdialog.cpp @@ -46,7 +46,7 @@ DistributionListDialog::DistributionListDialog( AddressBook *addressBook, TQWidg mEditor = new DistributionListEditorWidget( addressBook, this ); setMainWidget( mEditor ); - connect( this, TQT_SIGNAL( okClicked() ), mEditor, TQT_SLOT( save() ) ); + connect( this, TQ_SIGNAL( okClicked() ), mEditor, TQ_SLOT( save() ) ); } DistributionListDialog::~DistributionListDialog() @@ -147,19 +147,19 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address mNameCombo = new TQComboBox( this ); nameLayout->addWidget( mNameCombo ); - connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) ); + connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) ); mNewButton = new TQPushButton( i18n("New List..."), this ); nameLayout->addWidget( mNewButton ); - connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) ); + connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) ); mEditButton = new TQPushButton( i18n("Rename List..."), this ); nameLayout->addWidget( mEditButton ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) ); mRemoveButton = new TQPushButton( i18n("Remove List"), this ); nameLayout->addWidget( mRemoveButton ); - connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) ); + connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) ); TQGridLayout *gridLayout = new TQGridLayout( topLayout, 3, 3 ); gridLayout->setColStretch(1, 1); @@ -175,15 +175,15 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address mAddresseeView->addColumn( i18n("Preferred Email") ); mAddresseeView->setAllColumnsShowFocus( true ); gridLayout->addWidget( mAddresseeView, 1, 0 ); - connect( mAddresseeView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionAddresseeViewChanged() ) ); - connect( mAddresseeView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( addEntry() ) ); + connect( mAddresseeView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionAddresseeViewChanged() ) ); + connect( mAddresseeView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( addEntry() ) ); mAddEntryButton = new TQPushButton( i18n("Add Entry"), this ); mAddEntryButton->setEnabled(false); gridLayout->addWidget( mAddEntryButton, 2, 0 ); - connect( mAddEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) ); + connect( mAddEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) ); mEntryView = new TQListView( this ); mEntryView->addColumn( i18n("Name") ); @@ -192,16 +192,16 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address mEntryView->setEnabled(false); mEntryView->setAllColumnsShowFocus( true ); gridLayout->addMultiCellWidget( mEntryView, 1, 1, 1, 2 ); - connect( mEntryView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionEntryViewChanged() ) ); + connect( mEntryView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionEntryViewChanged() ) ); mChangeEmailButton = new TQPushButton( i18n("Change Email..."), this ); gridLayout->addWidget( mChangeEmailButton, 2, 1 ); - connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) ); + connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) ); mRemoveEntryButton = new TQPushButton( i18n("Remove Entry"), this ); gridLayout->addWidget( mRemoveEntryButton, 2, 2 ); - connect( mRemoveEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) ); + connect( mRemoveEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) ); mManager = new DistributionListManager( mAddressBook ); mManager->load(); diff --git a/tdeabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp index 8ccb97951..e2882378f 100644 --- a/tdeabc/distributionlisteditor.cpp +++ b/tdeabc/distributionlisteditor.cpp @@ -128,34 +128,34 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg mNameCombo = new TQComboBox( this ); nameLayout->addWidget( mNameCombo ); - connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) ); + connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) ); newButton = new TQPushButton( i18n("New List"), this ); nameLayout->addWidget( newButton ); - connect( newButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) ); + connect( newButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) ); removeButton = new TQPushButton( i18n("Remove List"), this ); nameLayout->addWidget( removeButton ); - connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) ); mEntryView = new TQListView( this ); mEntryView->addColumn( i18n("Name") ); mEntryView->addColumn( i18n("Email") ); mEntryView->addColumn( i18n("Use Preferred") ); topLayout->addWidget( mEntryView ); - connect(mEntryView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionEntryViewChanged())); + connect(mEntryView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionEntryViewChanged())); changeEmailButton = new TQPushButton( i18n("Change Email"), this ); topLayout->addWidget( changeEmailButton ); - connect( changeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) ); + connect( changeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) ); removeEntryButton = new TQPushButton( i18n("Remove Entry"), this ); topLayout->addWidget( removeEntryButton ); - connect( removeEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) ); + connect( removeEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) ); addEntryButton = new TQPushButton( i18n("Add Entry"), this ); topLayout->addWidget( addEntryButton ); - connect( addEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) ); + connect( addEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) ); mAddresseeView = new TQListView( this ); mAddresseeView->addColumn( i18n("Name") ); @@ -163,7 +163,7 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg topLayout->addWidget( mAddresseeView ); - connect(mAddresseeView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionAddresseeViewChanged())); + connect(mAddresseeView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionAddresseeViewChanged())); mManager = new DistributionListManager( mAddressBook ); mManager->load(); diff --git a/tdeabc/ldapclient.cpp b/tdeabc/ldapclient.cpp index a70a4eb69..5ae18b848 100644 --- a/tdeabc/ldapclient.cpp +++ b/tdeabc/ldapclient.cpp @@ -138,12 +138,12 @@ void LdapClient::startQuery( const TQString& filter ) startParseLDIF(); mActive = true; mJob = TDEIO::get( url, false, false ); - connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); - connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotDone() ) ); + connect( mJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( mJob, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) ); + connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotDone() ) ); } void LdapClient::cancelQuery() @@ -285,18 +285,18 @@ LdapSearch::LdapSearch() attrs << "cn" << "mail" << "givenname" << "sn"; ldapClient->setAttrs( attrs ); - connect( ldapClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ), - this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); - connect( ldapClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotLDAPDone() ) ); - connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotLDAPError( const TQString& ) ) ); + connect( ldapClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ), + this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); + connect( ldapClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotLDAPDone() ) ); + connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotLDAPError( const TQString& ) ) ); mClients.append( ldapClient ); } } - connect( &mDataTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDataTimer() ) ); + connect( &mDataTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDataTimer() ) ); } void LdapSearch::startSearch( const TQString& txt ) diff --git a/tdeabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp index 902e2b04c..0c5b845be 100644 --- a/tdeabc/ldapconfigwidget.cpp +++ b/tdeabc/ldapconfigwidget.cpp @@ -180,7 +180,7 @@ void LdapConfigWidget::initWidget() //without host query doesn't make sense if ( mHost ) { TQPushButton *dnquery = new TQPushButton( i18n( "Query Server" ), this ); - connect( dnquery, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryDNClicked() ) ); + connect( dnquery, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryDNClicked() ) ); mainLayout->addMultiCellWidget( dnquery, row, row, 2, 3 ); } row++; @@ -202,9 +202,9 @@ void LdapConfigWidget::initWidget() mSecSSL = new TQRadioButton( i18n( "SSL" ), btgroup, "kcfg_ldapssl" ); mainLayout->addMultiCellWidget( btgroup, row, row, 0, 3 ); - connect( mSecNO, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) ); - connect( mSecTLS, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) ); - connect( mSecSSL, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPSPort( ) ) ); + connect( mSecNO, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) ); + connect( mSecTLS, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) ); + connect( mSecSSL, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPSPort( ) ) ); mSecNO->setChecked( true ); row++; @@ -229,14 +229,14 @@ void LdapConfigWidget::initWidget() //without host query doesn't make sense if ( mHost ) { mQueryMech = new TQPushButton( i18n( "Query Server" ), authbox ); - connect( mQueryMech, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryMechClicked() ) ); + connect( mQueryMech, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryMechClicked() ) ); } mainLayout->addMultiCellWidget( authbox, row, row+1, 0, 3 ); - connect( mAnonymous, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setAnonymous(int) ) ); - connect( mSimple, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSimple(int) ) ); - connect( mSASL, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSASL(int) ) ); + connect( mAnonymous, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setAnonymous(int) ) ); + connect( mSimple, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSimple(int) ) ); + connect( mSASL, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSASL(int) ) ); mAnonymous->setChecked( true ); } @@ -293,10 +293,10 @@ void LdapConfigWidget::sendQuery() mLdif.startParsing(); TDEIO::Job *job = TDEIO::get( _url, true, false ); job->addMetaData("no-auth-prompt","true"); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( loadResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( loadResult( TDEIO::Job* ) ) ); if ( mProg == NULL ) mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true ); diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp index 304f585f0..7502084aa 100644 --- a/tdeabc/plugins/dir/resourcedir.cpp +++ b/tdeabc/plugins/dir/resourcedir.cpp @@ -87,9 +87,9 @@ void ResourceDir::init( const TQString &path, const TQString &format ) mLock = 0; - connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( pathChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( pathChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( pathChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( pathChanged() ) ); setPath( path ); } diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp index 3fa2a9406..2b25db4c4 100644 --- a/tdeabc/plugins/file/resourcefile.cpp +++ b/tdeabc/plugins/file/resourcefile.cpp @@ -83,9 +83,9 @@ void ResourceFile::init( const TQString &fileName, const TQString &formatName ) mFormat = factory->format( mFormatName ); } - connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( fileChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( fileChanged() ) ); - connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( fileChanged() ) ); + connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( fileChanged() ) ); setFileName( fileName ); @@ -333,9 +333,9 @@ bool ResourceFile::asyncSave( Ticket *ticket ) bool ok = save( ticket ); if ( !ok ) - TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingError() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingError() ) ); else - TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingFinished() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingFinished() ) ); return ok; } diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp index 2c8e0fce6..7995f3be1 100644 --- a/tdeabc/plugins/file/resourcefileconfig.cpp +++ b/tdeabc/plugins/file/resourcefileconfig.cpp @@ -51,8 +51,8 @@ ResourceFileConfig::ResourceFileConfig( TQWidget* parent, const char* name ) label = new TQLabel( i18n( "Location:" ), this ); mFileNameEdit = new KURLRequester( this ); - connect( mFileNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( checkFilePermissions( const TQString & ) ) ); + connect( mFileNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( checkFilePermissions( const TQString & ) ) ); mainLayout->addWidget( label, 1, 0 ); mainLayout->addWidget( mFileNameEdit, 1, 1 ); diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp index 84c62370d..f7c6ed36a 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp @@ -173,10 +173,10 @@ TQString ResourceLDAPTDEIO::findUid( const TQString &uid ) TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ ); connect( listJob, - TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); - connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( listResult( TDEIO::Job* ) ) ); + TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( listJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( listResult( TDEIO::Job* ) ) ); enter_loop(); return d->mResultDn; @@ -511,8 +511,8 @@ TDEIO::Job *ResourceLDAPTDEIO::loadFromCache() KURL url( d->mCacheDst ); job = TDEIO::get( url, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); } return job; } @@ -535,17 +535,17 @@ bool ResourceLDAPTDEIO::load() createCache(); if ( d->mCachePolicy != Cache_Always ) { job = TDEIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } job = loadFromCache(); if ( job ) { - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); } if ( mErrorMsg.isEmpty() ) { @@ -572,10 +572,10 @@ bool ResourceLDAPTDEIO::asyncLoad() createCache(); if ( d->mCachePolicy != Cache_Always ) { TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( result( TDEIO::Job* ) ) ); } else { result( NULL ); } @@ -714,8 +714,8 @@ void ResourceLDAPTDEIO::result( TDEIO::Job *job ) TDEIO::Job *cjob; cjob = loadFromCache(); if ( cjob ) { - connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) ); + connect( cjob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( loadCacheResult( TDEIO::Job* ) ) ); } else { if ( !mErrorMsg.isEmpty() ) emit loadingError( this, mErrorMsg ); @@ -730,10 +730,10 @@ bool ResourceLDAPTDEIO::save( Ticket* ) d->mSaveIt = begin(); TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) ); enter_loop(); if ( mErrorMsg.isEmpty() ) { kdDebug(7125) << "ResourceLDAPTDEIO save ok!" << endl; @@ -750,10 +750,10 @@ bool ResourceLDAPTDEIO::asyncSave( Ticket* ) kdDebug(7125) << "ResourceLDAPTDEIO asyncSave" << endl; d->mSaveIt = begin(); TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false ); - connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), - this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( saveResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ), + this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( saveResult( TDEIO::Job* ) ) ); return true; } diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp index 5239062aa..9dc8a8a57 100644 --- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp +++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp @@ -58,8 +58,8 @@ ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent, const char* mEditButton = new TQPushButton( i18n( "Edit Attributes..." ), box ); mCacheButton = new TQPushButton( i18n( "Offline Use..." ), box ); - connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editAttributes() ) ); - connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) ); + connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editAttributes() ) ); + connect( mCacheButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCache() ) ); } void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res ) @@ -247,7 +247,7 @@ AttributesDialog::AttributesDialog( const TQMap &attributes, mMapCombo->insertItem( i18n( "Netscape" ) ); mMapCombo->insertItem( i18n( "Evolution" ) ); mMapCombo->insertItem( i18n( "Outlook" ) ); - connect( mMapCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( mapChanged( int ) ) ); + connect( mMapCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( mapChanged( int ) ) ); label = new TQLabel( i18n( "RDN prefix attribute:" ), page ); layout->addWidget( label, 1, 0 ); @@ -356,10 +356,10 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src, mAutoCache->setChecked( autoCache ); mAutoCache->setEnabled( bt->isChecked() ); - connect( bt, TQT_SIGNAL(toggled(bool)), mAutoCache, TQT_SLOT(setEnabled(bool)) ); + connect( bt, TQ_SIGNAL(toggled(bool)), mAutoCache, TQ_SLOT(setEnabled(bool)) ); TQPushButton *lcache = new TQPushButton( i18n("Load into Cache"), page ); - connect( lcache, TQT_SIGNAL( clicked() ), TQT_SLOT( loadCache() ) ); + connect( lcache, TQ_SIGNAL( clicked() ), TQ_SLOT( loadCache() ) ); } OfflineDialog::~OfflineDialog() diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp index cb908cd22..08fa8764a 100644 --- a/tdeabc/plugins/net/resourcenet.cpp +++ b/tdeabc/plugins/net/resourcenet.cpp @@ -192,8 +192,8 @@ bool ResourceNet::asyncLoad() TDEIO::Scheduler::checkSlaveOnHold( true ); d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false ); d->mIsLoading = true; - connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) ); + connect( d->mLoadJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( downloadFinished( TDEIO::Job* ) ) ); return true; } @@ -286,8 +286,8 @@ bool ResourceNet::asyncSave( Ticket* ) TDEIO::Scheduler::checkSlaveOnHold( true ); d->mIsSaving = true; d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false ); - connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) ); + connect( d->mSaveJob, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( uploadFinished( TDEIO::Job* ) ) ); return true; } @@ -352,7 +352,7 @@ void ResourceNet::downloadFinished( TDEIO::Job* ) if ( !hasTempFile() || mTempFile->status() != 0 ) { d->mLastErrorString = i18n( "Download failed: Unable to create temporary file" ); - TQTimer::singleShot( 0, this, TQT_SLOT( signalError() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( signalError() ) ); return; } diff --git a/tdeabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp index 186924aa2..1bede4a84 100644 --- a/tdeabc/resourceselectdialog.cpp +++ b/tdeabc/resourceselectdialog.cpp @@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c KButtonBox *buttonBox = new KButtonBox( this ); buttonBox->addStretch(); - buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) ); - buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) ); + buttonBox->addButton( KStdGuiItem::ok(), this, TQ_SLOT( accept() ) ); + buttonBox->addButton( KStdGuiItem::cancel(), this, TQ_SLOT( reject() ) ); buttonBox->layout(); mainLayout->addWidget( buttonBox ); diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp index 73343d8a9..d834215c3 100644 --- a/tdeabc/stdaddressbook.cpp +++ b/tdeabc/stdaddressbook.cpp @@ -103,15 +103,15 @@ void StdAddressBook::init( bool asynchronous ) error( TQString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) ); continue; } - connect( *it, TQT_SIGNAL( loadingFinished( Resource* ) ), - this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) ); - connect( *it, TQT_SIGNAL( savingFinished( Resource* ) ), - this, TQT_SLOT( resourceSavingFinished( Resource* ) ) ); - - connect( *it, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); - connect( *it, TQT_SIGNAL( savingError( Resource*, const TQString& ) ), - this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); + connect( *it, TQ_SIGNAL( loadingFinished( Resource* ) ), + this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) ); + connect( *it, TQ_SIGNAL( savingFinished( Resource* ) ), + this, TQ_SLOT( resourceSavingFinished( Resource* ) ) ); + + connect( *it, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) ); + connect( *it, TQ_SIGNAL( savingError( Resource*, const TQString& ) ), + this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) ); } Resource *res = standardResource(); diff --git a/tdeabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp index 80bd311da..ee4513d98 100644 --- a/tdeabc/tests/testaddresslineedit.cpp +++ b/tdeabc/tests/testaddresslineedit.cpp @@ -21,7 +21,7 @@ int main( int argc,char **argv ) lineEdit->show(); app.setMainWidget( lineEdit ); - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); app.exec(); diff --git a/tdeabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp index 833dca84e..4a46f8e83 100644 --- a/tdeabc/tests/testdistlist.cpp +++ b/tdeabc/tests/testdistlist.cpp @@ -51,7 +51,7 @@ int main(int argc,char **argv) editor->show(); app.setMainWidget(editor); - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); app.exec(); diff --git a/tdeabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp index a48ce043f..338d703f3 100644 --- a/tdeabc/tests/testldapclient.cpp +++ b/tdeabc/tests/testldapclient.cpp @@ -97,12 +97,12 @@ void TestLDAPClient::testIntevation() // But this certainly looks fishy, it might break on non-utf8 systems. TQString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*Ägypten MDK*)(sn=*Ägypten MDK*))"; - connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ), - this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); - connect( mClient, TQT_SIGNAL( done() ), - this, TQT_SLOT( slotLDAPDone() ) ); - connect( mClient, TQT_SIGNAL( error( const TQString& ) ), - this, TQT_SLOT( slotLDAPError( const TQString& ) ) ); + connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ), + this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) ); + connect( mClient, TQ_SIGNAL( done() ), + this, TQ_SLOT( slotLDAPDone() ) ); + connect( mClient, TQ_SIGNAL( error( const TQString& ) ), + this, TQ_SLOT( slotLDAPError( const TQString& ) ) ); mClient->startQuery( filter ); kapp->eventLoop()->enterLoop(); delete mClient; mClient = 0; diff --git a/tdeabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp index f9d880753..d593945bf 100644 --- a/tdeabc/tests/testlock.cpp +++ b/tdeabc/tests/testlock.cpp @@ -77,11 +77,11 @@ LockWidget::LockWidget( const TQString &identifier ) TQPushButton *button = new TQPushButton( "Lock", this ); topLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() ) ); button = new TQPushButton( "Unlock", this ); topLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( unlock() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( unlock() ) ); } mLockView = new TQListView( this ); @@ -94,15 +94,15 @@ LockWidget::LockWidget( const TQString &identifier ) TQPushButton *quitButton = new TQPushButton( "Quit", this ); topLayout->addWidget( quitButton ); - connect( quitButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) ); + connect( quitButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) ); KDirWatch *watch = KDirWatch::self(); - connect( watch, TQT_SIGNAL( dirty( const TQString & ) ), - TQT_SLOT( updateLockView() ) ); - connect( watch, TQT_SIGNAL( created( const TQString & ) ), - TQT_SLOT( updateLockView() ) ); - connect( watch, TQT_SIGNAL( deleted( const TQString & ) ), - TQT_SLOT( updateLockView() ) ); + connect( watch, TQ_SIGNAL( dirty( const TQString & ) ), + TQ_SLOT( updateLockView() ) ); + connect( watch, TQ_SIGNAL( created( const TQString & ) ), + TQ_SLOT( updateLockView() ) ); + connect( watch, TQ_SIGNAL( deleted( const TQString & ) ), + TQ_SLOT( updateLockView() ) ); watch->addDir( Lock::locksDir() ); watch->startScan(); } diff --git a/tdecert/tdecertpart.cpp b/tdecert/tdecertpart.cpp index bb749f53a..adeabc4cb 100644 --- a/tdecert/tdecertpart.cpp +++ b/tdecert/tdecertpart.cpp @@ -169,7 +169,7 @@ _baseGrid->addMultiCellWidget(_sideList, 0, 13, 0, 1); _importAll = new TQPushButton(i18n("Import &All"), _frame); _baseGrid->addMultiCellWidget(_importAll, 14, 14, 0, 1); -connect(_importAll, TQT_SIGNAL(clicked()), TQT_SLOT(slotImportAll())); +connect(_importAll, TQ_SIGNAL(clicked()), TQ_SLOT(slotImportAll())); @@ -184,7 +184,7 @@ grid->addMultiCellWidget(new TQLabel(i18n("TDE Secure Certificate Import"), _pkc grid->addWidget(new TQLabel(i18n("Chain:"), _pkcsFrame), 1, 0); _p12_chain = new KComboBox(_pkcsFrame); grid->addMultiCellWidget(_p12_chain, 1, 1, 1, 4); -connect(_p12_chain, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChain(int))); +connect(_p12_chain, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChain(int))); grid->addWidget(new TQLabel(i18n("Subject:"), _pkcsFrame), 2, 0); grid->addWidget(new TQLabel(i18n("Issued by:"), _pkcsFrame), 2, 3); @@ -373,10 +373,10 @@ _baseGrid->addMultiCellWidget(_launch, 14, 14, 4, 5); _baseGrid->addWidget(_import, 14, 6); _baseGrid->addWidget(_save, 14, 7); _baseGrid->addWidget(_done, 14, 8); -connect(_launch, TQT_SIGNAL(clicked()), TQT_SLOT(slotLaunch())); -connect(_import, TQT_SIGNAL(clicked()), TQT_SLOT(slotImport())); -connect(_save, TQT_SIGNAL(clicked()), TQT_SLOT(slotSave())); -connect(_done, TQT_SIGNAL(clicked()), TQT_SLOT(slotDone())); +connect(_launch, TQ_SIGNAL(clicked()), TQ_SLOT(slotLaunch())); +connect(_import, TQ_SIGNAL(clicked()), TQ_SLOT(slotImport())); +connect(_save, TQ_SIGNAL(clicked()), TQ_SLOT(slotSave())); +connect(_done, TQ_SIGNAL(clicked()), TQ_SLOT(slotDone())); _import->setEnabled(false); _save->setEnabled(false); @@ -386,8 +386,8 @@ _baseGrid->addMultiCellWidget(_pkcsFrame, 0, 12, 2, 8); _baseGrid->addMultiCellWidget(_x509Frame, 0, 12, 2, 8); _baseGrid->addMultiCellWidget(_blankFrame, 0, 12, 2, 8); -connect(_sideList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(slotSelectionChanged(TQListViewItem*))); +connect(_sideList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(slotSelectionChanged(TQListViewItem*))); setReadWrite(true); } diff --git a/tdecmshell/main.cpp b/tdecmshell/main.cpp index b2de8533a..c6d047cc8 100644 --- a/tdecmshell/main.cpp +++ b/tdecmshell/main.cpp @@ -170,8 +170,8 @@ void KCMShell::waitForExit() { kdDebug(780) << k_funcinfo << endl; - connect(dcopClient(), TQT_SIGNAL(applicationRemoved(const TQCString&)), - TQT_SLOT( appExit(const TQCString&) )); + connect(dcopClient(), TQ_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SLOT( appExit(const TQCString&) )); exec(); } diff --git a/tdecore/kaudioplayer.h b/tdecore/kaudioplayer.h index 6e011e246..ce26a1e9a 100644 --- a/tdecore/kaudioplayer.h +++ b/tdecore/kaudioplayer.h @@ -48,7 +48,7 @@ class KAudioPlayerPrivate; * * \code * KAudioPlayer player("/var/share/foo.wav"); - * connect(&button, TQT_SIGNAL(clicked()), &player, TQT_SLOT(play())); + * connect(&button, TQ_SIGNAL(clicked()), &player, TQ_SLOT(play())); * \endcode * */ diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp index fd722a964..93ed7f86a 100644 --- a/tdecore/kcheckaccelerators.cpp +++ b/tdecore/kcheckaccelerators.cpp @@ -89,7 +89,7 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent ) } alwaysShow = TDEGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false ); autoCheck = TDEGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true ); - connect( &autoCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( autoCheckSlot())); + connect( &autoCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( autoCheckSlot())); } bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e) @@ -153,11 +153,11 @@ void KCheckAccelerators::createDialog(TQWidget *actWin, bool automatic) TQCheckBox* disableAutoCheck = NULL; if( automatic ) { disableAutoCheck = new TQCheckBox( i18n( "&Disable automatic checking" ), drklash ); - connect(disableAutoCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableCheck(bool))); + connect(disableAutoCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDisableCheck(bool))); } TQPushButton* btnClose = new TQPushButton( i18n( "&Close" ), drklash ); btnClose->setDefault( true ); - connect( btnClose, TQT_SIGNAL( clicked() ), drklash, TQT_SLOT( close() ) ); + connect( btnClose, TQ_SIGNAL( clicked() ), drklash, TQ_SLOT( close() ) ); if (disableAutoCheck) disableAutoCheck->setFocus(); else diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp index 5937a3392..3aa6b9fa7 100644 --- a/tdecore/kclipboard.cpp +++ b/tdecore/kclipboard.cpp @@ -126,11 +126,11 @@ void TDEClipboardSynchronizer::setupSignals() TQClipboard *clip = TQApplication::clipboard(); disconnect( clip, NULL, this, NULL ); if( s_sync ) - connect( clip, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( clip, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); if( s_reverse_sync ) - connect( clip, TQT_SIGNAL( dataChanged() ), - TQT_SLOT( slotClipboardChanged() )); + connect( clip, TQ_SIGNAL( dataChanged() ), + TQ_SLOT( slotClipboardChanged() )); } void TDEClipboardSynchronizer::slotSelectionChanged() diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp index 2e10f873e..f78464287 100644 --- a/tdecore/kextsock.cpp +++ b/tdecore/kextsock.cpp @@ -639,7 +639,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) if (d->qsnIn == NULL) { d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read); - TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead())); + TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead())); d->qsnIn->setEnabled(true); } @@ -687,7 +687,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) if (d->qsnOut == NULL) { d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write); - TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite())); + TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite())); // if the class is being created now, there's nothing to write yet // so socketActivityWrite() will get called once and disable // the notifier @@ -702,7 +702,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize) if (d->emitWrite && d->qsnOut == NULL) { d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write); - TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite())); + TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite())); } return true; @@ -783,8 +783,8 @@ int KExtendedSocket::startAsyncLookup() d->resRemote.setFlags(flags); d->resRemote.setFamily(familyMask); d->resRemote.setSocketType(socktype); - TQObject::connect(&d->resRemote, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(dnsResultsReady())); + TQObject::connect(&d->resRemote, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(dnsResultsReady())); if (!d->resRemote.start()) { @@ -800,8 +800,8 @@ int KExtendedSocket::startAsyncLookup() d->resLocal.setFlags(flags); d->resLocal.setFamily(familyMask); d->resLocal.setSocketType(socktype); - TQObject::connect(&d->resLocal, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(dnsResultsReady())); + TQObject::connect(&d->resLocal, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(dnsResultsReady())); if (!d->resLocal.start()) { @@ -896,7 +896,7 @@ int KExtendedSocket::listen(int N) { d->status = listening; d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read); - TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead())); + TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead())); } return retval == -1 ? -1 : 0; } @@ -1218,7 +1218,7 @@ int KExtendedSocket::startAsyncConnect() // signal lookupFinished to do connection if (d->status < lookupDone) { - TQObject::connect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot())); + TQObject::connect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot())); if (d->status < lookupInProgress) return startAsyncLookup(); else @@ -1909,9 +1909,9 @@ void KExtendedSocket::connectionEvent() // error here is either EWOULDBLOCK or EINPROGRESS // so, it is a good condition d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read); - TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead())); + TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead())); d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write); - TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite())); + TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite())); // ok, let the Qt event loop do the selecting for us return; @@ -1969,7 +1969,7 @@ void KExtendedSocket::dnsResultsReady() void KExtendedSocket::startAsyncConnectSlot() { - TQObject::disconnect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot())); + TQObject::disconnect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot())); if (d->status == lookupDone) startAsyncConnect(); diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h index a11568bd0..22dedd513 100644 --- a/tdecore/kglobalaccel.h +++ b/tdecore/kglobalaccel.h @@ -76,7 +76,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject * insert( "Do Something", i18n("Do Something"), * i18n("This action allows you to do something really great with this program to " * "the currently open document."), - * ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQT_SLOT(slotDoSomething()) ); + * ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQ_SLOT(slotDoSomething()) ); *\endcode * * @param sAction The internal name of the action. diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp index 09c216b99..8b9d0f0a3 100644 --- a/tdecore/kglobalaccel_win.cpp +++ b/tdecore/kglobalaccel_win.cpp @@ -283,9 +283,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) if( !recursion_block ) { recursion_block = true; TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) ); - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) ); pMenu->exec( TQPoint( 0, 0 ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); delete pMenu; recursion_block = false; } diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp index 819b05293..da77403ca 100644 --- a/tdecore/kglobalaccel_x11.cpp +++ b/tdecore/kglobalaccel_x11.cpp @@ -90,7 +90,7 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate() all_accels->append( this ); m_sConfigGroup = "Global Shortcuts"; kapp->installX11EventFilter( this ); - connect(kapp, TQT_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQT_SLOT(fakeKeyPressed(unsigned int))); + connect(kapp, TQ_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQ_SLOT(fakeKeyPressed(unsigned int))); } TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate() @@ -313,9 +313,9 @@ void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) { if( !recursion_block ) { recursion_block = true; TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) ); - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) ); pMenu->exec( TQPoint( 0, 0 ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); delete pMenu; recursion_block = false; } @@ -392,9 +392,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent ) if( !recursion_block ) { recursion_block = true; TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) ); - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) ); pMenu->exec( TQPoint( 0, 0 ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int))); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int))); delete pMenu; recursion_block = false; } diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index f687fab9c..f6e267a86 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -157,7 +157,7 @@ TDEIconLoader::TDEIconLoader(const TQString& _appname, TDEStandardDirs *_dirs) if (kapp) { kapp->addKipcEventMask(KIPC::IconChanged); - TQObject::connect(kapp, TQT_SIGNAL(updateIconLoaders()), d, TQT_SLOT(reconfigure())); + TQObject::connect(kapp, TQ_SIGNAL(updateIconLoaders()), d, TQ_SLOT(reconfigure())); } init( _appname, _dirs ); diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp index f3e7a82ae..68dc72668 100644 --- a/tdecore/klibloader.cpp +++ b/tdecore/klibloader.cpp @@ -121,8 +121,8 @@ KLibrary::~KLibrary() for ( ; it.current() ; ++it ) { kdDebug(150) << "Factory still has object " << it.current() << " " << it.current()->name () << " Library = " << m_libname << endl; - disconnect( it.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotObjectDestroyed() ) ); + disconnect( it.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotObjectDestroyed() ) ); } m_objs.setAutoDelete(true); m_objs.clear(); @@ -172,8 +172,8 @@ KLibFactory* KLibrary::factory() return 0; } - connect( m_factory, TQT_SIGNAL( objectCreated( TQObject * ) ), - this, TQT_SLOT( slotObjectCreated( TQObject * ) ) ); + connect( m_factory, TQ_SIGNAL( objectCreated( TQObject * ) ), + this, TQ_SLOT( slotObjectCreated( TQObject * ) ) ); return m_factory; } @@ -214,8 +214,8 @@ void KLibrary::slotObjectCreated( TQObject *obj ) if ( m_objs.containsRef( obj ) ) return; // we know this object already - connect( obj, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotObjectDestroyed() ) ); + connect( obj, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotObjectDestroyed() ) ); m_objs.append( obj ); } @@ -232,8 +232,8 @@ void KLibrary::slotObjectDestroyed() if ( !m_timer ) { m_timer = new TQTimer( this, "klibrary_shutdown_timer" ); - connect( m_timer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotTimeout() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotTimeout() ) ); } // as long as it's not stable make the timeout short, for debugging @@ -447,8 +447,8 @@ KLibrary* KLibLoader::library( const char *name ) } m_libs.insert( name, wrap ); - connect( wrap->lib, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotLibraryDestroyed() ) ); + connect( wrap->lib, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotLibraryDestroyed() ) ); return wrap->lib; } @@ -470,8 +470,8 @@ void KLibLoader::unloadLibrary( const char *libname ) m_libs.remove( libname ); - disconnect( wrap->lib, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotLibraryDestroyed() ) ); + disconnect( wrap->lib, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotLibraryDestroyed() ) ); close_pending( wrap ); } @@ -511,8 +511,8 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap) for (; it.current(); ++it) { wrap = it.current(); if (wrap->lib) { - disconnect( wrap->lib, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotLibraryDestroyed() ) ); + disconnect( wrap->lib, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotLibraryDestroyed() ) ); KLibrary* to_delete = wrap->lib; wrap->lib = 0L; // unset first, because KLibrary dtor can cause delete to_delete; // recursive call to close_pending() diff --git a/tdecore/kprocctrl.cpp b/tdecore/kprocctrl.cpp index 76ad0b167..720778d4e 100644 --- a/tdecore/kprocctrl.cpp +++ b/tdecore/kprocctrl.cpp @@ -71,8 +71,8 @@ TDEProcessController::TDEProcessController() notifier = new TQSocketNotifier( fd[0], TQSocketNotifier::Read ); notifier->setEnabled( true ); - TQObject::connect( notifier, TQT_SIGNAL(activated(int)), - TQT_SLOT(slotDoHousekeeping())); + TQObject::connect( notifier, TQ_SIGNAL(activated(int)), + TQ_SLOT(slotDoHousekeeping())); } TDEProcessController::~TDEProcessController() diff --git a/tdecore/kprocess.cpp b/tdecore/kprocess.cpp index b899c637f..85e7620a4 100644 --- a/tdecore/kprocess.cpp +++ b/tdecore/kprocess.cpp @@ -959,15 +959,15 @@ int TDEProcess::commSetupDoneP() innot = new TQSocketNotifier(in[1], TQSocketNotifier::Write, this); TQ_CHECK_PTR(innot); innot->setEnabled(false); // will be enabled when data has to be sent - TQObject::connect(innot, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotSendData(int))); + TQObject::connect(innot, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotSendData(int))); } if (communication & Stdout) { outnot = new TQSocketNotifier(out[0], TQSocketNotifier::Read, this); TQ_CHECK_PTR(outnot); - TQObject::connect(outnot, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChildOutput(int))); + TQObject::connect(outnot, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChildOutput(int))); if (communication & NoRead) suspend(); } @@ -975,8 +975,8 @@ int TDEProcess::commSetupDoneP() if (communication & Stderr) { errnot = new TQSocketNotifier(err[0], TQSocketNotifier::Read, this ); TQ_CHECK_PTR(errnot); - TQObject::connect(errnot, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(slotChildError(int))); + TQObject::connect(errnot, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(slotChildError(int))); } return 1; diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h index e7414874e..3e6250486 100644 --- a/tdecore/kprocess.h +++ b/tdecore/kprocess.h @@ -96,8 +96,8 @@ class KPty; * * *proc << "my_executable"; * *proc << "These" << "are" << "the" << "command" << "line" << "args"; - * TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)), - * pointer_to_my_object, TQT_SLOT(my_objects_slot(TDEProcess *))); + * TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)), + * pointer_to_my_object, TQ_SLOT(my_objects_slot(TDEProcess *))); * proc->start(); * \endcode * diff --git a/tdecore/kprocio.cpp b/tdecore/kprocio.cpp index 7157662df..aac14a09e 100644 --- a/tdecore/kprocio.cpp +++ b/tdecore/kprocio.cpp @@ -67,14 +67,14 @@ KProcIO::resetAll () rbi=0; readsignalon=writeready=true; - disconnect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + disconnect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + disconnect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); - disconnect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), - this, TQT_SLOT (sent (TDEProcess *))); + disconnect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)), + this, TQ_SLOT (sent (TDEProcess *))); outbuffer.clear(); @@ -87,17 +87,17 @@ void KProcIO::setComm (Communication comm) bool KProcIO::start (RunMode runmode, bool includeStderr) { - connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + connect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); if (includeStderr) { - connect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)), - this, TQT_SLOT (received (TDEProcess *, char *, int))); + connect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)), + this, TQ_SLOT (received (TDEProcess *, char *, int))); } - connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)), - this, TQT_SLOT (sent (TDEProcess *))); + connect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)), + this, TQ_SLOT (sent (TDEProcess *))); return TDEProcess::start (runmode, d->comm); } diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp index a5bab80ce..205af6baf 100644 --- a/tdecore/ksimpledirwatch.cpp +++ b/tdecore/ksimpledirwatch.cpp @@ -213,7 +213,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() : rescan_timer(0, "KSimpleDirWatchPrivate::rescan_timer") { timer = new TQTimer(this, "KSimpleDirWatchPrivate::timer"); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); freq = 3600000; // 1 hour as upper bound statEntries = 0; delayRemove = false; @@ -227,7 +227,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() // used for FAM and DNOTIFY rescan_all = false; - connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); #ifdef HAVE_FAM // It's possible that FAM server can't be started @@ -236,8 +236,8 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() use_fam=true; sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc), TQSocketNotifier::Read, this); - connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(famEventReceived()) ); + connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(famEventReceived()) ); } else { kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl; @@ -273,7 +273,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this ); - connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) ); + connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) ); } #endif @@ -307,7 +307,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate() fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL)); fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL)); mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this); - connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated())); + connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated())); // Install the signal handler only once if ( dnotify_signal == 0 ) { @@ -1372,7 +1372,7 @@ void KSimpleDirWatchPrivate::slotRescan() if ( timerRunning ) timer->start(freq); - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } bool KSimpleDirWatchPrivate::isNoisyFile( const char * filename ) @@ -1421,7 +1421,7 @@ void KSimpleDirWatchPrivate::famEventReceived() checkFAMEvent(&fe); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } void KSimpleDirWatchPrivate::checkFAMEvent(FAMEvent* fe) diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp index 3f4886b8a..8de28f476 100644 --- a/tdecore/ksock.cpp +++ b/tdecore/ksock.cpp @@ -140,7 +140,7 @@ void TDESocket::enableRead( bool _state ) if ( !d->readNotifier ) { d->readNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Read ); - TQObject::connect( d->readNotifier, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRead(int) ) ); + TQObject::connect( d->readNotifier, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotRead(int) ) ); } else d->readNotifier->setEnabled( true ); @@ -156,8 +156,8 @@ void TDESocket::enableWrite( bool _state ) if ( !d->writeNotifier ) { d->writeNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Write ); - TQObject::connect( d->writeNotifier, TQT_SIGNAL( activated(int) ), this, - TQT_SLOT( slotWrite(int) ) ); + TQObject::connect( d->writeNotifier, TQ_SIGNAL( activated(int) ), this, + TQ_SLOT( slotWrite(int) ) ); } else d->writeNotifier->setEnabled( true ); @@ -357,7 +357,7 @@ bool TDEServerSocket::bindAndListen(bool suppressFailureMessages) sock = d->ks->fd(); - connect( d->ks->readNotifier(), TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotAccept(int) ) ); + connect( d->ks->readNotifier(), TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotAccept(int) ) ); return true; } diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp index 8dd6185d0..5e0b1cdff 100644 --- a/tdecore/kuniqueapplication.cpp +++ b/tdecore/kuniqueapplication.cpp @@ -324,11 +324,11 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c if (s_nofork) { // Can't call newInstance directly from the constructor since it's virtual... - TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) ); } else { // Force to handle DCOP requests (newInstance call) - TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed())); } } @@ -345,11 +345,11 @@ KUniqueApplication::KUniqueApplication(Display *display, TQt::HANDLE visual, if (s_nofork) { // Can't call newInstance directly from the constructor since it's virtual... - TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) ); } else { // Force to handle DCOP requests (newInstance call) - TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed())); } } #endif @@ -380,7 +380,7 @@ void KUniqueApplication::newInstanceNoFork() if (dcopClient()->isSuspended()) { // Try again later. - TQTimer::singleShot( 200, this, TQT_SLOT(newInstanceNoFork()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(newInstanceNoFork()) ); return; } @@ -421,7 +421,7 @@ KUniqueApplication::delayRequest(const TQCString &fun, const TQByteArray &data) d->requestList.append(request); if (!d->processingRequest) { - TQTimer::singleShot(0, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(processDelayed())); } } @@ -431,7 +431,7 @@ KUniqueApplication::processDelayed() if (dcopClient()->isSuspended()) { // Try again later. - TQTimer::singleShot( 200, this, TQT_SLOT(processDelayed())); + TQTimer::singleShot( 200, this, TQ_SLOT(processDelayed())); return; } d->processingRequest = true; diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp index 51e3db002..08f899c8a 100644 --- a/tdecore/network/kbufferedsocket.cpp +++ b/tdecore/network/kbufferedsocket.cpp @@ -208,7 +208,7 @@ void TDEBufferedSocket::enableRead(bool enable) if (enable && state() != Connected && d->input && !d->input->isEmpty()) // this means the buffer is still dirty // allow the signal to be emitted - TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity())); } void TDEBufferedSocket::enableWrite(bool enable) @@ -358,7 +358,7 @@ void TDEBufferedSocket::slotReadActivity() { // buffer isn't empty // keep emitting signals till it is - TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity())); + TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity())); emit readyRead(); } } diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp index 48cbbc644..25eb34d8e 100644 --- a/tdecore/network/kclientsocketbase.cpp +++ b/tdecore/network/kclientsocketbase.cpp @@ -144,10 +144,10 @@ bool KClientSocketBase::lookup() // don't restart the lookups if they had succeeded and // the input values weren't changed - TQObject::connect(&d->peerResolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); - TQObject::connect(&d->localResolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->peerResolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->localResolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); if (d->localResolver.status() <= 0) d->localResolver.start(); @@ -164,7 +164,7 @@ bool KClientSocketBase::lookup() if (blocking()) lookupFinishedSlot(); else - TQTimer::singleShot(0, this, TQT_SLOT(lookupFinishedSlot())); + TQTimer::singleShot(0, this, TQ_SLOT(lookupFinishedSlot())); } else { @@ -427,8 +427,8 @@ void KClientSocketBase::lookupFinishedSlot() if (d->peerResolver.isRunning() || d->localResolver.isRunning() || state() != HostLookup) return; - TQObject::disconnect(&d->peerResolver, 0L, this, TQT_SLOT(lookupFinishedSlot())); - TQObject::disconnect(&d->localResolver, 0L, this, TQT_SLOT(lookupFinishedSlot())); + TQObject::disconnect(&d->peerResolver, 0L, this, TQ_SLOT(lookupFinishedSlot())); + TQObject::disconnect(&d->localResolver, 0L, this, TQ_SLOT(lookupFinishedSlot())); if (d->peerResolver.status() < 0 || d->localResolver.status() < 0) { setState(Idle); // backtrack @@ -453,7 +453,7 @@ void KClientSocketBase::stateChanging(SocketState newState) if (n) { n->setEnabled(d->enableRead); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity())); } else return; @@ -462,7 +462,7 @@ void KClientSocketBase::stateChanging(SocketState newState) if (n) { n->setEnabled(d->enableWrite); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity())); } else return; diff --git a/tdecore/network/kdatagramsocket.cpp b/tdecore/network/kdatagramsocket.cpp index 97562c687..5fa631560 100644 --- a/tdecore/network/kdatagramsocket.cpp +++ b/tdecore/network/kdatagramsocket.cpp @@ -52,11 +52,11 @@ KDatagramSocket::KDatagramSocket(TQObject* parent, const char *name) localResolver().setFlags(KResolver::Passive); - // TQObject::connect(localResolver(), TQT_SIGNAL(finished(KResolverResults)), - // this, TQT_SLOT(lookupFinishedLocal())); - TQObject::connect(&peerResolver(), TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedPeer())); - TQObject::connect(this, TQT_SIGNAL(hostFound()), this, TQT_SLOT(lookupFinishedLocal())); + // TQObject::connect(localResolver(), TQ_SIGNAL(finished(KResolverResults)), + // this, TQ_SLOT(lookupFinishedLocal())); + TQObject::connect(&peerResolver(), TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedPeer())); + TQObject::connect(this, TQ_SIGNAL(hostFound()), this, TQ_SLOT(lookupFinishedLocal())); } KDatagramSocket::~KDatagramSocket() @@ -265,7 +265,7 @@ void KDatagramSocket::setupSignals() if (n) { n->setEnabled(emitsReadyRead()); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity())); } else return; @@ -274,7 +274,7 @@ void KDatagramSocket::setupSignals() if (n) { n->setEnabled(emitsReadyWrite()); - TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity())); } else return; diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp index 17ab2f068..f80b9209e 100644 --- a/tdecore/network/kresolver.cpp +++ b/tdecore/network/kresolver.cpp @@ -604,7 +604,7 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot, int flags, int families) { KResolver* qres = new KResolver(host, service, tqApp, "asynchronous KResolver"); - TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot); + TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)), userObj, userSlot); qres->setFlags(flags); qres->setFamily(families); qres->d->deleteWhenDone = true; // this is the only difference from the example code diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h index fd0636417..51e605704 100644 --- a/tdecore/network/kresolver.h +++ b/tdecore/network/kresolver.h @@ -759,7 +759,7 @@ public: * * \code * KResolver* qres = new KResolver(host, service); - * TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), + * TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)), * userObj, userSlot); * qres->setFlags(flags); * qres->setFamily(families); @@ -768,7 +768,7 @@ public: * * You should use it like this in your code: * \code - * KResolver::resolveAsync(myObj, TQT_SLOT(mySlot(KResolverResults)), host, service); + * KResolver::resolveAsync(myObj, TQ_SLOT(mySlot(KResolverResults)), host, service); * \endcode * * @param userObj the object whose slot @p userSlot we will connect diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp index 94532de19..0cfba8fa5 100644 --- a/tdecore/network/kserversocket.cpp +++ b/tdecore/network/kserversocket.cpp @@ -61,15 +61,15 @@ public: TDEServerSocket::TDEServerSocket(TQObject* parent, const char *name) : TQObject(parent, name), d(new TDEServerSocketPrivate) { - TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); } TDEServerSocket::TDEServerSocket(const TQString& service, TQObject* parent, const char *name) : TQObject(parent, name), d(new TDEServerSocketPrivate) { - TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); d->resolver.setServiceName(service); } @@ -77,8 +77,8 @@ TDEServerSocket::TDEServerSocket(const TQString& node, const TQString& service, TQObject* parent, const char* name) : TQObject(parent, name), d(new TDEServerSocketPrivate) { - TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), - this, TQT_SLOT(lookupFinishedSlot())); + TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), + this, TQ_SLOT(lookupFinishedSlot())); setAddress(node, service); } @@ -403,8 +403,8 @@ bool TDEServerSocket::doListen() } // set up ready accept signal - TQObject::connect(socketDevice()->readNotifier(), TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(readyAccept())); + TQObject::connect(socketDevice()->readNotifier(), TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(readyAccept())); d->state = TDEServerSocketPrivate::Listening; return true; } diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h index 1455dcb08..637dc92d0 100644 --- a/tdecore/network/kserversocket.h +++ b/tdecore/network/kserversocket.h @@ -50,8 +50,8 @@ class TDEServerSocketPrivate; * \code * TQString service = "http"; * TDEServerSocket *ss = new TDEServerSocket(service); - * connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - * connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); + * connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); + * connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); * ss->listen(); * \endcode * @@ -84,8 +84,8 @@ class TDEServerSocketPrivate; * if( !found ) { * // Couldn't connect to any port. * } else { - * connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept())); - * connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int))); + * connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept())); + * connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int))); * ss->listen(); * } * \endcode diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp index 8f918977e..568e0d22b 100644 --- a/tdecore/network/ksrvresolverworker.cpp +++ b/tdecore/network/ksrvresolverworker.cpp @@ -226,7 +226,7 @@ bool KSrvResolverWorker::postprocess() void KSrvResolverWorker::customEvent(TQCustomEvent*) { dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv); - TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady())); + TQObject::connect(dns, TQ_SIGNAL(resultsReady()), this, TQ_SLOT(dnsResultsReady())); } void KSrvResolverWorker::dnsResultsReady() diff --git a/tdecore/network/kstreamsocket.cpp b/tdecore/network/kstreamsocket.cpp index 6ba8dfe8b..a36f8cc78 100644 --- a/tdecore/network/kstreamsocket.cpp +++ b/tdecore/network/kstreamsocket.cpp @@ -61,7 +61,7 @@ KStreamSocket::KStreamSocket(const TQString& node, const TQString& service, setSocketOptions(socketOptions() & ~Blocking); - TQObject::connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutSlot())); + TQObject::connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutSlot())); } KStreamSocket::~KStreamSocket() @@ -130,7 +130,7 @@ bool KStreamSocket::connect(const TQString& node, const TQString& service) // connection hasn't started yet if (!blocking()) { - TQObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot())); + TQObject::connect(this, TQ_SIGNAL(hostFound()), TQ_SLOT(hostFoundSlot())); return lookup(); } @@ -196,10 +196,10 @@ bool KStreamSocket::connect(const KResolverEntry& entry) void KStreamSocket::hostFoundSlot() { - TQObject::disconnect(this, TQT_SLOT(hostFoundSlot())); + TQObject::disconnect(this, TQ_SLOT(hostFoundSlot())); if (timeout() > 0) d->timer.start(timeout(), true); - TQTimer::singleShot(0, this, TQT_SLOT(connectionEvent())); + TQTimer::singleShot(0, this, TQ_SLOT(connectionEvent())); } void KStreamSocket::connectionEvent() @@ -267,13 +267,13 @@ void KStreamSocket::connectionEvent() if (socketDevice()->error() == InProgress) { TQSocketNotifier *n = socketDevice()->readNotifier(); - TQObject::connect(n, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(connectionEvent())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(connectionEvent())); n->setEnabled(true); n = socketDevice()->writeNotifier(); - TQObject::connect(n, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(connectionEvent())); + TQObject::connect(n, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(connectionEvent())); n->setEnabled(true); return; // wait for activity @@ -350,8 +350,8 @@ bool KStreamSocket::bindLocallyFor(const KResolverEntry& peer) void KStreamSocket::connectionSucceeded(const KResolverEntry& peer) { - TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQT_SLOT(connectionEvent())); - TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQT_SLOT(connectionEvent())); + TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQ_SLOT(connectionEvent())); + TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQ_SLOT(connectionEvent())); resetError(); setFlags(IO_Sequential | IO_Raw | IO_ReadWrite | IO_Open | IO_Async); diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h index 72d176fa3..a7557d585 100644 --- a/tdecore/network/kstreamsocket.h +++ b/tdecore/network/kstreamsocket.h @@ -70,14 +70,14 @@ class KStreamSocketPrivate; * : socket(hostname, port) * { * // connect signals to our slots - * TQObject::connect(&socket, TQT_SIGNAL(connected(const KResolverEntry&)), - * this, TQT_SLOT(slotSocketConnected())); - * TQObject::connect(&socket, TQT_SIGNAL(gotError(int)), - * this, TQT_SLOT(slotSocketError(int))); - * TQObject::connect(&socket, TQT_SIGNAL(readyRead()), - * this, TQT_SLOT(slotSocketReadyToRead())); - * TQObject::connect(&socket, TQT_SIGNAL(readyWrite()), - * this, TQT_SLOT(slotSocketReadyToWrite())); + * TQObject::connect(&socket, TQ_SIGNAL(connected(const KResolverEntry&)), + * this, TQ_SLOT(slotSocketConnected())); + * TQObject::connect(&socket, TQ_SIGNAL(gotError(int)), + * this, TQ_SLOT(slotSocketError(int))); + * TQObject::connect(&socket, TQ_SIGNAL(readyRead()), + * this, TQ_SLOT(slotSocketReadyToRead())); + * TQObject::connect(&socket, TQ_SIGNAL(readyWrite()), + * this, TQ_SLOT(slotSocketReadyToWrite())); * * // set non-blocking mode in order to work asynchronously * socket.setBlocking(false); diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp index 58499f7e4..fa8cccc56 100644 --- a/tdecore/tdeaccel.cpp +++ b/tdecore/tdeaccel.cpp @@ -170,7 +170,7 @@ TDEAccelPrivate::TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch ) m_pAccel = pParent; m_pWatch = pWatch; m_bAutoUpdate = true; - connect( (TQAccel*)m_pAccel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeyPressed(int)) ); + connect( (TQAccel*)m_pAccel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotKeyPressed(int)) ); #ifdef Q_WS_X11 //only makes sense if TDEAccelEventHandler is working if( m_pWatch ) @@ -240,7 +240,7 @@ bool TDEAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key& #ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ ((TQAccel*)m_pAccel)->connectItem( nID, action.objSlotPtr(), action.methodSlotPtr() ); #else - ((TQAccel*)m_pAccel)->connectItem( nID, this, TQT_SLOT(slotKeyPressed(int))); + ((TQAccel*)m_pAccel)->connectItem( nID, this, TQ_SLOT(slotKeyPressed(int))); #endif if( !action.isEnabled() ) ((TQAccel*)m_pAccel)->setItemEnabled( nID, false ); @@ -318,9 +318,9 @@ void TDEAccelPrivate::slotKeyPressed( int id ) int iAction = pMenu->idAt(1); slotMenuActivated( iAction ); } else { - connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) ); + connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) ); pMenu->exec( m_pWatch->mapToGlobal( TQPoint( 0, 0 ) ) ); - disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) ); + disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) ); } delete pMenu; } @@ -336,9 +336,9 @@ void TDEAccelPrivate::slotMenuActivated( int iAction ) TDEAccelAction* pAction = actions().actionPtr( iAction ); #ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ if( pAction ) { - connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated(); - disconnect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + disconnect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } #else emitActivatedSignal( pAction ); @@ -364,10 +364,10 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent ) continue; #ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */ TQGuardedPtr me = this; - connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated(); if (me) { - disconnect( me, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); + disconnect( me, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } #else emitActivatedSignal( pAction ); @@ -391,18 +391,18 @@ void TDEAccelPrivate::emitActivatedSignal( TDEAccelAction* pAction ) TQGuardedPtr me = this; TQRegExp reg( "([ ]*TDEAccelAction.*)" ); if( reg.search( pAction->methodSlotPtr()) >= 0 ) { - connect( this, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)), + connect( this, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated( pAction ); if (me) - disconnect( me, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)), + disconnect( me, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } else { - connect( this, TQT_SIGNAL(menuItemActivated()), + connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); emit menuItemActivated(); if (me) - disconnect( me, TQT_SIGNAL(menuItemActivated()), + disconnect( me, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() ); } diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h index 8c806ad3f..dd0c03aad 100644 --- a/tdecore/tdeaccel.h +++ b/tdecore/tdeaccel.h @@ -74,9 +74,9 @@ class TDEAccelPrivate; * // Insert an action "Scroll Up" which is associated with the "Up" key: * pAccel->insert( "Scroll Up", i18n("Scroll up"), * i18n("Scroll up the current document by one line."), - * TQt::Key_Up, this, TQT_SLOT(slotScrollUp()) ); + * TQt::Key_Up, this, TQ_SLOT(slotScrollUp()) ); * // Insert an standard acclerator action. - * pAccel->insert( TDEStdAccel::Print, this, TQT_SLOT(slotPrint()) ); + * pAccel->insert( TDEStdAccel::Print, this, TQ_SLOT(slotPrint()) ); * * // Update the shortcuts by read any user-defined settings from the * // application's config file. @@ -159,7 +159,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * insert( "Do Something", i18n("Do Something"), * i18n("This action allows you to do something really great with this program to " * "the currently open document."), - * ALT+Key_D, this, TQT_SLOT(slotDoSomething()) ); + * ALT+Key_D, this, TQ_SLOT(slotDoSomething()) ); *\endcode * * @param sAction The internal name of the action. @@ -191,7 +191,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel * * Usage: * \code - * insert( i18n("Do Something"), ALT+Key_D, this, TQT_SLOT(slotDoSomething()) ); + * insert( i18n("Do Something"), ALT+Key_D, this, TQ_SLOT(slotDoSomething()) ); * \endcode * * @param psAction The name AND label of the action. diff --git a/tdecore/tdeaccelbase.h b/tdecore/tdeaccelbase.h index ecd0ce358..7a2955b66 100644 --- a/tdecore/tdeaccelbase.h +++ b/tdecore/tdeaccelbase.h @@ -79,11 +79,11 @@ class TQWidget; * a->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" ); * // Insert an action "Scroll Down" which is not associated with any key: * a->insertItem( i18n("Scroll Down"), "Scroll Down", 0); - * a->connectItem( "Scroll up", myWindow, TQT_SLOT( scrollUp() ) ); + * a->connectItem( "Scroll up", myWindow, TQ_SLOT( scrollUp() ) ); * // a->insertStdItem( TDEStdAccel::Print ); //not necessary, since it * // is done automatially with the * // connect below! - * a->connectItem(TDEStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) ); + * a->connectItem(TDEStdAccel::Print, myWindow, TQ_SLOT( printDoc() ) ); * * a->readSettings(); *\endcode @@ -93,12 +93,12 @@ class TQWidget; * * \code * int id; - * id = popup->insertItem("&Print",this, TQT_SLOT(printDoc())); + * id = popup->insertItem("&Print",this, TQ_SLOT(printDoc())); * a->changeMenuAccel(popup, id, TDEStdAccel::Print ); * \endcode * * If you want a somewhat "exotic" name for your standard print action, like - * id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc())); + * id = popup->insertItem(i18n("Print &Document"),this, TQ_SLOT(printDoc())); * it might be a good idea to insert the standard action before as * a->insertStdItem( TDEStdAccel::Print, i18n("Print Document") ) * as well, so that the user can easily find the corresponding function. @@ -107,7 +107,7 @@ class TQWidget; * in a menu could be done with * * \code - * id = popup->insertItem(i18n"Scroll &up",this, TQT_SLOT(scrollUp())); + * id = popup->insertItem(i18n"Scroll &up",this, TQ_SLOT(scrollUp())); * a->changeMenuAccel(popup, id, "Scroll Up" ); * \endcode * diff --git a/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp index e7cfb10eb..ea0b034fd 100644 --- a/tdecore/tdeaccelmanager.cpp +++ b/tdecore/tdeaccelmanager.cpp @@ -734,7 +734,7 @@ TDEPopupAccelManager::TDEPopupAccelManager(TQPopupMenu *popup) : TQObject(popup), m_popup(popup), m_count(-1) { aboutToShow(); // do one check and then connect to show - connect(popup, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShow())); + connect(popup, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShow())); } @@ -840,7 +840,7 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack) : TQObject(stack), m_stack(stack) { aboutToShow(stack->visibleWidget()); // do one check and then connect to show - connect(stack, TQT_SIGNAL(aboutToShow(TQWidget *)), TQT_SLOT(aboutToShow(TQWidget *))); + connect(stack, TQ_SIGNAL(aboutToShow(TQWidget *)), TQ_SLOT(aboutToShow(TQWidget *))); } bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e ) diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp index 810942e21..fd1cffc9f 100644 --- a/tdecore/tdeapplication.cpp +++ b/tdecore/tdeapplication.cpp @@ -522,7 +522,7 @@ void TDEApplication::installX11EventFilter( TQWidget* filter ) return; if (!x11Filter) x11Filter = new TQPtrList; - connect ( filter, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( x11FilterDestroyed() ) ); + connect ( filter, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( x11FilterDestroyed() ) ); x11Filter->append( filter ); } @@ -636,7 +636,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event) if( d->app_started_timer == NULL ) { d->app_started_timer = new TQTimer( this, "app_started_timer" ); - connect( d->app_started_timer, TQT_SIGNAL( timeout()), TQT_SLOT( checkAppStartedSlot())); + connect( d->app_started_timer, TQ_SIGNAL( timeout()), TQ_SLOT( checkAppStartedSlot())); } if( !d->app_started_timer->isActive()) d->app_started_timer->start( 0, true ); @@ -1065,7 +1065,7 @@ void TDEApplication::init(bool GUIenabled) d->oldXIOErrorHandler = XSetIOErrorHandler( kde_xio_errhandler ); #endif - connect( this, TQT_SIGNAL( aboutToQuit() ), this, TQT_SIGNAL( shutDown() ) ); + connect( this, TQ_SIGNAL( aboutToQuit() ), this, TQ_SIGNAL( shutDown() ) ); #ifdef Q_WS_X11 //FIXME(E) display = desktop()->x11Display(); @@ -1196,10 +1196,10 @@ DCOPClient *TDEApplication::dcopClient() s_DCOPClient->setServerAddress( args->getOption("dcopserver")); } if( kapp ) { - connect(s_DCOPClient, TQT_SIGNAL(attachFailed(const TQString &)), - kapp, TQT_SLOT(dcopFailure(const TQString &))); - connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ), - kapp, TQT_SLOT(dcopBlockUserInput(bool)) ); + connect(s_DCOPClient, TQ_SIGNAL(attachFailed(const TQString &)), + kapp, TQ_SLOT(dcopFailure(const TQString &))); + connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ), + kapp, TQ_SLOT(dcopBlockUserInput(bool)) ); } else s_dcopClientNeedsPostInit = true; @@ -1213,8 +1213,8 @@ void TDEApplication::dcopClientPostInit() if( s_dcopClientNeedsPostInit ) { s_dcopClientNeedsPostInit = false; - connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ), - TQT_SLOT(dcopBlockUserInput(bool)) ); + connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ), + TQ_SLOT(dcopBlockUserInput(bool)) ); s_DCOPClient->bindToApp(); // Make sure we get events from the DCOPClient. } } @@ -3021,27 +3021,27 @@ void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startu void TDEApplication::cut() { - invokeEditSlot( TQT_SLOT( cut() ) ); + invokeEditSlot( TQ_SLOT( cut() ) ); } void TDEApplication::copy() { - invokeEditSlot( TQT_SLOT( copy() ) ); + invokeEditSlot( TQ_SLOT( copy() ) ); } void TDEApplication::paste() { - invokeEditSlot( TQT_SLOT( paste() ) ); + invokeEditSlot( TQ_SLOT( paste() ) ); } void TDEApplication::clear() { - invokeEditSlot( TQT_SLOT( clear() ) ); + invokeEditSlot( TQ_SLOT( clear() ) ); } void TDEApplication::selectAll() { - invokeEditSlot( TQT_SLOT( selectAll() ) ); + invokeEditSlot( TQ_SLOT( selectAll() ) ); } void TDEApplication::broadcastKeyCode(unsigned int keyCode) diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h index ee2b482a6..8e5e53ec8 100644 --- a/tdecore/tdeapplication.h +++ b/tdecore/tdeapplication.h @@ -621,7 +621,7 @@ public slots: * If the widget with focus provides a cut() slot, call that slot. Thus for a * simple application cut can be implemented as: * \code - * KStdAction::cut( kapp, TQT_SLOT( cut() ), actionCollection() ); + * KStdAction::cut( kapp, TQ_SLOT( cut() ), actionCollection() ); * \endcode */ void cut(); @@ -630,7 +630,7 @@ public slots: * If the widget with focus provides a copy() slot, call that slot. Thus for a * simple application copy can be implemented as: * \code - * KStdAction::copy( kapp, TQT_SLOT( copy() ), actionCollection() ); + * KStdAction::copy( kapp, TQ_SLOT( copy() ), actionCollection() ); * \endcode */ void copy(); @@ -639,7 +639,7 @@ public slots: * If the widget with focus provides a paste() slot, call that slot. Thus for a * simple application copy can be implemented as: * \code - * KStdAction::paste( kapp, TQT_SLOT( paste() ), actionCollection() ); + * KStdAction::paste( kapp, TQ_SLOT( paste() ), actionCollection() ); * \endcode */ void paste(); @@ -648,7 +648,7 @@ public slots: * If the widget with focus provides a clear() slot, call that slot. Thus for a * simple application clear() can be implemented as: * \code - * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" ); + * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQ_SLOT( clear() ), actionCollection(), "clear" ); * \endcode * * Note that for some widgets, this may not provide the intended bahavior. For @@ -675,7 +675,7 @@ public slots: * If the widget with focus provides a selectAll() slot, call that slot. Thus for a * simple application select all can be implemented as: * \code - * KStdAction::selectAll( kapp, TQT_SLOT( selectAll() ), actionCollection() ); + * KStdAction::selectAll( kapp, TQ_SLOT( selectAll() ), actionCollection() ); * \endcode */ void selectAll(); @@ -1287,7 +1287,7 @@ protected: * This method is used internally to determine which edit slots are implemented * by the widget that has the focus, and to invoke those slots if available. * - * @param slot is the slot as returned using the TQT_SLOT() macro, for example TQT_SLOT( cut() ) + * @param slot is the slot as returned using the TQ_SLOT() macro, for example TQ_SLOT( cut() ) * * This method can be used in TDEApplication subclasses to implement application wide * edit actions not supported by the TDEApplication class. For example (in your subclass): @@ -1295,7 +1295,7 @@ protected: * \code * void MyApplication::deselect() * { - * invokeEditSlot( TQT_SLOT( deselect() ) ); + * invokeEditSlot( TQ_SLOT( deselect() ) ); * } * \endcode * @@ -1303,7 +1303,7 @@ protected: * focused widget if it provides this slot. You can combine this with TDEAction with: * * \code - * KStdAction::deselect( static_cast( kapp ), TQT_SLOT( cut() ), actionCollection() ); + * KStdAction::deselect( static_cast( kapp ), TQ_SLOT( cut() ), actionCollection() ); * \endcode * * @see cut() diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp index f53ce3a30..7b23f43b8 100644 --- a/tdecore/tdeconfigdialogmanager.cpp +++ b/tdecore/tdeconfigdialogmanager.cpp @@ -69,52 +69,52 @@ void TDEConfigDialogManager::init(bool trackChanges) if(trackChanges) { // QT - changedMap.insert("TQButton", TQT_SIGNAL(stateChanged(int))); - changedMap.insert("TQCheckBox", TQT_SIGNAL(stateChanged(int))); - changedMap.insert("TQPushButton", TQT_SIGNAL(stateChanged(int))); - changedMap.insert("TQRadioButton", TQT_SIGNAL(stateChanged(int))); + changedMap.insert("TQButton", TQ_SIGNAL(stateChanged(int))); + changedMap.insert("TQCheckBox", TQ_SIGNAL(stateChanged(int))); + changedMap.insert("TQPushButton", TQ_SIGNAL(stateChanged(int))); + changedMap.insert("TQRadioButton", TQ_SIGNAL(stateChanged(int))); // We can only store one thing, so you can't have // a ButtonGroup that is checkable. - changedMap.insert("TQButtonGroup", TQT_SIGNAL(clicked(int))); - changedMap.insert("TQGroupBox", TQT_SIGNAL(toggled(bool))); - changedMap.insert("TQComboBox", TQT_SIGNAL(activated (int))); + changedMap.insert("TQButtonGroup", TQ_SIGNAL(clicked(int))); + changedMap.insert("TQGroupBox", TQ_SIGNAL(toggled(bool))); + changedMap.insert("TQComboBox", TQ_SIGNAL(activated (int))); //qsqlproperty map doesn't store the text, but the value! - //changedMap.insert("TQComboBox", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert("TQDateEdit", TQT_SIGNAL(valueChanged(const TQDate &))); - changedMap.insert("TQDateTimeEdit", TQT_SIGNAL(valueChanged(const TQDateTime &))); - changedMap.insert("TQDial", TQT_SIGNAL(valueChanged (int))); - changedMap.insert("TQLineEdit", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert("TQSlider", TQT_SIGNAL(valueChanged(int))); - changedMap.insert("TQSpinBox", TQT_SIGNAL(valueChanged(int))); - changedMap.insert("TQTimeEdit", TQT_SIGNAL(valueChanged(const TQTime &))); - changedMap.insert("TQTextEdit", TQT_SIGNAL(textChanged())); - changedMap.insert("TQTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert("TQMultiLineEdit", TQT_SIGNAL(textChanged())); - changedMap.insert("TQListBox", TQT_SIGNAL(selectionChanged())); - changedMap.insert("TQTabWidget", TQT_SIGNAL(currentChanged(TQWidget *))); + //changedMap.insert("TQComboBox", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert("TQDateEdit", TQ_SIGNAL(valueChanged(const TQDate &))); + changedMap.insert("TQDateTimeEdit", TQ_SIGNAL(valueChanged(const TQDateTime &))); + changedMap.insert("TQDial", TQ_SIGNAL(valueChanged (int))); + changedMap.insert("TQLineEdit", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert("TQSlider", TQ_SIGNAL(valueChanged(int))); + changedMap.insert("TQSpinBox", TQ_SIGNAL(valueChanged(int))); + changedMap.insert("TQTimeEdit", TQ_SIGNAL(valueChanged(const TQTime &))); + changedMap.insert("TQTextEdit", TQ_SIGNAL(textChanged())); + changedMap.insert("TQTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert("TQMultiLineEdit", TQ_SIGNAL(textChanged())); + changedMap.insert("TQListBox", TQ_SIGNAL(selectionChanged())); + changedMap.insert("TQTabWidget", TQ_SIGNAL(currentChanged(TQWidget *))); // KDE - changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int))); - changedMap.insert( "TDEFontCombo", TQT_SIGNAL(activated (int))); - changedMap.insert( "TDEFontRequester", TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( "TDEFontChooser", TQT_SIGNAL(fontSelected(const TQFont &))); - changedMap.insert( "KHistoryCombo", TQT_SIGNAL(activated (int))); - - changedMap.insert( "KColorButton", TQT_SIGNAL(changed(const TQColor &))); - changedMap.insert( "KDatePicker", TQT_SIGNAL(dateSelected (TQDate))); - changedMap.insert( "KDateWidget", TQT_SIGNAL(changed (TQDate))); - changedMap.insert( "KDateTimeWidget", TQT_SIGNAL(valueChanged (const TQDateTime &))); - changedMap.insert( "KEditListBox", TQT_SIGNAL(changed())); - changedMap.insert( "TDEListBox", TQT_SIGNAL(selectionChanged())); - changedMap.insert( "KLineEdit", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( "KPasswordEdit", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( "KRestrictedLine", TQT_SIGNAL(textChanged(const TQString &))); - changedMap.insert( "KTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &))); - changedMap.insert( "KTextEdit", TQT_SIGNAL(textChanged())); - changedMap.insert( "KURLRequester", TQT_SIGNAL(textChanged (const TQString& ))); - changedMap.insert( "KIntNumInput", TQT_SIGNAL(valueChanged (int))); - changedMap.insert( "KIntSpinBox", TQT_SIGNAL(valueChanged (int))); - changedMap.insert( "KDoubleNumInput", TQT_SIGNAL(valueChanged (double))); + changedMap.insert( "KComboBox", TQ_SIGNAL(activated (int))); + changedMap.insert( "TDEFontCombo", TQ_SIGNAL(activated (int))); + changedMap.insert( "TDEFontRequester", TQ_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( "TDEFontChooser", TQ_SIGNAL(fontSelected(const TQFont &))); + changedMap.insert( "KHistoryCombo", TQ_SIGNAL(activated (int))); + + changedMap.insert( "KColorButton", TQ_SIGNAL(changed(const TQColor &))); + changedMap.insert( "KDatePicker", TQ_SIGNAL(dateSelected (TQDate))); + changedMap.insert( "KDateWidget", TQ_SIGNAL(changed (TQDate))); + changedMap.insert( "KDateTimeWidget", TQ_SIGNAL(valueChanged (const TQDateTime &))); + changedMap.insert( "KEditListBox", TQ_SIGNAL(changed())); + changedMap.insert( "TDEListBox", TQ_SIGNAL(selectionChanged())); + changedMap.insert( "KLineEdit", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( "KPasswordEdit", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( "KRestrictedLine", TQ_SIGNAL(textChanged(const TQString &))); + changedMap.insert( "KTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &))); + changedMap.insert( "KTextEdit", TQ_SIGNAL(textChanged())); + changedMap.insert( "KURLRequester", TQ_SIGNAL(textChanged (const TQString& ))); + changedMap.insert( "KIntNumInput", TQ_SIGNAL(valueChanged (int))); + changedMap.insert( "KIntSpinBox", TQ_SIGNAL(valueChanged (int))); + changedMap.insert( "KDoubleNumInput", TQ_SIGNAL(valueChanged (double))); } // Go through all of the children of the widgets and find all known widgets @@ -199,7 +199,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha else { connect(childWidget, *changedIt, - this, TQT_SIGNAL(widgetModified())); + this, TQ_SIGNAL(widgetModified())); TQGroupBox *gb = dynamic_cast(childWidget); if (!gb) @@ -209,8 +209,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha TQComboBox *cb = dynamic_cast(childWidget); if (cb && cb->editable()) - connect(cb, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SIGNAL(widgetModified())); + connect(cb, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SIGNAL(widgetModified())); } } else @@ -291,7 +291,7 @@ void TDEConfigDialogManager::updateWidgets() blockSignals(bSignalsBlocked); if (changed) - TQTimer::singleShot(0, this, TQT_SIGNAL(widgetModified())); + TQTimer::singleShot(0, this, TQ_SIGNAL(widgetModified())); } void TDEConfigDialogManager::updateWidgetsDefault() diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp index 3e8ef6daa..754fd31b8 100644 --- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp +++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp @@ -1259,23 +1259,23 @@ TDENetworkConnectionManager_BackendNM::TDENetworkConnectionManager_BackendNM(TDE } // Connect global signals - connect(d->m_networkManagerProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessGlobalStateChanged(TQ_UINT32))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessGlobalStateChanged(TQ_UINT32))); // Connect VPN signals if (d->m_vpnProxy) { - connect(d->m_vpnProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessVPNStateChanged(TQ_UINT32))); - connect(d->m_vpnProxy, SIGNAL(LoginBanner(const TQString&)), d, SLOT(internalProcessVPNLoginBanner(const TQString&))); - connect(d->m_vpnProxy, SIGNAL(Failure(TQ_UINT32)), d, SLOT(internalProcessVPNFailure(TQ_UINT32))); + connect(d->m_vpnProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNStateChanged(TQ_UINT32))); + connect(d->m_vpnProxy, TQ_SIGNAL(LoginBanner(const TQString&)), d, TQ_SLOT(internalProcessVPNLoginBanner(const TQString&))); + connect(d->m_vpnProxy, TQ_SIGNAL(Failure(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNFailure(TQ_UINT32))); } // Connect local signals if (d->m_networkDeviceProxy) { - connect(d->m_networkDeviceProxy, SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32))); + connect(d->m_networkDeviceProxy, TQ_SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, TQ_SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32))); } if (d->m_wiFiDeviceProxy) { - connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&))); - connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&))); - connect(d->m_wiFiDeviceProxy, SIGNAL(PropertiesChanged(const TQMap&)), d, SLOT(internalProcessWiFiPropertiesChanged(const TQMap&))); + connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&))); + connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&))); + connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(PropertiesChanged(const TQMap&)), d, TQ_SLOT(internalProcessWiFiPropertiesChanged(const TQMap&))); } // Create public lists @@ -1510,7 +1510,7 @@ void TDENetworkConnectionManager_BackendNMPrivate::internalProcessWiFiAccessPoin // Set up monitoring object DBus::AccessPointProxy* apProxy = new DBus::AccessPointProxy(NM_DBUS_SERVICE, dbuspath); apProxy->setConnection(TQT_DBusConnection::systemBus()); - connect(apProxy, SIGNAL(PropertiesChanged(const TQMap&)), this, SLOT(internalProcessAPPropertiesChanged(const TQMap&))); + connect(apProxy, TQ_SIGNAL(PropertiesChanged(const TQMap&)), this, TQ_SLOT(internalProcessAPPropertiesChanged(const TQMap&))); m_accessPointProxyList[dbuspath] = (apProxy); // Notify client applications @@ -1599,7 +1599,7 @@ TDENetworkConnectionType::TDENetworkConnectionType TDENetworkConnectionManager_B // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, dbusPath); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap&))); + connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap&))); int asyncCallID; ret = connectionSettings.GetSettingsAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -1928,8 +1928,8 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() { // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, (*it)); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap&))); - connect(&connectionSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError))); + connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap&))); + connect(&connectionSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError))); int asyncCallID; ret = connectionSettings.GetSettingsAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -3055,7 +3055,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri // Obtain connection secrets from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap&))); + connect(&connectionSettings, TQ_SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap&))); int asyncCallID; ret = connectionSettings.GetSecretsAsync(asyncCallID, group, error); if (ret && error.isValid()) { @@ -3260,7 +3260,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* // Obtain connection settings from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap&))); + connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap&))); int asyncCallID; ret = connectionSettings.GetSettingsAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -4492,7 +4492,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* // Save connection settings to the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(UpdateAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int))); + connect(&connectionSettings, TQ_SIGNAL(UpdateAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int))); int asyncCallID; ret = connectionSettings.UpdateAsync(asyncCallID, connectionSettingsMap, error); if (ret && error.isValid()) { @@ -4526,8 +4526,8 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection* printf("[network-manager comm debug] Creating new connection\n"); fflush(stdout); #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS // Create new connection - connect(d->m_networkManagerSettings, SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); - connect(d->m_networkManagerSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); + connect(d->m_networkManagerSettings, TQ_SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); + connect(d->m_networkManagerSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); int asyncCallID; ret = d->m_networkManagerSettings->AddConnectionAsync(asyncCallID, connectionSettingsMap, error); if (ret && error.isValid()) { @@ -4580,7 +4580,7 @@ bool TDENetworkConnectionManager_BackendNM::deleteConnection(TQString uuid) { // Obtain connection secrets from the path specified DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection); connectionSettings.setConnection(TQT_DBusConnection::systemBus()); - connect(&connectionSettings, SIGNAL(DeleteAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int))); + connect(&connectionSettings, TQ_SIGNAL(DeleteAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int))); int asyncCallID; ret = connectionSettings.DeleteAsync(asyncCallID, error); if (ret && error.isValid()) { @@ -4804,8 +4804,8 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag return checkConnectionStatus(uuid); #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING - connect(d->m_networkManagerProxy, SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); - connect(d->m_networkManagerProxy, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError))); #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING int asyncCallID; ret = d->m_networkManagerProxy->ActivateConnectionAsync(asyncCallID, existingConnection, TQT_DBusObjectPath(d->m_dbusDeviceString.ascii()), TQT_DBusObjectPath("/"), error); @@ -5000,7 +5000,7 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag return checkConnectionStatus(uuid); #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING - connect(d->m_networkManagerProxy, SIGNAL(DeactivateConnectionAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int))); + connect(d->m_networkManagerProxy, TQ_SIGNAL(DeactivateConnectionAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int))); #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING int asyncCallID; ret = d->m_networkManagerProxy->DeactivateConnectionAsync(asyncCallID, existingConnection, error); @@ -5441,7 +5441,7 @@ TDENetworkConnectionManager_BackendNMPrivate::TDENetworkConnectionManager_Backen // Set up global signal handler m_dbusSignalConnection = new TQT_DBusConnection(TQT_DBusConnection::systemBus()); m_dbusSignalReceiver = new TDENetworkConnectionManager_BackendNM_DBusSignalReceiver(this); - m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQT_SLOT(dbusSignal(const TQT_DBusMessage&))); + m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQ_SLOT(dbusSignal(const TQT_DBusMessage&))); } TDENetworkConnectionManager_BackendNMPrivate::~TDENetworkConnectionManager_BackendNMPrivate() { diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp index c593d2ab6..4d9eeaab3 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.cpp +++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp @@ -509,9 +509,9 @@ void TDECryptographicCardDevice::enableCardMonitoring(bool enable) { m_watcherObject->cardDevice = this; m_watcherObject->moveToThread(m_watcherThread); - TQObject::connect(m_watcherObject, SIGNAL(statusChanged(TQString,TQString)), this, SLOT(cardStatusChanged(TQString,TQString))); - TQObject::connect(m_watcherObject, SIGNAL(pinRequested(TQString)), this, SLOT(workerRequestedPin(TQString))); - TQTimer::singleShot(0, m_watcherObject, SLOT(run())); + TQObject::connect(m_watcherObject, TQ_SIGNAL(statusChanged(TQString,TQString)), this, TQ_SLOT(cardStatusChanged(TQString,TQString))); + TQObject::connect(m_watcherObject, TQ_SIGNAL(pinRequested(TQString)), this, TQ_SLOT(workerRequestedPin(TQString))); + TQTimer::singleShot(0, m_watcherObject, TQ_SLOT(run())); m_watcherThread->start(); } diff --git a/tdecore/tdehw/tdeeventdevice.cpp b/tdecore/tdehw/tdeeventdevice.cpp index c528a42db..3223e80e7 100644 --- a/tdecore/tdehw/tdeeventdevice.cpp +++ b/tdecore/tdehw/tdeeventdevice.cpp @@ -349,7 +349,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) { if (eventType() != TDEEventDeviceType::Unknown) { if (m_fd >= 0) { m_eventNotifier = new TQSocketNotifier(m_fd, TQSocketNotifier::Read, this); - connect( m_eventNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(eventReceived()) ); + connect( m_eventNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(eventReceived()) ); m_monitorActive = true; } } @@ -357,7 +357,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) { // get initial state of switches internalReadProvidedSwitches(); internalReadActiveSwitches(); - connect( this, TQT_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQT_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) ); + connect( this, TQ_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQ_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) ); } } } @@ -387,9 +387,9 @@ void TDEEventDevice::processActiveSwitches() { } void TDEEventDevice::connectNotify( const char* signal ) { - if( !m_monitorActive && qstrcmp( signal, TQT_SIGNAL(switchChanged())) == 0 ) { + if( !m_monitorActive && qstrcmp( signal, TQ_SIGNAL(switchChanged())) == 0 ) { m_watchTimer = new TQTimer(this); - connect( m_watchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processActiveSwitches()) ); + connect( m_watchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processActiveSwitches()) ); m_watchTimer->start( 2500, false ); m_monitorActive = true; diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 39f57451b..f54b1e138 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -155,7 +155,7 @@ TDEHardwareDevices::TDEHardwareDevices() { int udevmonitorfd = udev_monitor_get_fd(m_udevMonitorStruct); if (udevmonitorfd >= 0) { m_devScanNotifier = new TQSocketNotifier(udevmonitorfd, TQSocketNotifier::Read, this); - connect( m_devScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHotPluggedHardware()) ); + connect( m_devScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processHotPluggedHardware()) ); } // Read in the current mount table @@ -177,7 +177,7 @@ TDEHardwareDevices::TDEHardwareDevices() { m_procMountsFd = open("/proc/mounts", O_RDONLY, 0); if (m_procMountsFd >= 0) { m_mountScanNotifier = new TQSocketNotifier(m_procMountsFd, TQSocketNotifier::Exception, this); - connect( m_mountScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processModifiedMounts()) ); + connect( m_mountScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processModifiedMounts()) ); } // Read in the current cpu information @@ -199,20 +199,20 @@ TDEHardwareDevices::TDEHardwareDevices() { // Monitor for changed cpu information // Watched directories are set up during the initial CPU scan m_cpuWatch = new KSimpleDirWatch(this); - connect( m_cpuWatch, TQT_SIGNAL(dirty(const TQString &)), this, TQT_SLOT(processModifiedCPUs()) ); + connect( m_cpuWatch, TQ_SIGNAL(dirty(const TQString &)), this, TQ_SLOT(processModifiedCPUs()) ); #else m_cpuWatchTimer = new TQTimer(this); - connect( m_cpuWatchTimer, SIGNAL(timeout()), this, SLOT(processModifiedCPUs()) ); + connect( m_cpuWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processModifiedCPUs()) ); #endif // Some devices do not receive update signals from udev // These devices must be polled, and a good polling interval is 1 second m_deviceWatchTimer = new TQTimer(this); - connect( m_deviceWatchTimer, SIGNAL(timeout()), this, SLOT(processStatelessDevices()) ); + connect( m_deviceWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processStatelessDevices()) ); // Special case for battery and power supply polling (longer delay, 5 seconds) m_batteryWatchTimer = new TQTimer(this); - connect( m_batteryWatchTimer, SIGNAL(timeout()), this, SLOT(processBatteryDevices()) ); + connect( m_batteryWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processBatteryDevices()) ); // Update internal device information. queryHardwareInformation(); diff --git a/tdecore/tdehw/tdenetworkconnections.cpp b/tdecore/tdehw/tdenetworkconnections.cpp index 0b6405ea3..b2ae276a8 100644 --- a/tdecore/tdehw/tdenetworkconnections.cpp +++ b/tdecore/tdehw/tdenetworkconnections.cpp @@ -707,7 +707,7 @@ TDEWiFiConnection::~TDEWiFiConnection() { TDENetworkConnectionManager::TDENetworkConnectionManager(TDENetworkDevice *networkDevice) : TQObject(), m_connectionList(NULL), m_hwNeighborList(NULL), m_networkDevice(networkDevice), m_prevConnectionStatus(TDENetworkGlobalManagerFlags::Unknown) { m_emissionTimer = new TQTimer(); - connect(m_emissionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitQueuedSignals())); + connect(m_emissionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitQueuedSignals())); if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true); } @@ -962,9 +962,9 @@ TDEGlobalNetworkManager::TDEGlobalNetworkManager() : m_internalConnectionManager m_internalConnectionManager = new TDENetworkConnectionManager_BackendNM(NULL); #endif // WITH_NETWORK_MANAGER_BACKEND if (m_internalConnectionManager) { - connect(m_internalConnectionManager, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); - connect(m_internalConnectionManager, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); - connect(m_internalConnectionManager, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType))); + connect(m_internalConnectionManager, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags))); + connect(m_internalConnectionManager, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString))); + connect(m_internalConnectionManager, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType))); } } diff --git a/tdecore/tdeshortcut.h b/tdecore/tdeshortcut.h index 407d558a8..69fb3c82c 100644 --- a/tdecore/tdeshortcut.h +++ b/tdecore/tdeshortcut.h @@ -528,7 +528,7 @@ class TDECORE_EXPORT KKeySequence * the below code binds the escape key to the close action. * * \code -* TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() ); +* TDEAction *closeAction = KStdAction::close( this, TQ_SLOT( close() ), actionCollection() ); * TDEShortcut closeShortcut = closeAction->shortcut(); * closeShortcut.append( KKey(Key_Escape)); * closeAction->setShortcut(closeShortcut); diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp index 99fdefa73..edcb27831 100644 --- a/tdecore/tdestartupinfo.cpp +++ b/tdecore/tdestartupinfo.cpp @@ -134,15 +134,15 @@ void TDEStartupInfo::init( int flags_P ) if( !( d->flags & DisableKWinModule )) { d->wm_module = new KWinModule( this ); - connect( d->wm_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( slot_window_added( WId ))); - connect( d->wm_module, TQT_SIGNAL( systemTrayWindowAdded( WId )), TQT_SLOT( slot_window_added( WId ))); + connect( d->wm_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( slot_window_added( WId ))); + connect( d->wm_module, TQ_SIGNAL( systemTrayWindowAdded( WId )), TQ_SLOT( slot_window_added( WId ))); } else d->wm_module = NULL; - connect( &d->msgs, TQT_SIGNAL( gotMessage( const TQString& )), TQT_SLOT( got_message( const TQString& ))); + connect( &d->msgs, TQ_SIGNAL( gotMessage( const TQString& )), TQ_SLOT( got_message( const TQString& ))); #endif d->cleanup = new TQTimer( this, "cleanup" ); - connect( d->cleanup, TQT_SIGNAL( timeout()), TQT_SLOT( startups_cleanup())); + connect( d->cleanup, TQ_SIGNAL( timeout()), TQ_SLOT( startups_cleanup())); } TDEStartupInfo::~TDEStartupInfo() @@ -815,7 +815,7 @@ void TDEStartupInfo::setTimeout( unsigned int secs_P ) { timeout = secs_P; // schedule removing entries that are older than the new timeout - TQTimer::singleShot( 0, this, TQT_SLOT( startups_cleanup_no_age())); + TQTimer::singleShot( 0, this, TQ_SLOT( startups_cleanup_no_age())); } void TDEStartupInfo::startups_cleanup_no_age() diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp index d1a678ac9..72101d8b1 100644 --- a/tdecore/tests/kipctest.cpp +++ b/tdecore/tests/kipctest.cpp @@ -8,12 +8,12 @@ MyObject::MyObject() : TQObject(0L, "testobj") { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotPaletteChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(slotFontChanged())); - connect(kapp, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged())); - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotAppearanceChanged())); - connect(kapp, TQT_SIGNAL(kipcMessage(int,int)), TQT_SLOT(slotMessage(int,int))); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotPaletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(slotFontChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged())); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotAppearanceChanged())); + connect(kapp, TQ_SIGNAL(kipcMessage(int,int)), TQ_SLOT(slotMessage(int,int))); } int main(int argc, char **argv) diff --git a/tdecore/tests/kipctest.h b/tdecore/tests/kipctest.h index 1f71843f6..d4c3d538d 100644 --- a/tdecore/tests/kipctest.h +++ b/tdecore/tests/kipctest.h @@ -10,12 +10,12 @@ public: MyObject(); public slots: - void slotPaletteChanged() { printf("SIGNAL: Palette changed\n"); } - void slotStyleChanged() { printf("SIGNAL: Style changed\n"); } - void slotFontChanged() { printf("SIGNAL: Font changed\n"); } - void slotBackgroundChanged(int i) { printf("SIGNAL: Background %d changed\n", i); } - void slotAppearanceChanged() { printf("SIGNAL: Appearance changed\n"); } - void slotMessage(int id, int arg) { printf("SIGNAL: user message: %d,%d\n", id, arg); } + void slotPaletteChanged() { printf("TQ_SIGNAL: Palette changed\n"); } + void slotStyleChanged() { printf("TQ_SIGNAL: Style changed\n"); } + void slotFontChanged() { printf("TQ_SIGNAL: Font changed\n"); } + void slotBackgroundChanged(int i) { printf("TQ_SIGNAL: Background %d changed\n", i); } + void slotAppearanceChanged() { printf("TQ_SIGNAL: Appearance changed\n"); } + void slotMessage(int id, int arg) { printf("TQ_SIGNAL: user message: %d,%d\n", id, arg); } }; #endif diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp index d8d86d988..b7908ec6e 100644 --- a/tdecore/tests/kprocesstest.cpp +++ b/tdecore/tests/kprocesstest.cpp @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) // p1 << "kghostview"; - TQObject::connect(&p1, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p1, TQ_SIGNAL(processExited(TDEProcess *)), &dummy, TQ_SLOT(printMessage(TDEProcess *))); printf("starting kghostview blocking (close to continue)\n"); p1.start(TDEProcess::Block); @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) printf("Starting konsole with /bin/tcsh as shell (close to continue)\n"); p2 << "konsole" << "-e" << "/bin/tcsh"; p2.setWorkingDirectory("/tmp"); - TQObject::connect(&p2, TQT_SIGNAL(processExited(TDEProcess *)), &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p2, TQ_SIGNAL(processExited(TDEProcess *)), &dummy, TQ_SLOT(printMessage(TDEProcess *))); p2.start(TDEProcess::Block); // @@ -70,13 +70,13 @@ int main(int argc, char *argv[]) // p3 << "ls" << "-l"; - TQObject::connect(&p3, TQT_SIGNAL(processExited(TDEProcess *)), - &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p3, TQ_SIGNAL(processExited(TDEProcess *)), + &dummy, TQ_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p3, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p3, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); p3.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput); @@ -93,16 +93,16 @@ int main(int argc, char *argv[]) // p4 << "sort"; - TQObject::connect(&p4, TQT_SIGNAL(processExited(TDEProcess *)), - &dummy, TQT_SLOT(printMessage(TDEProcess *))); + TQObject::connect(&p4, TQ_SIGNAL(processExited(TDEProcess *)), + &dummy, TQ_SLOT(printMessage(TDEProcess *))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p4, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); + TQObject::connect(&p4, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int))); - TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(TDEProcess *)), - &dummy, TQT_SLOT(outputDone(TDEProcess *))); + TQObject::connect(&p4, TQ_SIGNAL(wroteStdin(TDEProcess *)), + &dummy, TQ_SLOT(outputDone(TDEProcess *))); p4.start(TDEProcess::NotifyOnExit, TDEProcess::All); printf("after p4.start"); diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp index f7e895345..e7165092c 100644 --- a/tdecore/tests/kprociotest.cpp +++ b/tdecore/tests/kprociotest.cpp @@ -41,8 +41,8 @@ int main(int argc, char *argv[]) p << "rev"; - p.connect(&p, TQT_SIGNAL(processExited(TDEProcess*)), &dummy, TQT_SLOT(printMessage(TDEProcess*))); - p.connect(&p, TQT_SIGNAL(readReady(KProcIO*)), &dummy, TQT_SLOT(gotOutput(KProcIO*))); + p.connect(&p, TQ_SIGNAL(processExited(TDEProcess*)), &dummy, TQ_SLOT(printMessage(TDEProcess*))); + p.connect(&p, TQ_SIGNAL(readReady(KProcIO*)), &dummy, TQ_SLOT(gotOutput(KProcIO*))); bool b; diff --git a/tdecore/tests/tdeconfigtestgui.cpp b/tdecore/tests/tdeconfigtestgui.cpp index f5ea428c0..c785aa3b3 100644 --- a/tdecore/tests/tdeconfigtestgui.cpp +++ b/tdecore/tests/tdeconfigtestgui.cpp @@ -76,8 +76,8 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pAppFileEdit = new TQLineEdit( this, "appconfigedit" ); pAppFileEdit->setGeometry( 240, 20, 160, 20 ); - connect( pAppFileEdit, TQT_SIGNAL(returnPressed()), - TQT_SLOT(appConfigEditReturnPressed())); + connect( pAppFileEdit, TQ_SIGNAL(returnPressed()), + TQ_SLOT(appConfigEditReturnPressed())); // Label and edit for the group pGroupLabel = new TQLabel( this, "grouplabel" ); @@ -86,14 +86,14 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pGroupEdit = new TQLineEdit( this, "groupedit" ); pGroupEdit->setGeometry( 120, 60, 100, 20 ); - connect( pGroupEdit, TQT_SIGNAL(returnPressed()), - TQT_SLOT(groupEditReturnPressed())); + connect( pGroupEdit, TQ_SIGNAL(returnPressed()), + TQ_SLOT(groupEditReturnPressed())); // Edit and label for the key/value pair pKeyEdit = new TQLineEdit( this, "keyedit" ); pKeyEdit->setGeometry( 20, 100, 80, 20 ); - connect( pKeyEdit, TQT_SIGNAL( returnPressed()), - TQT_SLOT(keyEditReturnPressed())); + connect( pKeyEdit, TQ_SIGNAL( returnPressed()), + TQ_SLOT(keyEditReturnPressed())); pEqualsLabel = new TQLabel( this, "equalslabel" ); pEqualsLabel->setGeometry( 105, 100, 20, 20 ); @@ -106,7 +106,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pWriteButton = new TQPushButton( this, "writebutton" ); pWriteButton->setGeometry( 20,140, 80, 20 ); pWriteButton->setText( "Write entry" ); - connect( pWriteButton, TQT_SIGNAL(clicked()), TQT_SLOT( writeButtonClicked() ) ); + connect( pWriteButton, TQ_SIGNAL(clicked()), TQ_SLOT( writeButtonClicked() ) ); // Labels for the info line pInfoLabel1 = new TQLabel( this, "infolabel1" ); @@ -121,7 +121,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name ) pQuitButton = new TQPushButton( this, "quitbutton" ); pQuitButton->setText( "Quit" ); pQuitButton->setGeometry( 340, 60, 60, 60 ); - connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) ); + connect( pQuitButton, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) ); // create a default TDEConfig object in order to be able to start right away pConfig = new TDEConfig( TQString::null ); diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp index a37370e58..7eafa34d7 100644 --- a/tdecore/twinmodule.cpp +++ b/tdecore/twinmodule.cpp @@ -445,7 +445,7 @@ TQRect KWinModule::workArea( const TQValueList& exclude, int desktop ) cons void KWinModule::connectNotify( const char* signal ) { - if( !d->strutSignalConnected && qstrcmp( signal, TQT_SIGNAL(strutChanged())) == 0 ) + if( !d->strutSignalConnected && qstrcmp( signal, TQ_SIGNAL(strutChanged())) == 0 ) d->strutSignalConnected = true; TQObject::connectNotify( signal ); } diff --git a/tdehtml/domtreeview.cpp b/tdehtml/domtreeview.cpp index c68eb2007..88477fe03 100644 --- a/tdehtml/domtreeview.cpp +++ b/tdehtml/domtreeview.cpp @@ -28,8 +28,8 @@ DOMTreeView::DOMTreeView(TQWidget *parent, TDEHTMLPart *currentpart, const char addColumn("Renderer"); setSorting(-1); part = currentpart; - connect(part, TQT_SIGNAL(nodeActivated(const DOM::Node &)), this, TQT_SLOT(showTree(const DOM::Node &))); - connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect(part, TQ_SIGNAL(nodeActivated(const DOM::Node &)), this, TQ_SLOT(showTree(const DOM::Node &))); + connect(this, TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(slotItemClicked(TQListViewItem *))); m_nodedict.setAutoDelete(true); } diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp index 1a75709f8..27fb181bb 100644 --- a/tdehtml/ecma/kjs_debugwin.cpp +++ b/tdehtml/ecma/kjs_debugwin.cpp @@ -384,7 +384,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) TQWidget *contextListContainer = new TQWidget(contextContainer); m_contextList = new TQListBox(contextListContainer); m_contextList->setMinimumSize(100,200); - connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int))); + connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int))); TQHBoxLayout *clistLayout = new TQHBoxLayout(contextListContainer); clistLayout->addWidget(m_contextList); @@ -400,11 +400,11 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) TQVBoxLayout *ssdvl = new TQVBoxLayout(sourceSelDisplay); m_sourceSel = new TQComboBox(toolBar()); - connect(m_sourceSel,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotSourceSelected(int))); + connect(m_sourceSel,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotSourceSelected(int))); m_sourceDisplay = new SourceDisplay(this,sourceSelDisplay); ssdvl->addWidget(m_sourceDisplay); - connect(m_sourceDisplay,TQT_SIGNAL(lineDoubleClicked(int)),TQT_SLOT(slotToggleBreakpoint(int))); + connect(m_sourceDisplay,TQ_SIGNAL(lineDoubleClicked(int)),TQ_SLOT(slotToggleBreakpoint(int))); TQValueList vsplitSizes; vsplitSizes.insert(vsplitSizes.end(),120); @@ -419,7 +419,7 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) m_evalEdit = new EvalMultiLineEdit(evalContainer); m_evalEdit->setWordWrap(TQMultiLineEdit::NoWrap); m_evalEdit->setFont(font); - connect(m_evalEdit,TQT_SIGNAL(returnPressed()),TQT_SLOT(slotEval())); + connect(m_evalEdit,TQ_SIGNAL(returnPressed()),TQ_SLOT(slotEval())); m_evalDepth = 0; TQVBoxLayout *evalLayout = new TQVBoxLayout(evalContainer); @@ -445,18 +445,18 @@ KJSDebugWin::KJSDebugWin(TQWidget *parent, const char *name) // Venkman use F12, KDevelop F10 TDEShortcut scNext = TDEShortcut(KKeySequence(KKey(TQt::Key_F12))); scNext.append(KKeySequence(KKey(TQt::Key_F10))); - m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQT_SLOT(slotNext()), + m_nextAction = new TDEAction(i18n("Next breakpoint","&Next"),"dbgnext",scNext,this,TQ_SLOT(slotNext()), m_actionCollection,"next"); - m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQT_SLOT(slotStep()), + m_stepAction = new TDEAction(i18n("&Step"),"dbgstep",TDEShortcut(TQt::Key_F11),this,TQ_SLOT(slotStep()), m_actionCollection,"step"); // Venkman use F5, Kdevelop F9 TDEShortcut scCont = TDEShortcut(KKeySequence(KKey(TQt::Key_F5))); scCont.append(KKeySequence(KKey(TQt::Key_F9))); - m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQT_SLOT(slotContinue()), + m_continueAction = new TDEAction(i18n("&Continue"),"dbgrun",scCont,this,TQ_SLOT(slotContinue()), m_actionCollection,"cont"); - m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQT_SLOT(slotStop()), + m_stopAction = new TDEAction(i18n("St&op"),"process-stop",TDEShortcut(TQt::Key_F4),this,TQ_SLOT(slotStop()), m_actionCollection,"stop"); - m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQT_SLOT(slotBreakNext()), + m_breakAction = new TDEAction(i18n("&Break at Next Statement"),"dbgrunto",TDEShortcut(TQt::Key_F8),this,TQ_SLOT(slotBreakNext()), m_actionCollection,"breaknext"); @@ -1048,7 +1048,7 @@ void KJSDebugWin::leaveSession() void KJSDebugWin::updateContextList() { - disconnect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int))); + disconnect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int))); m_contextList->clear(); for (int i = 0; i < m_execsCount; i++) @@ -1060,7 +1060,7 @@ void KJSDebugWin::updateContextList() setSourceLine(ctx.sourceId(),ctx.curStmtFirstLine()); } - connect(m_contextList,TQT_SIGNAL(highlighted(int)),this,TQT_SLOT(slotShowFrame(int))); + connect(m_contextList,TQ_SIGNAL(highlighted(int)),this,TQ_SLOT(slotShowFrame(int))); } TQString KJSDebugWin::contextStr(const Context &ctx) diff --git a/tdehtml/ecma/kjs_window.cpp b/tdehtml/ecma/kjs_window.cpp index 7acea8dee..3a1f7c897 100644 --- a/tdehtml/ecma/kjs_window.cpp +++ b/tdehtml/ecma/kjs_window.cpp @@ -1231,7 +1231,7 @@ void Window::scheduleClose() { kdDebug(6070) << "Window::scheduleClose window.close() " << m_frame << endl; Q_ASSERT(winq); - TQTimer::singleShot( 0, winq, TQT_SLOT( timeoutClose() ) ); + TQTimer::singleShot( 0, winq, TQ_SLOT( timeoutClose() ) ); } void Window::closeNow() @@ -2169,8 +2169,8 @@ WindowQObject::WindowQObject(Window *w) if ( !parent->m_frame ) kdDebug(6070) << "WARNING: null part in " << k_funcinfo << endl; else - connect( parent->m_frame, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( parentDestroyed() ) ); + connect( parent->m_frame, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( parentDestroyed() ) ); pausedTime = 0; lastTimerId = 0; currentlyDispatching = false; diff --git a/tdehtml/ecma/xmlhttprequest.cpp b/tdehtml/ecma/xmlhttprequest.cpp index a3d0b2b3d..d5937e9a0 100644 --- a/tdehtml/ecma/xmlhttprequest.cpp +++ b/tdehtml/ecma/xmlhttprequest.cpp @@ -420,17 +420,17 @@ void XMLHttpRequest::send(const TQString& _body) return; } - qObject->connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + qObject->connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); #ifdef APPLE_CHANGES - qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const char*, int ) ), - TQT_SLOT( slotData( TDEIO::Job*, const char*, int ) ) ); + qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const char*, int ) ), + TQ_SLOT( slotData( TDEIO::Job*, const char*, int ) ) ); #else - qObject->connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + qObject->connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); #endif - qObject->connect( job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); + qObject->connect( job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); #ifdef APPLE_CHANGES KWQServeRequest(tdehtml::Cache::loader(), doc->docLoader(), job); diff --git a/tdehtml/html/html_documentimpl.cpp b/tdehtml/html/html_documentimpl.cpp index 52ada7a7b..c27573844 100644 --- a/tdehtml/html/html_documentimpl.cpp +++ b/tdehtml/html/html_documentimpl.cpp @@ -78,13 +78,13 @@ HTMLDocumentImpl::HTMLDocumentImpl(DOMImplementationImpl *_implementation, TDEHT m_doAutoFill = false; /* dynamic history stuff to be fixed later (pfeiffer) - connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( removed( const TQString& )), - TQT_SLOT( slotHistoryChanged() )); + connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( removed( const TQString& )), + TQ_SLOT( slotHistoryChanged() )); */ - connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( inserted( const TQString& ) ), - TQT_SLOT( slotHistoryChanged() )); - connect( TDEHTMLFactory::vLinks(), TQT_SIGNAL( cleared()), - TQT_SLOT( slotHistoryChanged() )); + connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( inserted( const TQString& ) ), + TQ_SLOT( slotHistoryChanged() )); + connect( TDEHTMLFactory::vLinks(), TQ_SIGNAL( cleared()), + TQ_SLOT( slotHistoryChanged() )); } HTMLDocumentImpl::~HTMLDocumentImpl() diff --git a/tdehtml/html/html_objectimpl.cpp b/tdehtml/html/html_objectimpl.cpp index 864de8ed7..0248b81b6 100644 --- a/tdehtml/html/html_objectimpl.cpp +++ b/tdehtml/html/html_objectimpl.cpp @@ -136,7 +136,7 @@ void HTMLObjectBaseElementImpl::recalcStyle( StyleChange ch ) void HTMLObjectBaseElementImpl::renderAlternative() { if ( m_renderAlternative ) return; - TQTimer::singleShot( 0, this, TQT_SLOT( slotRenderAlternative() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRenderAlternative() ) ); } void HTMLObjectBaseElementImpl::slotRenderAlternative() diff --git a/tdehtml/java/kjavaappletcontext.cpp b/tdehtml/java/kjavaappletcontext.cpp index b644b67ca..6d8af4667 100644 --- a/tdehtml/java/kjavaappletcontext.cpp +++ b/tdehtml/java/kjavaappletcontext.cpp @@ -54,7 +54,7 @@ KJavaAppletContext::KJavaAppletContext() { d = new KJavaAppletContextPrivate; server = KJavaAppletServer::allocateJavaServer(); - connect(server->javaProcess(), TQT_SIGNAL(exited(int)), this, TQT_SLOT(javaProcessExited(int))); + connect(server->javaProcess(), TQ_SIGNAL(exited(int)), this, TQ_SLOT(javaProcessExited(int))); id = contextCount; server->createContext( id, this ); diff --git a/tdehtml/java/kjavaappletserver.cpp b/tdehtml/java/kjavaappletserver.cpp index a83dad118..640473489 100644 --- a/tdehtml/java/kjavaappletserver.cpp +++ b/tdehtml/java/kjavaappletserver.cpp @@ -136,8 +136,8 @@ KJavaAppletServer::KJavaAppletServer() d = new KJavaAppletServerPrivate; process = new KJavaProcess(); - connect( process, TQT_SIGNAL(received(const TQByteArray&)), - this, TQT_SLOT(slotJavaRequest(const TQByteArray&)) ); + connect( process, TQ_SIGNAL(received(const TQByteArray&)), + this, TQ_SLOT(slotJavaRequest(const TQByteArray&)) ); setupJava( process ); @@ -198,7 +198,7 @@ void KJavaAppletServer::freeJavaServer() if( config.readBoolEntry( "ShutdownAppletServer", true ) ) { const int value = config.readNumEntry( "AppletServerTimeout", 60 ); - TQTimer::singleShot( value*1000, self, TQT_SLOT( checkShutdown() ) ); + TQTimer::singleShot( value*1000, self, TQ_SLOT( checkShutdown() ) ); } } } @@ -810,10 +810,10 @@ TQCString PermissionDialog::exec( const TQString & cert, const TQString & perm ) dialog->resize( dialog->minimumSizeHint() ); //clearWState( WState_Polished ); - connect( no, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); - connect( reject, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); - connect( yes, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); - connect( grant, TQT_SIGNAL( clicked() ), this, TQT_SLOT( clicked() ) ); + connect( no, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); + connect( reject, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); + connect( yes, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); + connect( grant, TQ_SIGNAL( clicked() ), this, TQ_SLOT( clicked() ) ); dialog->exec(); delete dialog; diff --git a/tdehtml/java/kjavaappletviewer.cpp b/tdehtml/java/kjavaappletviewer.cpp index 6145470bf..5a00e14eb 100644 --- a/tdehtml/java/kjavaappletviewer.cpp +++ b/tdehtml/java/kjavaappletviewer.cpp @@ -347,10 +347,10 @@ KJavaAppletViewer::KJavaAppletViewer (TQWidget * wparent, const char *, setInstance (KJavaAppletViewerFactory::instance ()); KParts::Part::setWidget (m_view); - connect (applet->getContext(), TQT_SIGNAL(appletLoaded()), this, TQT_SLOT(appletLoaded())); - connect (applet->getContext(), TQT_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQT_SLOT(showDocument(const TQString&, const TQString&))); - connect (applet->getContext(), TQT_SIGNAL(showStatus(const TQString &)), this, TQT_SLOT(infoMessage(const TQString &))); - connect (applet, TQT_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQT_SLOT(jsEvent (const TQStringList &))); + connect (applet->getContext(), TQ_SIGNAL(appletLoaded()), this, TQ_SLOT(appletLoaded())); + connect (applet->getContext(), TQ_SIGNAL(showDocument(const TQString&, const TQString&)), m_browserextension, TQ_SLOT(showDocument(const TQString&, const TQString&))); + connect (applet->getContext(), TQ_SIGNAL(showStatus(const TQString &)), this, TQ_SLOT(infoMessage(const TQString &))); + connect (applet, TQ_SIGNAL(jsEvent (const TQStringList &)), m_liveconnect, TQ_SLOT(jsEvent (const TQStringList &))); } bool KJavaAppletViewer::eventFilter (TQObject *o, TQEvent *e) { @@ -404,7 +404,7 @@ bool KJavaAppletViewer::openURL (const KURL & url) { if (applet->size().width() > 0 || m_view->isVisible()) w->showApplet (); else - TQTimer::singleShot (10, this, TQT_SLOT (delayedCreateTimeOut ())); + TQTimer::singleShot (10, this, TQ_SLOT (delayedCreateTimeOut ())); if (!applet->failed ()) emit started (0L); return url.isValid (); diff --git a/tdehtml/java/kjavaappletwidget.cpp b/tdehtml/java/kjavaappletwidget.cpp index 7f1d7f00f..83485019c 100644 --- a/tdehtml/java/kjavaappletwidget.cpp +++ b/tdehtml/java/kjavaappletwidget.cpp @@ -66,8 +66,8 @@ KJavaAppletWidget::~KJavaAppletWidget() void KJavaAppletWidget::showApplet() { - connect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ), - this, TQT_SLOT( setWindow( WId ) ) ); + connect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ), + this, TQ_SLOT( setWindow( WId ) ) ); m_kwm->doNotManage( m_swallowTitle ); @@ -89,8 +89,8 @@ void KJavaAppletWidget::setWindow( WId w ) d->tmplabel = 0; // disconnect from KWM events - disconnect( m_kwm, TQT_SIGNAL( windowAdded( WId ) ), - this, TQT_SLOT( setWindow( WId ) ) ); + disconnect( m_kwm, TQ_SIGNAL( windowAdded( WId ) ), + this, TQ_SLOT( setWindow( WId ) ) ); embed( w ); diff --git a/tdehtml/java/kjavadownloader.cpp b/tdehtml/java/kjavadownloader.cpp index 5b1c55324..b58465d7f 100644 --- a/tdehtml/java/kjavadownloader.cpp +++ b/tdehtml/java/kjavadownloader.cpp @@ -81,14 +81,14 @@ KJavaDownloader::KJavaDownloader( int ID, const TQString& url ) d->job = TDEIO::get( *d->url, false, false ); d->job->addMetaData("PropagateHttpHeader", "true"); - connect( d->job, TQT_SIGNAL(data( TDEIO::Job*, const TQByteArray& )), - this, TQT_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) ); - connect( d->job, TQT_SIGNAL(connected(TDEIO::Job*)), - this, TQT_SLOT(slotConnected(TDEIO::Job*))); - connect( d->job, TQT_SIGNAL(mimetype(TDEIO::Job*, const TQString&)), - this, TQT_SLOT(slotMimetype(TDEIO::Job*, const TQString&))); - connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( d->job, TQ_SIGNAL(data( TDEIO::Job*, const TQByteArray& )), + this, TQ_SLOT(slotData( TDEIO::Job*, const TQByteArray& )) ); + connect( d->job, TQ_SIGNAL(connected(TDEIO::Job*)), + this, TQ_SLOT(slotConnected(TDEIO::Job*))); + connect( d->job, TQ_SIGNAL(mimetype(TDEIO::Job*, const TQString&)), + this, TQ_SLOT(slotMimetype(TDEIO::Job*, const TQString&))); + connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*)) ); } KJavaDownloader::~KJavaDownloader() @@ -215,10 +215,10 @@ void KJavaUploader::start() // create a suspended job d->job = TDEIO::put( *d->url, -1, false, false, false ); d->job->suspend(); - connect( d->job, TQT_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )), - this, TQT_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) ); - connect( d->job, TQT_SIGNAL(result(TDEIO::Job*)), - this, TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( d->job, TQ_SIGNAL(dataReq( TDEIO::Job*, TQByteArray& )), + this, TQ_SLOT(slotDataRequest( TDEIO::Job*, TQByteArray& )) ); + connect( d->job, TQ_SIGNAL(result(TDEIO::Job*)), + this, TQ_SLOT(slotResult(TDEIO::Job*)) ); server->sendURLData( d->loaderID, CONNECTED, d->file ); KJavaAppletServer::freeJavaServer(); } diff --git a/tdehtml/java/kjavaprocess.cpp b/tdehtml/java/kjavaprocess.cpp index 6b505c343..7f3a93e0a 100644 --- a/tdehtml/java/kjavaprocess.cpp +++ b/tdehtml/java/kjavaprocess.cpp @@ -54,12 +54,12 @@ KJavaProcess::KJavaProcess() : TDEProcess() javaProcess = this; //new TDEProcess(); - connect( javaProcess, TQT_SIGNAL( wroteStdin( TDEProcess * ) ), - this, TQT_SLOT( slotWroteData() ) ); - connect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ), - this, TQT_SLOT( slotReceivedData(int, int&) ) ); - connect( javaProcess, TQT_SIGNAL( processExited (TDEProcess *) ), - this, TQT_SLOT( slotExited (TDEProcess *) ) ); + connect( javaProcess, TQ_SIGNAL( wroteStdin( TDEProcess * ) ), + this, TQ_SLOT( slotWroteData() ) ); + connect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ), + this, TQ_SLOT( slotReceivedData(int, int&) ) ); + connect( javaProcess, TQ_SIGNAL( processExited (TDEProcess *) ), + this, TQ_SLOT( slotExited (TDEProcess *) ) ); d->jvmPath = "java"; d->mainClass = "-help"; @@ -319,8 +319,8 @@ bool KJavaProcess::invokeJVM() void KJavaProcess::killJVM() { d->processKilled = true; - disconnect( javaProcess, TQT_SIGNAL( receivedStdout( int, int& ) ), - this, TQT_SLOT( slotReceivedData(int, int&) ) ); + disconnect( javaProcess, TQ_SIGNAL( receivedStdout( int, int& ) ), + this, TQ_SLOT( slotReceivedData(int, int&) ) ); javaProcess->kill(); } diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp index db83e5c75..aefa73192 100644 --- a/tdehtml/misc/knsplugininstaller.cpp +++ b/tdehtml/misc/knsplugininstaller.cpp @@ -238,8 +238,8 @@ void KNSPluginInstallEngine::startInstall(KNSPluginInfo info) // start the download job m_downloadJob = TDEIO::copy(info.pluginURL(), "file://"+m_tmpPluginFileName, false ); // connect signals - connect(m_downloadJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long))); - connect(m_downloadJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDownloadResult(TDEIO::Job *)) ); + connect(m_downloadJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotDownLoadProgress(TDEIO::Job *, unsigned long))); + connect(m_downloadJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotDownloadResult(TDEIO::Job *)) ); kdDebug(DEBUG_NUMBER) << "download plugin " << m_tmpPluginFileName << endl; } @@ -284,8 +284,8 @@ void KNSPluginInstallEngine::slotDownloadResult(TDEIO::Job *job) urlList.append( KURL("tar://"+m_tmpPluginFileName+"/"+(*it)) ); } m_installFileJob = TDEIO::copy(urlList , destURL, false ); - connect(m_installFileJob, TQT_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQT_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long))); - connect(m_installFileJob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotCopyResult(TDEIO::Job *)) ); + connect(m_installFileJob, TQ_SIGNAL(percent (TDEIO::Job *, unsigned long)), this , TQ_SLOT(slotCopyProgress(TDEIO::Job *, unsigned long))); + connect(m_installFileJob, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotCopyResult(TDEIO::Job *)) ); } kdDebug(DEBUG_NUMBER) << "COPY FILE " << m_tmpPluginFileName << endl; @@ -312,10 +312,10 @@ void KNSPluginInstallEngine::slotCopyResult(TDEIO::Job *job) m_scanProc->addArgument( "nspluginscan" ); m_scanProc->addArgument( "--verbose" ); - connect( m_scanProc, TQT_SIGNAL(readyReadStdout()), - this, TQT_SLOT(readScanProcFromStdout()) ); - connect( m_scanProc, TQT_SIGNAL(processExited()), - this, TQT_SLOT(endScanProc()) ); + connect( m_scanProc, TQ_SIGNAL(readyReadStdout()), + this, TQ_SLOT(readScanProcFromStdout()) ); + connect( m_scanProc, TQ_SIGNAL(processExited()), + this, TQ_SLOT(endScanProc()) ); if ( !m_scanProc->start() ) { emit installFailed(); } @@ -426,7 +426,7 @@ void KNSPluginWizard::initLicencePage() addPage (m_licenceVBox, i18n("Plugin licence")); - connect(buttonGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotAgreementClicked(int))); + connect(buttonGroup, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotAgreementClicked(int))); } void KNSPluginWizard::initInstallationProgressPage() { @@ -486,9 +486,9 @@ void KNSPluginWizard::initPagesButtonStates() void KNSPluginWizard::connectSignals() { - connect(&m_installEngine, TQT_SIGNAL(installProgress(int)), m_installationProgressBar, TQT_SLOT(setProgress(int)) ); - connect(&m_installEngine, TQT_SIGNAL(installCompleted()), this, TQT_SLOT(slotInstallationCompleted()) ); - connect(&m_installEngine, TQT_SIGNAL(installFailed()), this, TQT_SLOT(slotInstallationFailed()) ); + connect(&m_installEngine, TQ_SIGNAL(installProgress(int)), m_installationProgressBar, TQ_SLOT(setProgress(int)) ); + connect(&m_installEngine, TQ_SIGNAL(installCompleted()), this, TQ_SLOT(slotInstallationCompleted()) ); + connect(&m_installEngine, TQ_SIGNAL(installFailed()), this, TQ_SLOT(slotInstallationFailed()) ); } diff --git a/tdehtml/misc/loader.cpp b/tdehtml/misc/loader.cpp index 7621b5e4f..50525c342 100644 --- a/tdehtml/misc/loader.cpp +++ b/tdehtml/misc/loader.cpp @@ -786,10 +786,10 @@ void CachedImage::setShowAnimations( TDEHTMLSettings::KAnimationAdvice showAnima imgSource->cleanBuffer(); delete p; p = new TQPixmap(m->framePixmap()); - m->disconnectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->disconnectStatus( this, TQT_SLOT( movieStatus( int ) )); - m->disconnectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); - TQTimer::singleShot(0, this, TQT_SLOT( deleteMovie())); + m->disconnectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) )); + m->disconnectStatus( this, TQ_SLOT( movieStatus( int ) )); + m->disconnectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) ); + TQTimer::singleShot(0, this, TQ_SLOT( deleteMovie())); imgSource = 0; } } @@ -849,9 +849,9 @@ void CachedImage::data ( TQBuffer &_buffer, bool eof ) { imgSource = new ImageSource( _buffer.buffer()); m = new TQMovie( imgSource, 8192 ); - m->connectUpdate( this, TQT_SLOT( movieUpdated( const TQRect &) )); - m->connectStatus( this, TQT_SLOT( movieStatus(int))); - m->connectResize( this, TQT_SLOT( movieResize( const TQSize& ) ) ); + m->connectUpdate( this, TQ_SLOT( movieUpdated( const TQRect &) )); + m->connectStatus( this, TQ_SLOT( movieStatus(int))); + m->connectResize( this, TQ_SLOT( movieResize( const TQSize& ) ) ); } } @@ -1128,7 +1128,7 @@ Loader::Loader() : TQObject() { m_requestsPending.setAutoDelete( true ); m_requestsLoading.setAutoDelete( true ); - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( servePendingRequests() ) ); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( servePendingRequests() ) ); } void Loader::load(DocLoader* dl, CachedObject *object, bool incremental) @@ -1171,9 +1171,9 @@ void Loader::servePendingRequests() } } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); if ( req->object->schedule() ) TDEIO::Scheduler::scheduleJob( job ); diff --git a/tdehtml/rendering/render_form.cpp b/tdehtml/rendering/render_form.cpp index 0fd9029db..f18ce9ae6 100644 --- a/tdehtml/rendering/render_form.cpp +++ b/tdehtml/rendering/render_form.cpp @@ -146,7 +146,7 @@ RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element) // prevent firing toggled() signals on initialization b->setChecked(element->checked()); - connect(b,TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(slotStateChanged(int))); + connect(b,TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(slotStateChanged(int))); } @@ -192,7 +192,7 @@ RenderRadioButton::RenderRadioButton(HTMLInputElementImpl *element) // prevent firing toggled() signals on initialization b->setChecked(element->checked()); - connect(b,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); + connect(b,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool))); } void RenderRadioButton::updateFromElement() @@ -312,7 +312,7 @@ LineEditWidget::LineEditWidget(DOM::HTMLInputElementImpl* input, TDEHTMLView* vi { setMouseTracking(true); TDEActionCollection *ac = new TDEActionCollection(this); - m_spellAction = KStdAction::spelling( this, TQT_SLOT( slotCheckSpelling() ), ac ); + m_spellAction = KStdAction::spelling( this, TQ_SLOT( slotCheckSpelling() ), ac ); } LineEditWidget::~LineEditWidget() @@ -328,11 +328,11 @@ void LineEditWidget::slotCheckSpelling() } delete m_spell; - m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + m_spell = new KSpell( this, i18n( "Spell Checking" ), this, TQ_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); - connect( m_spell, TQT_SIGNAL( death() ),this, TQT_SLOT( spellCheckerFinished() ) ); - connect( m_spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); - connect( m_spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); + connect( m_spell, TQ_SIGNAL( death() ),this, TQ_SLOT( spellCheckerFinished() ) ); + connect( m_spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ),this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); + connect( m_spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ),this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); } void LineEditWidget::spellCheckerMisspelling( const TQString &_text, const TQStringList &, unsigned int pos) @@ -362,7 +362,7 @@ void LineEditWidget::spellCheckerFinished() void LineEditWidget::slotSpellCheckReady( KSpell *s ) { s->check( text() ); - connect( s, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( slotSpellCheckDone( const TQString & ) ) ); + connect( s, TQ_SIGNAL( done( const TQString & ) ), this, TQ_SLOT( slotSpellCheckDone( const TQString & ) ) ); } void LineEditWidget::slotSpellCheckDone( const TQString &s ) @@ -380,8 +380,8 @@ TQPopupMenu *LineEditWidget::createPopupMenu() return 0L; } - connect( popup, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( extendedMenuActivated( int ) ) ); + connect( popup, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( extendedMenuActivated( int ) ) ); if (m_input->autoComplete()) { popup->insertSeparator(); @@ -414,7 +414,7 @@ void LineEditWidget::extendedMenuActivated( int id) case EditHistory: { KHistoryComboEditor dlg( compObj() ? compObj()->items() : TQStringList(), this ); - connect( &dlg, TQT_SIGNAL( removeFromHistory(const TQString&) ), TQT_SLOT( slotRemoveFromHistory(const TQString&)) ); + connect( &dlg, TQ_SIGNAL( removeFromHistory(const TQString&) ), TQ_SLOT( slotRemoveFromHistory(const TQString&)) ); dlg.exec(); } default: @@ -469,8 +469,8 @@ RenderLineEdit::RenderLineEdit(HTMLInputElementImpl *element) : RenderFormElement(element) { LineEditWidget *edit = new LineEditWidget(element, view(), view()->viewport()); - connect(edit,TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); - connect(edit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &))); + connect(edit,TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed())); + connect(edit,TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &))); if(element->inputType() == HTMLInputElementImpl::PASSWORD) edit->setEchoMode( TQLineEdit::Password ); @@ -785,9 +785,9 @@ RenderFileButton::RenderFileButton(HTMLInputElementImpl *element) w->setMode(KFile::File | KFile::ExistingOnly); w->completionObject()->setDir(TDEGlobalSettings::documentPath()); - connect(w->lineEdit(), TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReturnPressed())); - connect(w->lineEdit(), TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(slotTextChanged(const TQString &))); - connect(w, TQT_SIGNAL(urlSelected(const TQString &)),this,TQT_SLOT(slotUrlSelected(const TQString &))); + connect(w->lineEdit(), TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReturnPressed())); + connect(w->lineEdit(), TQ_SIGNAL(textChanged(const TQString &)),this,TQ_SLOT(slotTextChanged(const TQString &))); + connect(w, TQ_SIGNAL(urlSelected(const TQString &)),this,TQ_SLOT(slotUrlSelected(const TQString &))); setQWidget(w); m_haveFocus = false; @@ -1226,8 +1226,8 @@ TDEListBox* RenderSelect::createListBox() lb->setSelectionMode(m_multiple ? TQListBox::Extended : TQListBox::Single); // ### looks broken //lb->setAutoMask(true); - connect( lb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotSelectionChanged() ) ); -// connect( lb, TQT_SIGNAL( clicked( TQListBoxItem * ) ), this, TQT_SLOT( slotClicked() ) ); + connect( lb, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( slotSelectionChanged() ) ); +// connect( lb, TQ_SIGNAL( clicked( TQListBoxItem * ) ), this, TQ_SLOT( slotClicked() ) ); m_ignoreSelectEvents = false; lb->setMouseTracking(true); @@ -1237,7 +1237,7 @@ TDEListBox* RenderSelect::createListBox() ComboBoxWidget *RenderSelect::createComboBox() { ComboBoxWidget *cb = new ComboBoxWidget(view()->viewport()); - connect(cb, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSelected(int))); + connect(cb, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotSelected(int))); return cb; } @@ -1295,9 +1295,9 @@ TextAreaWidget::TextAreaWidget(int wrap, TQWidget* parent) setMouseTracking(true); TDEActionCollection *ac = new TDEActionCollection(this); - m_findAction = KStdAction::find( this, TQT_SLOT( slotFind() ), ac ); - m_findNextAction = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), ac ); - m_replaceAction = KStdAction::replace( this, TQT_SLOT( slotReplace() ), ac ); + m_findAction = KStdAction::find( this, TQ_SLOT( slotFind() ), ac ); + m_findNextAction = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), ac ); + m_replaceAction = KStdAction::replace( this, TQ_SLOT( slotReplace() ), ac ); } @@ -1387,11 +1387,11 @@ void TextAreaWidget::slotDoReplace() // Connect highlight signal to code which handles highlighting // of found text. - connect(m_replace, TQT_SIGNAL(highlight(const TQString &, int, int)), - this, TQT_SLOT(slotFindHighlight(const TQString &, int, int))); - connect(m_replace, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotReplaceNext())); - connect(m_replace, TQT_SIGNAL(replace(const TQString &, int, int, int)), - this, TQT_SLOT(slotReplaceText(const TQString &, int, int, int))); + connect(m_replace, TQ_SIGNAL(highlight(const TQString &, int, int)), + this, TQ_SLOT(slotFindHighlight(const TQString &, int, int))); + connect(m_replace, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotReplaceNext())); + connect(m_replace, TQ_SIGNAL(replace(const TQString &, int, int, int)), + this, TQ_SLOT(slotReplaceText(const TQString &, int, int, int))); m_repDlg->close(); slotReplaceNext(); @@ -1486,9 +1486,9 @@ void TextAreaWidget::slotDoFind() // Connect highlight signal to code which handles highlighting // of found text. - connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)), - this, TQT_SLOT(slotFindHighlight(const TQString &, int, int))); - connect(m_find, TQT_SIGNAL(findNext()), this, TQT_SLOT(slotFindNext())); + connect(m_find, TQ_SIGNAL(highlight(const TQString &, int, int)), + this, TQ_SLOT(slotFindHighlight(const TQString &, int, int))); + connect(m_find, TQ_SIGNAL(findNext()), this, TQ_SLOT(slotFindNext())); m_findDlg->close(); m_find->closeFindNextDialog(); @@ -1562,7 +1562,7 @@ void TextAreaWidget::slotFind() KWin::activateWindow( m_findDlg->winId() ); } else { m_findDlg = new KFindDialog(false, this, "TDEHTML Text Area Find Dialog"); - connect( m_findDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoFind()) ); + connect( m_findDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoFind()) ); } m_findDlg->show(); } @@ -1578,7 +1578,7 @@ void TextAreaWidget::slotReplace() } else { m_repDlg = new KReplaceDialog(this, "TDEHTMLText Area Replace Dialog", 0, TQStringList(), TQStringList(), false); - connect( m_repDlg, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotDoReplace()) ); + connect( m_repDlg, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotDoReplace()) ); } m_repDlg->show(); } @@ -1618,7 +1618,7 @@ RenderTextArea::RenderTextArea(HTMLTextAreaElementImpl *element) edit->setCheckSpellingEnabled( settings->autoSpellCheck() ); edit->setTabChangesFocus( ! settings->allowTabulation() ); - connect(edit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(slotTextChanged())); + connect(edit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(slotTextChanged())); } RenderTextArea::~RenderTextArea() diff --git a/tdehtml/rendering/render_frames.cpp b/tdehtml/rendering/render_frames.cpp index 70bb4fc17..1035f97a0 100644 --- a/tdehtml/rendering/render_frames.cpp +++ b/tdehtml/rendering/render_frames.cpp @@ -636,7 +636,7 @@ void RenderPart::setWidget( TQWidget *widget ) setQWidget( widget ); widget->setFocusPolicy(TQWidget::WheelFocus); if(widget->inherits("TDEHTMLView")) - connect( widget, TQT_SIGNAL( cleared() ), this, TQT_SLOT( slotViewCleared() ) ); + connect( widget, TQ_SIGNAL( cleared() ), this, TQ_SLOT( slotViewCleared() ) ); setNeedsLayoutAndMinMaxRecalc(); @@ -888,7 +888,7 @@ bool RenderPartObject::partLoadingErrorNotify( tdehtml::ChildFrame *childFrame, } // Dissociate ourselves from the current event loop (to prevent crashes // due to the message box staying up) - TQTimer::singleShot( 0, this, TQT_SLOT( slotPartLoadingErrorNotify() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotPartLoadingErrorNotify() ) ); #if 0 Tokenizer *tokenizer = static_cast(part->document().handle())->tokenizer(); if (tokenizer) tokenizer->setOnHold( true ); diff --git a/tdehtml/rendering/render_layer.cpp b/tdehtml/rendering/render_layer.cpp index 24e00ebe8..1da1e0b82 100644 --- a/tdehtml/rendering/render_layer.cpp +++ b/tdehtml/rendering/render_layer.cpp @@ -616,7 +616,7 @@ RenderLayer::showScrollbar(TQt::Orientation o, bool show) sb->show(); if (!m_scrollMediator) m_scrollMediator = new RenderScrollMediator(this); - m_scrollMediator->connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged())); + m_scrollMediator->connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged())); } else if (!show && sb) { delete sb; diff --git a/tdehtml/rendering/render_replaced.cpp b/tdehtml/rendering/render_replaced.cpp index 3c71656e1..103cad9e8 100644 --- a/tdehtml/rendering/render_replaced.cpp +++ b/tdehtml/rendering/render_replaced.cpp @@ -202,14 +202,14 @@ void RenderWidget::setQWidget(TQWidget *widget) { if (m_widget) { m_widget->removeEventFilter(this); - disconnect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); + disconnect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed())); m_widget->hide(); m_widget->deleteLater(); //Might happen due to event on the widget, so be careful m_widget = 0; } m_widget = widget; if (m_widget) { - connect( m_widget, TQT_SIGNAL( destroyed()), this, TQT_SLOT( slotWidgetDestructed())); + connect( m_widget, TQ_SIGNAL( destroyed()), this, TQ_SLOT( slotWidgetDestructed())); m_widget->installEventFilter(this); if ( (m_isTDEHTMLWidget = !strcmp(m_widget->name(), "__tdehtml")) && !::tqt_cast(m_widget)) diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp index 89172f22a..6e2b6fa17 100644 --- a/tdehtml/tdehtml_ext.cpp +++ b/tdehtml/tdehtml_ext.cpp @@ -111,12 +111,12 @@ void TDEHTMLPartBrowserExtension::editableWidgetFocused( TQWidget *widget ) if ( !m_connectedToClipboard && m_editableFormWidget ) { - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( updateEditActions() ) ); if ( m_editableFormWidget->inherits( "TQLineEdit" ) || m_editableFormWidget->inherits( "TQTextEdit" ) ) - connect( m_editableFormWidget, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + connect( m_editableFormWidget, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( updateEditActions() ) ); m_connectedToClipboard = true; } @@ -134,14 +134,14 @@ void TDEHTMLPartBrowserExtension::editableWidgetBlurred( TQWidget * /*widget*/ ) if ( m_connectedToClipboard ) { - disconnect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + disconnect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( updateEditActions() ) ); if ( oldWidget ) { if ( oldWidget->inherits( "TQLineEdit" ) || oldWidget->inherits( "TQTextEdit" ) ) - disconnect( oldWidget, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( updateEditActions() ) ); + disconnect( oldWidget, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( updateEditActions() ) ); } m_connectedToClipboard = false; @@ -153,14 +153,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p { if ( m_extensionProxy ) { - disconnect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); + disconnect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) ) { - disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ), - this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); - disconnect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ), - this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) ); + disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ), + this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) ); + disconnect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ), + this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) ); } } @@ -168,14 +168,14 @@ void TDEHTMLPartBrowserExtension::setExtensionProxy( KParts::BrowserExtension *p if ( m_extensionProxy ) { - connect( m_extensionProxy, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); + connect( m_extensionProxy, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( extensionProxyActionEnabled( const char *, bool ) ) ); if ( m_extensionProxy->inherits( "TDEHTMLPartBrowserExtension" ) ) { - connect( m_extensionProxy, TQT_SIGNAL( editableWidgetFocused() ), - this, TQT_SLOT( extensionProxyEditableWidgetFocused() ) ); - connect( m_extensionProxy, TQT_SIGNAL( editableWidgetBlurred() ), - this, TQT_SLOT( extensionProxyEditableWidgetBlurred() ) ); + connect( m_extensionProxy, TQ_SIGNAL( editableWidgetFocused() ), + this, TQ_SLOT( extensionProxyEditableWidgetFocused() ) ); + connect( m_extensionProxy, TQ_SIGNAL( editableWidgetBlurred() ), + this, TQ_SLOT( extensionProxyEditableWidgetBlurred() ) ); } enableAction( "cut", m_extensionProxy->isActionEnabled( "cut" ) ); @@ -223,7 +223,7 @@ void TDEHTMLPartBrowserExtension::copy() TQClipboard *cb = TQApplication::clipboard(); - disconnect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) ); + disconnect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) ); #ifndef TQT_NO_MIMECLIPBOARD TQString htmltext; /* @@ -249,7 +249,7 @@ void TDEHTMLPartBrowserExtension::copy() cb->setText(text); #endif - connect( cb, TQT_SIGNAL( selectionChanged() ), m_part, TQT_SLOT( slotClearSelection() ) ); + connect( cb, TQ_SIGNAL( selectionChanged() ), m_part, TQ_SLOT( slotClearSelection() ) ); } else { @@ -429,7 +429,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri if (hasSelection) { - TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQT_SLOT( copy() ), actionCollection(), "copy" ); + TDEAction* copyAction = KStdAction::copy( d->m_tdehtml->browserExtension(), TQ_SLOT( copy() ), actionCollection(), "copy" ); copyAction->setText(i18n("&Copy Text")); copyAction->setEnabled(d->m_tdehtml->browserExtension()->isActionEnabled( "copy" )); actionCollection()->insert( tdehtml->actionCollection()->action( "selectAll" ) ); @@ -477,7 +477,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri // using .arg(foo, bar) instead of .arg(foo).arg(bar), as foo can contain %x new TDEAction( i18n( "Search for '%1' with %2" ).arg( selectedText, name ), icon, 0, d->m_tdehtml->browserExtension(), - TQT_SLOT( searchProvider() ), actionCollection(), "searchProvider" ); + TQ_SLOT( searchProvider() ), actionCollection(), "searchProvider" ); // favorite search providers TQStringList favoriteEngines; @@ -507,7 +507,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri name = service->name(); providerList->insert( new TDEAction( name, icon, 0, d->m_tdehtml->browserExtension(), - TQT_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) ); + TQ_SLOT( searchProvider() ), actionCollection(), TQString( "searchProvider" + searchProviderPrefix ).latin1() ) ); } } } @@ -515,13 +515,13 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri if ( selectedText.contains("://") && KURL(selectedText).isValid() ) new TDEAction( i18n( "Open '%1'" ).arg( selectedText ), "window-new", 0, - d->m_tdehtml->browserExtension(), TQT_SLOT( openSelection() ), actionCollection(), "openSelection" ); + d->m_tdehtml->browserExtension(), TQ_SLOT( openSelection() ), actionCollection(), "openSelection" ); } else if ( url.isEmpty() && !isImage ) { actionCollection()->insert( tdehtml->actionCollection()->action( "security" ) ); actionCollection()->insert( tdehtml->actionCollection()->action( "setEncoding" ) ); - new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ), + new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopanimations" ); } @@ -529,14 +529,14 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri { if (url.protocol() == "mailto") { - new TDEAction( i18n( "Copy Email Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ), + new TDEAction( i18n( "Copy Email Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ), actionCollection(), "copylinklocation" ); } else { - new TDEAction( i18n( "&Save Link As..." ), 0, this, TQT_SLOT( slotSaveLinkAs() ), + new TDEAction( i18n( "&Save Link As..." ), 0, this, TQ_SLOT( slotSaveLinkAs() ), actionCollection(), "savelinkas" ); - new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQT_SLOT( slotCopyLinkLocation() ), + new TDEAction( i18n( "Copy &Link Address" ), 0, this, TQ_SLOT( slotCopyLinkLocation() ), actionCollection(), "copylinklocation" ); } } @@ -546,28 +546,28 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri { if ( tdehtml->parentPart() ) { - new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQT_SLOT( slotFrameInWindow() ), + new TDEAction( i18n( "Open in New &Window" ), "window-new", 0, this, TQ_SLOT( slotFrameInWindow() ), actionCollection(), "frameinwindow" ); - new TDEAction( i18n( "Open in &This Window" ), 0, this, TQT_SLOT( slotFrameInTop() ), + new TDEAction( i18n( "Open in &This Window" ), 0, this, TQ_SLOT( slotFrameInTop() ), actionCollection(), "frameintop" ); - new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQT_SLOT( slotFrameInTab() ), + new TDEAction( i18n( "Open in &New Tab" ), "tab_new", 0, this, TQ_SLOT( slotFrameInTab() ), actionCollection(), "frameintab" ); - new TDEAction( i18n( "Reload Frame" ), 0, this, TQT_SLOT( slotReloadFrame() ), + new TDEAction( i18n( "Reload Frame" ), 0, this, TQ_SLOT( slotReloadFrame() ), actionCollection(), "reloadframe" ); if ( TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled() ) { if ( tdehtml->d->m_frame->m_type == tdehtml::ChildFrame::IFrame ) - new TDEAction( i18n( "Block IFrame..." ), 0, this, TQT_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" ); + new TDEAction( i18n( "Block IFrame..." ), 0, this, TQ_SLOT( slotBlockIFrame() ), actionCollection(), "blockiframe" ); } - new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQT_SLOT( slotViewDocumentSource() ), + new TDEAction( i18n( "View Frame Source" ), 0, d->m_tdehtml, TQ_SLOT( slotViewDocumentSource() ), actionCollection(), "viewFrameSource" ); - new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" ); + new TDEAction( i18n( "View Frame Information" ), 0, d->m_tdehtml, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewFrameInfo" ); // This one isn't in tdehtml_popupmenu.rc anymore, because Print isn't either, // and because print frame is already in the toolbar and the menu. // But leave this here, so that it's easy to read it. - new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQT_SLOT( print() ), actionCollection(), "printFrame" ); - new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); + new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, d->m_tdehtml->browserExtension(), TQ_SLOT( print() ), actionCollection(), "printFrame" ); + new TDEAction( i18n( "Save &Frame As..." ), 0, d->m_tdehtml, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewDocumentSource" ) ); actionCollection()->insert( tdehtml->parentPart()->actionCollection()->action( "viewPageInfo" ) ); @@ -578,7 +578,7 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri } else if (isImage || !url.isEmpty()) { actionCollection()->insert( tdehtml->actionCollection()->action( "viewDocumentSource" ) ); actionCollection()->insert( tdehtml->actionCollection()->action( "viewPageInfo" ) ); - new TDEAction( i18n( "Stop Animations" ), 0, this, TQT_SLOT( slotStopAnimations() ), + new TDEAction( i18n( "Stop Animations" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopanimations" ); } @@ -597,35 +597,35 @@ TDEHTMLPopupGUIClient::TDEHTMLPopupGUIClient( TDEHTMLPart *tdehtml, const TQStri } else d->m_imageURL = KURL( static_cast( e ).src().string() ); - new TDEAction( i18n( "Save Image As..." ), 0, this, TQT_SLOT( slotSaveImageAs() ), + new TDEAction( i18n( "Save Image As..." ), 0, this, TQ_SLOT( slotSaveImageAs() ), actionCollection(), "saveimageas" ); - new TDEAction( i18n( "Send Image..." ), 0, this, TQT_SLOT( slotSendImage() ), + new TDEAction( i18n( "Send Image..." ), 0, this, TQ_SLOT( slotSendImage() ), actionCollection(), "sendimage" ); #ifndef TQT_NO_MIMECLIPBOARD - (new TDEAction( i18n( "Copy Image" ), 0, this, TQT_SLOT( slotCopyImage() ), + (new TDEAction( i18n( "Copy Image" ), 0, this, TQ_SLOT( slotCopyImage() ), actionCollection(), "copyimage" ))->setEnabled(!d->m_pixmap.isNull()); #endif if(d->m_pixmap.isNull()) { //fallback to image location if still loading the image. this will always be true if ifdef TQT_NO_MIMECLIPBOARD - new TDEAction( i18n( "Copy Image Location" ), 0, this, TQT_SLOT( slotCopyImageLocation() ), + new TDEAction( i18n( "Copy Image Location" ), 0, this, TQ_SLOT( slotCopyImageLocation() ), actionCollection(), "copyimagelocation" ); } TQString name = KStringHandler::csqueeze(d->m_imageURL.fileName()+d->m_imageURL.query(), 25); - new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQT_SLOT( slotViewImage() ), + new TDEAction( i18n( "View Image (%1)" ).arg(d->m_suggestedFilename.isEmpty() ? name.replace("&", "&&") : d->m_suggestedFilename.replace("&", "&&")), 0, this, TQ_SLOT( slotViewImage() ), actionCollection(), "viewimage" ); if (TDEHTMLFactory::defaultHTMLSettings()->isAdFilterEnabled()) { - new TDEAction( i18n( "Block Image..." ), 0, this, TQT_SLOT( slotBlockImage() ), + new TDEAction( i18n( "Block Image..." ), 0, this, TQ_SLOT( slotBlockImage() ), actionCollection(), "blockimage" ); if (!d->m_imageURL.host().isEmpty() && !d->m_imageURL.protocol().isEmpty()) { - new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQT_SLOT( slotBlockHost() ), + new TDEAction( i18n( "Block Images From %1" ).arg(d->m_imageURL.host()), 0, this, TQ_SLOT( slotBlockHost() ), actionCollection(), "blockhost" ); } } @@ -995,7 +995,7 @@ void TDEHTMLZoomFactorAction::init(TDEHTMLPart *part, bool direction) m_popup->insertItem( i18n( "%1%" ).arg( fastZoomSizes[ofs + i] ) ); } - connect( m_popup, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotActivated( int ) ) ); + connect( m_popup, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActivated( int ) ) ); } TDEHTMLZoomFactorAction::~TDEHTMLZoomFactorAction() diff --git a/tdehtml/tdehtml_pagecache.cpp b/tdehtml/tdehtml_pagecache.cpp index 319dd8162..df08f97d6 100644 --- a/tdehtml/tdehtml_pagecache.cpp +++ b/tdehtml/tdehtml_pagecache.cpp @@ -108,7 +108,7 @@ TDEHTMLPageCacheEntry::fetchData(TQObject *recvObj, const char *recvSlot) int fd = dup(m_file->handle()); lseek(fd, 0, SEEK_SET); TDEHTMLPageCacheDelivery *delivery = new TDEHTMLPageCacheDelivery(fd); - recvObj->connect(delivery, TQT_SIGNAL(emitData(const TQByteArray&)), recvSlot); + recvObj->connect(delivery, TQ_SIGNAL(emitData(const TQByteArray&)), recvSlot); delivery->recvObj = recvObj; return delivery; } @@ -210,7 +210,7 @@ TDEHTMLPageCache::fetchData(long id, TQObject *recvObj, const char *recvSlot) if (!d->deliveryActive) { d->deliveryActive = true; - TQTimer::singleShot(20, this, TQT_SLOT(sendData())); + TQTimer::singleShot(20, this, TQ_SLOT(sendData())); } } @@ -265,7 +265,7 @@ TDEHTMLPageCache::sendData() byteArray.resetRawData(buf, n); d->delivery.append( delivery ); } - TQTimer::singleShot(0, this, TQT_SLOT(sendData())); + TQTimer::singleShot(0, this, TQ_SLOT(sendData())); } void diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp index 6e9d77619..31e49c53f 100644 --- a/tdehtml/tdehtml_part.cpp +++ b/tdehtml/tdehtml_part.cpp @@ -251,24 +251,24 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) d->m_bMousePressed = false; d->m_bRightMousePressed = false; d->m_bCleared = false; - d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQT_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" ); - d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQT_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" ); - d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQT_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" ); - d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQT_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" ); - d->m_paSaveDocument = KStdAction::saveAs( this, TQT_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" ); + d->m_paViewDocument = new TDEAction( i18n( "View Do&cument Source" ), CTRL + Key_U, this, TQ_SLOT( slotViewDocumentSource() ), actionCollection(), "viewDocumentSource" ); + d->m_paViewFrame = new TDEAction( i18n( "View Frame Source" ), 0, this, TQ_SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" ); + d->m_paViewInfo = new TDEAction( i18n( "View Document Information" ), CTRL+Key_I, this, TQ_SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" ); + d->m_paSaveBackground = new TDEAction( i18n( "Save &Background Image As..." ), 0, this, TQ_SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" ); + d->m_paSaveDocument = KStdAction::saveAs( this, TQ_SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" ); if ( parentPart() ) d->m_paSaveDocument->setShortcut( TDEShortcut() ); // avoid clashes - d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQT_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); - d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQT_SLOT( slotSecurity() ), actionCollection(), "security" ); + d->m_paSaveFrame = new TDEAction( i18n( "Save &Frame As..." ), 0, this, TQ_SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" ); + d->m_paSecurity = new TDEAction( i18n( "Security..." ), "decrypted", 0, this, TQ_SLOT( slotSecurity() ), actionCollection(), "security" ); d->m_paSecurity->setWhatsThis( i18n( "Security Settings

    " "Shows the certificate of the displayed page. Only " "pages that have been transmitted using a secure, encrypted connection have a " "certificate.

    " "Hint: If the image shows a closed lock, the page has been transmitted over a " "secure connection.") ); - d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQT_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" ); - d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQT_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" ); - d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQT_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" ); + d->m_paDebugRenderTree = new TDEAction( i18n( "Print Rendering Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_A, this, TQ_SLOT( slotDebugRenderTree() ), actionCollection(), "debugRenderTree" ); + d->m_paDebugDOMTree = new TDEAction( i18n( "Print DOM Tree to STDOUT" ), ALT + CTRL + SHIFT + Key_D, this, TQ_SLOT( slotDebugDOMTree() ), actionCollection(), "debugDOMTree" ); + d->m_paStopAnimations = new TDEAction( i18n( "Stop Animated Images" ), 0, this, TQ_SLOT( slotStopAnimations() ), actionCollection(), "stopAnimations" ); d->m_paSetEncoding = new TDEActionMenu( i18n( "Set &Encoding" ), "charset", actionCollection(), "setEncoding" ); d->m_paSetEncoding->setDelayed( false ); @@ -291,14 +291,14 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) //d->m_automaticDetection->insertItem( i18n( "Unicode" ), 13 ); d->m_automaticDetection->insertItem( i18n( "Western European" ), 14 ); - connect( d->m_automaticDetection, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotAutomaticDetectionLanguage( int ) ) ); + connect( d->m_automaticDetection, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotAutomaticDetectionLanguage( int ) ) ); d->m_paSetEncoding->popupMenu()->insertItem( i18n( "Automatic Detection" ), d->m_automaticDetection, 0 ); d->m_paSetEncoding->insert( new TDEActionSeparator( actionCollection() ) ); - d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQT_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" ); + d->m_manualDetection = new TDESelectAction( i18n( "short for Manual Detection", "Manual" ), 0, this, TQ_SLOT( slotSetEncoding() ), actionCollection(), "manualDetection" ); TQStringList encodings = TDEGlobal::charsets()->descriptiveEncodingNames(); d->m_manualDetection->setItems( encodings ); d->m_manualDetection->setCurrentItem( -1 ); @@ -353,40 +353,40 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) } - d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQT_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" ); + d->m_paUseStylesheet = new TDESelectAction( i18n( "Use S&tylesheet"), 0, this, TQ_SLOT( slotUseStylesheet() ), actionCollection(), "useStylesheet" ); if ( prof == BrowserViewGUI ) { d->m_paIncZoomFactor = new TDEHTMLZoomFactorAction( this, true, i18n( "Enlarge Font" ), "zoom-in", "CTRL++;CTRL+=", this, - TQT_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" ); + TQ_SLOT( slotIncZoomFast() ), actionCollection(), "incFontSizes" ); d->m_paIncZoomFactor->setWhatsThis( i18n( "Enlarge Font

    " "Make the font in this window bigger. " "Click and hold down the mouse button for a menu with all available font sizes." ) ); d->m_paDecZoomFactor = new TDEHTMLZoomFactorAction( this, false, i18n( "Shrink Font" ), "zoom-out", CTRL + Key_Minus, this, - TQT_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" ); + TQ_SLOT( slotDecZoomFast() ), actionCollection(), "decFontSizes" ); d->m_paDecZoomFactor->setWhatsThis( i18n( "Shrink Font

    " "Make the font in this window smaller. " "Click and hold down the mouse button for a menu with all available font sizes." ) ); } - d->m_paFind = KStdAction::find( this, TQT_SLOT( slotFind() ), actionCollection(), "find" ); + d->m_paFind = KStdAction::find( this, TQ_SLOT( slotFind() ), actionCollection(), "find" ); d->m_paFind->setWhatsThis( i18n( "Find text

    " "Shows a dialog that allows you to find text on the displayed page." ) ); - d->m_paFindNext = KStdAction::findNext( this, TQT_SLOT( slotFindNext() ), actionCollection(), "findNext" ); + d->m_paFindNext = KStdAction::findNext( this, TQ_SLOT( slotFindNext() ), actionCollection(), "findNext" ); d->m_paFindNext->setWhatsThis( i18n( "Find next

    " "Find the next occurrence of the text that you " "have found using the Find Text function" ) ); - d->m_paFindPrev = KStdAction::findPrev( this, TQT_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" ); + d->m_paFindPrev = KStdAction::findPrev( this, TQ_SLOT( slotFindPrev() ), actionCollection(), "findPrevious" ); d->m_paFindPrev->setWhatsThis( i18n( "Find previous

    " "Find the previous occurrence of the text that you " "have found using the Find Text function" ) ); - d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQT_SLOT( slotFindAheadText()), + d->m_paFindAheadText = new TDEAction( i18n("Find Text as You Type"), TDEShortcut( '/' ), this, TQ_SLOT( slotFindAheadText()), actionCollection(), "findAheadText"); - d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQT_SLOT( slotFindAheadLink()), + d->m_paFindAheadLinks = new TDEAction( i18n("Find Links as You Type"), TDEShortcut( '\'' ), this, TQ_SLOT( slotFindAheadLink()), actionCollection(), "findAheadLink"); d->m_paFindAheadText->setEnabled( false ); d->m_paFindAheadLinks->setEnabled( false ); @@ -400,17 +400,17 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) d->m_paFindAheadLinks->setShortcut( TDEShortcut()); } - d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQT_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" ); + d->m_paPrintFrame = new TDEAction( i18n( "Print Frame..." ), "frameprint", 0, this, TQ_SLOT( slotPrintFrame() ), actionCollection(), "printFrame" ); d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame

    " "Some pages have several frames. To print only a single frame, click " "on it and then use this function." ) ); - d->m_paSelectAll = KStdAction::selectAll( this, TQT_SLOT( slotSelectAll() ), actionCollection(), "selectAll" ); + d->m_paSelectAll = KStdAction::selectAll( this, TQ_SLOT( slotSelectAll() ), actionCollection(), "selectAll" ); if ( parentPart() ) d->m_paSelectAll->setShortcut( TDEShortcut() ); // avoid clashes d->m_paToggleCaretMode = new TDEToggleAction(i18n("Toggle Caret Mode"), - Key_F7, this, TQT_SLOT(slotToggleCaretMode()), + Key_F7, this, TQ_SLOT(slotToggleCaretMode()), actionCollection(), "caretMode"); d->m_paToggleCaretMode->setChecked(isCaretMode()); if (parentPart()) @@ -427,30 +427,30 @@ void TDEHTMLPart::init( TDEHTMLView *view, GUIProfile prof ) // Set the meta-refresh flag... d->m_metaRefreshEnabled = d->m_settings->isAutoDelayedActionsEnabled (); - connect( view, TQT_SIGNAL( zoomView( int ) ), TQT_SLOT( slotZoomView( int ) ) ); + connect( view, TQ_SIGNAL( zoomView( int ) ), TQ_SLOT( slotZoomView( int ) ) ); - connect( this, TQT_SIGNAL( completed() ), - this, TQT_SLOT( updateActions() ) ); - connect( this, TQT_SIGNAL( completed( bool ) ), - this, TQT_SLOT( updateActions() ) ); - connect( this, TQT_SIGNAL( started( TDEIO::Job * ) ), - this, TQT_SLOT( updateActions() ) ); + connect( this, TQ_SIGNAL( completed() ), + this, TQ_SLOT( updateActions() ) ); + connect( this, TQ_SIGNAL( completed( bool ) ), + this, TQ_SLOT( updateActions() ) ); + connect( this, TQ_SIGNAL( started( TDEIO::Job * ) ), + this, TQ_SLOT( updateActions() ) ); d->m_popupMenuXML = KXMLGUIFactory::readConfigFile( locate( "data", "tdehtml/tdehtml_popupmenu.rc", TDEHTMLFactory::instance() ) ); - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), - this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), + this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); - connect ( &d->m_progressUpdateTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressUpdate() ) ); + connect ( &d->m_progressUpdateTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressUpdate() ) ); findTextBegin(); //reset find variables - connect( &d->m_redirectionTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRedirect() ) ); + connect( &d->m_redirectionTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRedirect() ) ); d->m_dcopobject = new TDEHTMLPartIface(this); @@ -495,12 +495,12 @@ TDEHTMLPart::~TDEHTMLPart() if (!d->m_bComplete) closeURL(); - disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), - this, TQT_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); - disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); - disconnect( tdehtml::Cache::loader(), TQT_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ), + this, TQ_SLOT( slotLoaderRequestStarted( tdehtml::DocLoader*, tdehtml::CachedObject* ) ) ); + disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); + disconnect( tdehtml::Cache::loader(), TQ_SIGNAL( requestFailed( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( slotLoaderRequestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ) ); clear(); @@ -551,10 +551,10 @@ bool TDEHTMLPart::restoreURL( const KURL &url ) m_url = url; d->m_restoreScrollPosition = true; - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); - connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); + connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); - TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQT_SLOT(slotRestoreData(const TQByteArray &))); + TDEHTMLPageCache::self()->fetchData( d->m_cacheId, this, TQ_SLOT(slotRestoreData(const TQByteArray &))); emit started( 0L ); @@ -672,8 +672,8 @@ bool TDEHTMLPart::openURL( const KURL &url ) closeURL(); d->m_restoreScrollPosition = d->m_restored; - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); - connect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); + connect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); // initializing m_url to the new url breaks relative links when opening such a link after this call and _before_ begin() is called (when the first // data arrives) (Simon) @@ -719,14 +719,14 @@ bool TDEHTMLPart::openURL( const KURL &url ) d->m_job->setWindow(widget()->topLevelWidget()); d->m_job->addMetaData(args.metaData()); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - connect( d->m_job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect ( d->m_job, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), - TQT_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); - connect( d->m_job, TQT_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( d->m_job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect ( d->m_job, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ), + TQ_SLOT( slotInfoMessage(TDEIO::Job*, const TQString& ) ) ); + connect( d->m_job, TQ_SIGNAL(redirection(TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotRedirection(TDEIO::Job*, const KURL&) ) ); d->m_bComplete = false; d->m_bLoadEventEmitted = false; @@ -742,14 +742,14 @@ bool TDEHTMLPart::openURL( const KURL &url ) d->m_bPluginsEnabled = TDEHTMLFactory::defaultHTMLSettings()->isPluginsEnabled(url.host()); - connect( d->m_job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - this, TQT_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( d->m_job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + this, TQ_SLOT( slotJobSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( d->m_job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - this, TQT_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) ); + connect( d->m_job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + this, TQ_SLOT( slotJobPercent( TDEIO::Job*, unsigned long ) ) ); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotJobDone( TDEIO::Job* ) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotJobDone( TDEIO::Job* ) ) ); d->m_jobspeed = 0; @@ -758,8 +758,8 @@ bool TDEHTMLPart::openURL( const KURL &url ) if ( args.reload && !settings()->userStyleSheet().isEmpty() ) { KURL url( settings()->userStyleSheet() ); TDEIO::StatJob *job = TDEIO::stat( url, false /* don't show progress */ ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotUserSheetStatDone( TDEIO::Job * ) ) ); } emit started( 0L ); @@ -790,7 +790,7 @@ bool TDEHTMLPart::closeURL() d->m_bLoadEventEmitted = true; // don't want that one either d->m_cachePolicy = KProtocolManager::cacheControl(); // reset cache policy - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); TDEHTMLPageCache::self()->cancelFetch(this); if ( d->m_doc && d->m_doc->parsing() ) @@ -1079,8 +1079,8 @@ KJSErrorDlg *TDEHTMLPart::jsErrorExtension() { d->m_statusBarExtension->addStatusBarItem(d->m_statusBarJSErrorLabel, 0, false); TQToolTip::add(d->m_statusBarJSErrorLabel, i18n("This web page contains coding errors.")); d->m_statusBarJSErrorLabel->setPixmap(SmallIcon("bug", instance())); - connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchJSErrorDialog())); - connect(d->m_statusBarJSErrorLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(jsErrorDialogContextMenu())); + connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchJSErrorDialog())); + connect(d->m_statusBarJSErrorLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(jsErrorDialogContextMenu())); } if (!d->m_jsedlg) { d->m_jsedlg = new KJSErrorDlg; @@ -1119,8 +1119,8 @@ void TDEHTMLPart::disableJSErrorExtension() { void TDEHTMLPart::jsErrorDialogContextMenu() { TDEPopupMenu *m = new TDEPopupMenu(0L); - m->insertItem(i18n("&Hide Errors"), this, TQT_SLOT(removeJSErrorExtension())); - m->insertItem(i18n("&Disable Error Reporting"), this, TQT_SLOT(disableJSErrorExtension())); + m->insertItem(i18n("&Hide Errors"), this, TQ_SLOT(removeJSErrorExtension())); + m->insertItem(i18n("&Disable Error Reporting"), this, TQ_SLOT(disableJSErrorExtension())); m->popup(TQCursor::pos()); } @@ -1347,7 +1347,7 @@ void TDEHTMLPart::setAutoloadImages( bool enable ) d->m_paLoadImages = 0; } else if ( !d->m_paLoadImages ) - d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQT_SLOT( slotLoadImages() ), actionCollection(), "loadImages" ); + d->m_paLoadImages = new TDEAction( i18n( "Display Images on Page" ), "images_display", 0, this, TQ_SLOT( slotLoadImages() ), actionCollection(), "loadImages" ); if ( d->m_paLoadImages ) { TQPtrList lst; @@ -1429,8 +1429,8 @@ void TDEHTMLPart::clear() // We don't want to change between parts if we are going to delete all of them anyway if (partManager()) { - disconnect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + disconnect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); } if (d->m_frames.count()) @@ -1464,8 +1464,8 @@ void TDEHTMLPart::clear() // Listen to part changes again if (partManager()) { - connect( partManager(), TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + connect( partManager(), TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); } d->m_delayRedirect = 0; @@ -1483,7 +1483,7 @@ void TDEHTMLPart::clear() d->m_startOffset = 0; d->m_endOffset = 0; #ifndef TQT_NO_CLIPBOARD - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection())); #endif d->m_jobPercent = 0; @@ -1531,7 +1531,7 @@ void TDEHTMLPart::setPageSecurity( PageSecurity sec ) d->m_statusBarIconLabel->setSizePolicy(TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed )); d->m_statusBarIconLabel->setUseCursor( false ); d->m_statusBarExtension->addStatusBarItem( d->m_statusBarIconLabel, 0, false ); - connect( d->m_statusBarIconLabel, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( slotSecurity() ) ); + connect( d->m_statusBarIconLabel, TQ_SIGNAL( leftClickedURL() ), TQ_SLOT( slotSecurity() ) ); } else if (d->m_statusBarIconLabel) { TQToolTip::remove(d->m_statusBarIconLabel); } @@ -1953,7 +1953,7 @@ void TDEHTMLPart::begin( const KURL &url, int xOffset, int yOffset ) d->m_doc->setRestoreState(args.docState); d->m_doc->open(); - connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); + connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); emit d->m_extension->enableAction( "print", true ); @@ -2071,8 +2071,8 @@ void TDEHTMLPart::resetFromScript() closeURL(); d->m_bComplete = false; d->m_bLoadEventEmitted = false; - disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); - connect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); + disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); + connect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); d->m_doc->setParsing(true); emit started( 0L ); @@ -2082,7 +2082,7 @@ void TDEHTMLPart::slotFinishedParsing() { d->m_doc->setParsing(false); checkEmitLoadEvent(); - disconnect(d->m_doc,TQT_SIGNAL(finishedParsing()),this,TQT_SLOT(slotFinishedParsing())); + disconnect(d->m_doc,TQ_SIGNAL(finishedParsing()),this,TQ_SLOT(slotFinishedParsing())); if (!d->m_view) return; // We are probably being destructed. @@ -3008,7 +3008,7 @@ void TDEHTMLPart::findText() // The lineedit of the dialog would make tdehtml lose its selection, otherwise #ifndef TQT_NO_CLIPBOARD - disconnect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotClearSelection()) ); + disconnect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotClearSelection()) ); #endif // Now show the dialog in which the user can choose options. @@ -3026,8 +3026,8 @@ void TDEHTMLPart::findText() d->m_lastFindState.last_dir = -1; d->m_findDialog->show(); - connect( d->m_findDialog, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotFindNext()) ); - connect( d->m_findDialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFindDialogDestroyed()) ); + connect( d->m_findDialog, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotFindNext()) ); + connect( d->m_findDialog, TQ_SIGNAL(finished()), this, TQ_SLOT(slotFindDialogDestroyed()) ); findText( d->m_findDialog->pattern(), 0 /*options*/, widget(), d->m_findDialog ); } @@ -3039,17 +3039,17 @@ void TDEHTMLPart::findText( const TQString &str, long options, TQWidget *parent, return; #ifndef TQT_NO_CLIPBOARD - connect( kapp->clipboard(), TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotClearSelection()) ); + connect( kapp->clipboard(), TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotClearSelection()) ); #endif // Create the KFind object delete d->m_find; d->m_find = new KFind( str, options, parent, findDialog ); d->m_find->closeFindNextDialog(); // we use KFindDialog non-modal, so we don't want other dlg popping up - connect( d->m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); - //connect(d->m_find, TQT_SIGNAL( findNext() ), - // this, TQT_SLOT( slotFindNext() ) ); + connect( d->m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); + //connect(d->m_find, TQ_SIGNAL( findNext() ), + // this, TQ_SLOT( slotFindNext() ) ); if ( !findDialog ) { @@ -4494,7 +4494,7 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL & partManager()->removePart( (KParts::ReadOnlyPart *)child->m_part ); delete (KParts::ReadOnlyPart *)child->m_part; if (child->m_liveconnect) { - disconnect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); + disconnect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); child->m_liveconnect = 0L; } } @@ -4515,65 +4515,65 @@ bool TDEHTMLPart::processObjectRequest( tdehtml::ChildFrame *child, const KURL & } else if (child->m_frame) { child->m_liveconnect = KParts::LiveConnectExtension::childObject(part); if (child->m_liveconnect) - connect(child->m_liveconnect, TQT_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQT_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); + connect(child->m_liveconnect, TQ_SIGNAL(partEvent(const unsigned long, const TQString &, const KParts::LiveConnectExtension::ArgList &)), child, TQ_SLOT(liveConnectEvent(const unsigned long, const TQString&, const KParts::LiveConnectExtension::ArgList &))); } KParts::StatusBarExtension *sb = KParts::StatusBarExtension::childObject(part); if (sb) sb->setStatusBar( d->m_statusBarExtension->statusBar() ); - connect( part, TQT_SIGNAL( started( TDEIO::Job *) ), - this, TQT_SLOT( slotChildStarted( TDEIO::Job *) ) ); - connect( part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotChildCompleted() ) ); - connect( part, TQT_SIGNAL( completed(bool) ), - this, TQT_SLOT( slotChildCompleted(bool) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SIGNAL( setStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( started( TDEIO::Job *) ), + this, TQ_SLOT( slotChildStarted( TDEIO::Job *) ) ); + connect( part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotChildCompleted() ) ); + connect( part, TQ_SIGNAL( completed(bool) ), + this, TQ_SLOT( slotChildCompleted(bool) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SIGNAL( setStatusBarText( const TQString & ) ) ); if ( part->inherits( "TDEHTMLPart" ) ) { - connect( this, TQT_SIGNAL( completed() ), - part, TQT_SLOT( slotParentCompleted() ) ); - connect( this, TQT_SIGNAL( completed(bool) ), - part, TQT_SLOT( slotParentCompleted() ) ); + connect( this, TQ_SIGNAL( completed() ), + part, TQ_SLOT( slotParentCompleted() ) ); + connect( this, TQ_SIGNAL( completed(bool) ), + part, TQ_SLOT( slotParentCompleted() ) ); // As soon as the child's document is created, we need to set its domain // (but we do so only once, so it can't be simply done in the child) - connect( part, TQT_SIGNAL( docCreated() ), - this, TQT_SLOT( slotChildDocCreated() ) ); + connect( part, TQ_SIGNAL( docCreated() ), + this, TQ_SLOT( slotChildDocCreated() ) ); } child->m_extension = KParts::BrowserExtension::childObject( part ); if ( child->m_extension ) { - connect( child->m_extension, TQT_SIGNAL( openURLNotify() ), - d->m_extension, TQT_SIGNAL( openURLNotify() ) ); - - connect( child->m_extension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - - connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( child->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - d->m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); - - connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - d->m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( child->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - d->m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); - - connect( child->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ), - d->m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) ); - - connect( child->m_extension, TQT_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ), - this, TQT_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) ); + connect( child->m_extension, TQ_SIGNAL( openURLNotify() ), + d->m_extension, TQ_SIGNAL( openURLNotify() ) ); + + connect( child->m_extension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( slotChildURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + + connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( child->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + d->m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); + + connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + d->m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( child->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + d->m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + + connect( child->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ), + d->m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) ); + + connect( child->m_extension, TQ_SIGNAL( requestFocus( KParts::ReadOnlyPart * ) ), + this, TQ_SLOT( slotRequestFocus( KParts::ReadOnlyPart * ) ) ); child->m_extension->setBrowserInterface( d->m_extension->browserInterface() ); } @@ -4706,10 +4706,10 @@ KParts::PartManager *TDEHTMLPart::partManager() { d->m_manager = new KParts::PartManager( d->m_view->topLevelWidget(), this, "tdehtml part manager" ); d->m_manager->setAllowNestedParts( true ); - connect( d->m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); - connect( d->m_manager, TQT_SIGNAL( partRemoved( KParts::Part * ) ), - this, TQT_SLOT( slotPartRemoved( KParts::Part * ) ) ); + connect( d->m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( slotActiveFrameChanged( KParts::Part * ) ) ); + connect( d->m_manager, TQ_SIGNAL( partRemoved( KParts::Part * ) ), + this, TQ_SLOT( slotPartRemoved( KParts::Part * ) ) ); } return d->m_manager; @@ -4717,7 +4717,7 @@ KParts::PartManager *TDEHTMLPart::partManager() void TDEHTMLPart::submitFormAgain() { - disconnect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain())); + disconnect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain())); if( d->m_doc && !d->m_doc->parsing() && d->m_submitForm) TDEHTMLPart::submitForm( d->m_submitForm->submitAction, d->m_submitForm->submitUrl, d->m_submitForm->submitFormData, d->m_submitForm->target, d->m_submitForm->submitContentType, d->m_submitForm->submitBoundary ); @@ -4924,7 +4924,7 @@ void TDEHTMLPart::submitForm( const char *action, const TQString &url, const TQB d->m_submitForm->target = _target; d->m_submitForm->submitContentType = contentType; d->m_submitForm->submitBoundary = boundary; - connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(submitFormAgain())); + connect(this, TQ_SIGNAL(completed()), this, TQ_SLOT(submitFormAgain())); } else { @@ -5088,7 +5088,7 @@ void TDEHTMLPart::slotChildDocCreated() } } // So it only happens once - disconnect( htmlFrame, TQT_SIGNAL( docCreated() ), this, TQT_SLOT( slotChildDocCreated() ) ); + disconnect( htmlFrame, TQ_SIGNAL( docCreated() ), this, TQ_SLOT( slotChildDocCreated() ) ); } void TDEHTMLPart::slotChildURLRequest( const KURL &url, const KParts::URLArgs &args ) @@ -6615,9 +6615,9 @@ void TDEHTMLPart::tdehtmlMouseReleaseEvent( tdehtml::MouseReleaseEvent *event ) #ifndef TQT_NO_CLIPBOARD TQString text = selectedText(); text.replace(TQChar(0xa0), ' '); - disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection())); + disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection())); kapp->clipboard()->setText(text,TQClipboard::Selection); - connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection())); + connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection())); #endif //kdDebug( 6000 ) << "selectedText = " << text << endl; emitSelectionChanged(); @@ -6681,13 +6681,13 @@ void TDEHTMLPart::slotSelectAll() void TDEHTMLPart::startAutoScroll() { - connect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() )); + connect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() )); d->m_scrollTimer.start(100, false); } void TDEHTMLPart::stopAutoScroll() { - disconnect(&d->m_scrollTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoScroll() )); + disconnect(&d->m_scrollTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoScroll() )); if (d->m_scrollTimer.isActive()) d->m_scrollTimer.stop(); } @@ -7114,7 +7114,7 @@ void TDEHTMLPart::restoreScrollPosition() if ( m_url.hasRef() && !d->m_restoreScrollPosition && !args.reload) { if ( !d->m_doc || !d->m_doc->parsing() ) - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); if ( !gotoAnchor(m_url.encodedHtmlRef()) ) gotoAnchor(m_url.htmlRef()); return; @@ -7127,7 +7127,7 @@ void TDEHTMLPart::restoreScrollPosition() if (d->m_view->contentsHeight() - d->m_view->visibleHeight() >= args.yOffset || d->m_bComplete) { d->m_view->setContentsPos(args.xOffset, args.yOffset); - disconnect(d->m_view, TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(restoreScrollPosition())); + disconnect(d->m_view, TQ_SIGNAL(finishedLayout()), this, TQ_SLOT(restoreScrollPosition())); } } @@ -7165,8 +7165,8 @@ void TDEHTMLPart::openWallet(DOM::HTMLFormElementImpl *form) TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet(TDEWallet::Wallet::NetworkWallet(), widget() ? widget()->topLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous); d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq->wallet = wallet; - connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); - connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*))); + connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool))); + connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*))); } assert(form); d->m_wq->callers.append(TDEHTMLWalletQueue::Caller(form, form->getDocument())); @@ -7207,8 +7207,8 @@ void TDEHTMLPart::saveToWallet(const TQString& key, const TQMaptopLevelWidget()->winId() : 0, TDEWallet::Wallet::Asynchronous); d->m_wq = new TDEHTMLWalletQueue(this); d->m_wq->wallet = wallet; - connect(wallet, TQT_SIGNAL(walletOpened(bool)), d->m_wq, TQT_SLOT(walletOpened(bool))); - connect(d->m_wq, TQT_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQT_SLOT(walletOpened(TDEWallet::Wallet*))); + connect(wallet, TQ_SIGNAL(walletOpened(bool)), d->m_wq, TQ_SLOT(walletOpened(bool))); + connect(d->m_wq, TQ_SIGNAL(walletOpened(TDEWallet::Wallet*)), this, TQ_SLOT(walletOpened(TDEWallet::Wallet*))); } d->m_wq->savers.append(qMakePair(key, data)); #endif // TDEHTML_NO_WALLET @@ -7249,7 +7249,7 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) { d->m_wallet = wallet; d->m_bWalletOpened = true; - connect(d->m_wallet, TQT_SIGNAL(walletClosed()), TQT_SLOT(slotWalletClosed())); + connect(d->m_wallet, TQ_SIGNAL(walletClosed()), TQ_SLOT(slotWalletClosed())); if (!d->m_statusBarWalletLabel) { d->m_statusBarWalletLabel = new KURLLabel(d->m_statusBarExtension->statusBar()); @@ -7258,8 +7258,8 @@ void TDEHTMLPart::walletOpened(TDEWallet::Wallet *wallet) { d->m_statusBarWalletLabel->setUseCursor(false); d->m_statusBarExtension->addStatusBarItem(d->m_statusBarWalletLabel, 0, false); d->m_statusBarWalletLabel->setPixmap(SmallIcon("wallet_open", instance())); - connect(d->m_statusBarWalletLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(launchWalletManager())); - connect(d->m_statusBarWalletLabel, TQT_SIGNAL(rightClickedURL()), TQT_SLOT(walletMenu())); + connect(d->m_statusBarWalletLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(launchWalletManager())); + connect(d->m_statusBarWalletLabel, TQ_SIGNAL(rightClickedURL()), TQ_SLOT(walletMenu())); } else { TQToolTip::remove(d->m_statusBarWalletLabel); } @@ -7317,7 +7317,7 @@ void TDEHTMLPart::walletMenu() { #ifndef TDEHTML_NO_WALLET TDEPopupMenu *m = new TDEPopupMenu(0L); - m->insertItem(i18n("&Close Wallet"), this, TQT_SLOT(slotWalletClosed())); + m->insertItem(i18n("&Close Wallet"), this, TQ_SLOT(slotWalletClosed())); m->popup(TQCursor::pos()); #endif // TDEHTML_NO_WALLET } @@ -7360,7 +7360,7 @@ void TDEHTMLPart::setDebugScript( bool enable ) unplugActionList( "debugScriptList" ); if ( enable ) { if (!d->m_paDebugScript) { - d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQT_SLOT( slotDebugScript() ), actionCollection(), "debugScript" ); + d->m_paDebugScript = new TDEAction( i18n( "JavaScript &Debugger" ), 0, this, TQ_SLOT( slotDebugScript() ), actionCollection(), "debugScript" ); } d->m_paDebugScript->setEnabled( d->m_frame ? d->m_frame->m_jscript : 0L ); TQPtrList lst; @@ -7397,7 +7397,7 @@ void TDEHTMLPart::setSuppressedPopupIndicator( bool enable, TDEHTMLPart *originP d->m_statusBarPopupLabel->setPixmap( SmallIcon( "window_suppressed", instance() ) ); TQToolTip::add( d->m_statusBarPopupLabel, i18n("This page was prevented from opening a new window via JavaScript." ) ); - connect(d->m_statusBarPopupLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(suppressedPopupMenu())); + connect(d->m_statusBarPopupLabel, TQ_SIGNAL(leftClickedURL()), TQ_SLOT(suppressedPopupMenu())); if (d->m_settings->jsPopupBlockerPassivePopup()) { TQPixmap px; px = MainBarIcon( "window_suppressed" ); @@ -7415,10 +7415,10 @@ void TDEHTMLPart::suppressedPopupMenu() { TDEPopupMenu *m = new TDEPopupMenu(0L); m->setCheckable(true); if ( d->m_openableSuppressedPopups ) - m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQT_SLOT(showSuppressedPopups())); - m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQT_SLOT(togglePopupPassivePopup()),0,57); + m->insertItem(i18n("&Show Blocked Popup Window","Show %n Blocked Popup Windows", d->m_openableSuppressedPopups), this, TQ_SLOT(showSuppressedPopups())); + m->insertItem(i18n("Show Blocked Window Passive Popup &Notification"), this, TQ_SLOT(togglePopupPassivePopup()),0,57); m->setItemChecked(57,d->m_settings->jsPopupBlockerPassivePopup()); - m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQT_SLOT(launchJSConfigDialog())); + m->insertItem(i18n("&Configure JavaScript New Window Policies..."), this, TQ_SLOT(launchJSConfigDialog())); m->popup(TQCursor::pos()); } diff --git a/tdehtml/tdehtmlimage.cpp b/tdehtml/tdehtmlimage.cpp index fe8e31c8d..726f6d6c1 100644 --- a/tdehtml/tdehtmlimage.cpp +++ b/tdehtml/tdehtmlimage.cpp @@ -70,7 +70,7 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, m_tdehtml = new TDEHTMLPart( box, widgetName, this, "htmlimagepart", prof ); m_tdehtml->setAutoloadImages( true ); m_tdehtml->widget()->installEventFilter(this); - connect( m_tdehtml->view(), TQT_SIGNAL( finishedLayout() ), this, TQT_SLOT( restoreScrollPosition() ) ); + connect( m_tdehtml->view(), TQ_SIGNAL( finishedLayout() ), this, TQ_SLOT( restoreScrollPosition() ) ); setWidget( box ); @@ -105,15 +105,15 @@ TDEHTMLImage::TDEHTMLImage( TQWidget *parentWidget, const char *widgetName, // forward opening requests to parent frame (if existing) TDEHTMLPart *p = ::tqt_cast(parent); KParts::BrowserExtension *be = p ? p->browserExtension() : m_ext; - connect(m_tdehtml->browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), - be, TQT_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &))); + connect(m_tdehtml->browserExtension(), TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &)), + be, TQ_SIGNAL(openURLRequestDelayed(const KURL &, const KParts::URLArgs &))); - connect( m_tdehtml->browserExtension(), TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, - const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, + connect( m_tdehtml->browserExtension(), TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, + const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ), m_ext, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t) ) ); - connect( m_tdehtml->browserExtension(), TQT_SIGNAL( enableAction( const char *, bool ) ), - m_ext, TQT_SIGNAL( enableAction( const char *, bool ) ) ); + connect( m_tdehtml->browserExtension(), TQ_SIGNAL( enableAction( const char *, bool ) ), + m_ext, TQ_SIGNAL( enableAction( const char *, bool ) ) ); m_ext->setURLDropHandlingEnabled( true ); } @@ -169,8 +169,8 @@ bool TDEHTMLImage::openURL( const KURL &url ) m_tdehtml->end(); /* - connect( tdehtml::Cache::loader(), TQT_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), - this, TQT_SLOT( updateWindowCaption() ) ); + connect( tdehtml::Cache::loader(), TQ_SIGNAL( requestDone( tdehtml::DocLoader*, tdehtml::CachedObject *) ), + this, TQ_SLOT( updateWindowCaption() ) ); */ return true; } @@ -242,7 +242,7 @@ void TDEHTMLImage::slotImageJobFinished( TDEIO::Job *job ) else { emit completed(); - TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) ); } } diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp index 12087e4a3..eb8b6aac9 100644 --- a/tdehtml/tdehtmlview.cpp +++ b/tdehtml/tdehtmlview.cpp @@ -493,8 +493,8 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) d = new TDEHTMLViewPrivate; TQScrollView::setVScrollBarMode(d->vmode); TQScrollView::setHScrollBarMode(d->hmode); - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), this, TQT_SLOT(slotPaletteChanged())); - connect(this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotScrollBarMoved())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), this, TQ_SLOT(slotPaletteChanged())); + connect(this, TQ_SIGNAL(contentsMoving(int, int)), this, TQ_SLOT(slotScrollBarMoved())); // initialize QScrollView enableClipper(true); @@ -512,7 +512,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) #endif #ifndef TDEHTML_NO_TYPE_AHEAD_FIND - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(findTimeout())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(findTimeout())); #endif // TDEHTML_NO_TYPE_AHEAD_FIND init(); @@ -520,7 +520,7 @@ TDEHTMLView::TDEHTMLView( TDEHTMLPart *part, TQWidget *parent, const char *name) viewport()->show(); #ifndef NO_SMOOTH_SCROLL_HACK #define timer timer2 - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick())); #undef timer #endif } @@ -967,7 +967,7 @@ void TDEHTMLView::viewportMousePressEvent( TQMouseEvent *_mouse ) d->m_mouseScroll_byY = 0; d->m_mouseScrollTimer = new TQTimer( this ); - connect( d->m_mouseScrollTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotMouseScrollTimer()) ); + connect( d->m_mouseScrollTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotMouseScrollTimer()) ); if ( !d->m_mouseScrollIndicator ) { TQPixmap pixmap, icon; @@ -1095,7 +1095,7 @@ void TDEHTMLView::viewportMouseDoubleClickEvent( TQMouseEvent *_mouse ) } d->possibleTripleClick=true; - TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQT_SLOT(tripleClickTimeout())); + TQTimer::singleShot(TQApplication::doubleClickInterval(),this,TQ_SLOT(tripleClickTimeout())); } void TDEHTMLView::tripleClickTimeout() @@ -2283,8 +2283,8 @@ void TDEHTMLView::displayAccessKeys( TDEHTMLView* caller, TDEHTMLView* origview, if( !accesskey.isNull()) { TQRect rec=en->getRect(); TQLabel *lab=new TQLabel(accesskey,viewport(),0,(WFlags)WDestructiveClose); - connect( origview, TQT_SIGNAL(hideAccessKeys()), lab, TQT_SLOT(close()) ); - connect( this, TQT_SIGNAL(repaintAccessKeys()), lab, TQT_SLOT(repaint())); + connect( origview, TQ_SIGNAL(hideAccessKeys()), lab, TQ_SLOT(close()) ); + connect( this, TQ_SIGNAL(repaintAccessKeys()), lab, TQ_SLOT(repaint())); lab->setPalette(TQToolTip::palette()); lab->setLineWidth(2); lab->setFrameStyle(TQFrame::Box | TQFrame::Plain); diff --git a/tdehtml/tdemultipart/tdemultipart.cpp b/tdehtml/tdemultipart/tdemultipart.cpp index 15970bbaa..7afda5741 100644 --- a/tdehtml/tdemultipart/tdemultipart.cpp +++ b/tdehtml/tdemultipart/tdemultipart.cpp @@ -115,7 +115,7 @@ KMultiPart::KMultiPart( TQWidget *parentWidget, const char *widgetName, m_tempFile = 0L; m_timer = new TQTimer( this ); - connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgressInfo() ) ); + connect( m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgressInfo() ) ); } KMultiPart::~KMultiPart() @@ -167,10 +167,10 @@ bool KMultiPart::openURL( const KURL &url ) emit started( 0 /*m_job*/ ); // don't pass the job, it would interfer with our own infoMessage - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotJobFinished( TDEIO::Job * ) ) ); - connect( m_job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotJobFinished( TDEIO::Job * ) ) ); + connect( m_job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( slotData( TDEIO::Job *, const TQByteArray & ) ) ); m_numberOfFrames = 0; m_numberOfFramesSkipped = 0; @@ -324,8 +324,8 @@ void KMultiPart::setPart( const TQString& mimeType ) insertChildClient( m_part ); m_part->widget()->show(); - connect( m_part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotPartCompleted() ) ); + connect( m_part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotPartCompleted() ) ); m_isHTMLPart = ( mimeType == "text/html" ); KParts::BrowserExtension* childExtension = KParts::BrowserExtension::childObject( m_part ); @@ -336,62 +336,62 @@ void KMultiPart::setPart( const TQString& mimeType ) // Forward signals from the part's browser extension // this is very related (but not exactly like) TDEHTMLPart::processObjectRequest - connect( childExtension, TQT_SIGNAL( openURLNotify() ), - m_extension, TQT_SIGNAL( openURLNotify() ) ); + connect( childExtension, TQ_SIGNAL( openURLNotify() ), + m_extension, TQ_SIGNAL( openURLNotify() ) ); - connect( childExtension, TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), - m_extension, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( childExtension, TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ), + m_extension, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), - m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); - connect( childExtension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), - m_extension, TQT_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); + connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ), + m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & ) ) ); + connect( childExtension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs &, const KParts::WindowArgs &, KParts::ReadOnlyPart *& ) ), + m_extension, TQ_SIGNAL( createNewWindow( const KURL &, const KParts::URLArgs & , const KParts::WindowArgs &, KParts::ReadOnlyPart *&) ) ); // Keep in sync with tdehtml_part.cpp - connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), - m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_extension, TQT_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); - connect( childExtension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), - m_extension, TQT_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ), + m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KFileItemList & ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList & ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KFileItemList &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_extension, TQ_SIGNAL( popupMenu( const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const TQString &, mode_t ) ) ); + connect( childExtension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ), + m_extension, TQ_SIGNAL( popupMenu( KXMLGUIClient *, const TQPoint &, const KURL &, const KParts::URLArgs &, KParts::BrowserExtension::PopupFlags, mode_t ) ) ); if ( m_isHTMLPart ) - connect( childExtension, TQT_SIGNAL( infoMessage( const TQString & ) ), - m_extension, TQT_SIGNAL( infoMessage( const TQString & ) ) ); + connect( childExtension, TQ_SIGNAL( infoMessage( const TQString & ) ), + m_extension, TQ_SIGNAL( infoMessage( const TQString & ) ) ); // For non-HTML we prefer to show our infoMessage ourselves. childExtension->setBrowserInterface( m_extension->browserInterface() ); - connect( childExtension, TQT_SIGNAL( enableAction( const char *, bool ) ), - m_extension, TQT_SIGNAL( enableAction( const char *, bool ) ) ); - connect( childExtension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ), - m_extension, TQT_SIGNAL( setLocationBarURL( const TQString& ) ) ); - connect( childExtension, TQT_SIGNAL( setIconURL( const KURL& ) ), - m_extension, TQT_SIGNAL( setIconURL( const KURL& ) ) ); - connect( childExtension, TQT_SIGNAL( loadingProgress( int ) ), - m_extension, TQT_SIGNAL( loadingProgress( int ) ) ); + connect( childExtension, TQ_SIGNAL( enableAction( const char *, bool ) ), + m_extension, TQ_SIGNAL( enableAction( const char *, bool ) ) ); + connect( childExtension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ), + m_extension, TQ_SIGNAL( setLocationBarURL( const TQString& ) ) ); + connect( childExtension, TQ_SIGNAL( setIconURL( const KURL& ) ), + m_extension, TQ_SIGNAL( setIconURL( const KURL& ) ) ); + connect( childExtension, TQ_SIGNAL( loadingProgress( int ) ), + m_extension, TQ_SIGNAL( loadingProgress( int ) ) ); if ( m_isHTMLPart ) // for non-HTML we have our own - connect( childExtension, TQT_SIGNAL( speedProgress( int ) ), - m_extension, TQT_SIGNAL( speedProgress( int ) ) ); - connect( childExtension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ), - m_extension, TQT_SIGNAL( selectionInfo( const KFileItemList& ) ) ); - connect( childExtension, TQT_SIGNAL( selectionInfo( const TQString& ) ), - m_extension, TQT_SIGNAL( selectionInfo( const TQString& ) ) ); - connect( childExtension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ), - m_extension, TQT_SIGNAL( selectionInfo( const KURL::List& ) ) ); - connect( childExtension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ), - m_extension, TQT_SIGNAL( mouseOverInfo( const KFileItem* ) ) ); - connect( childExtension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ), - m_extension, TQT_SIGNAL( moveTopLevelWidget( int, int ) ) ); - connect( childExtension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ), - m_extension, TQT_SIGNAL( resizeTopLevelWidget( int, int ) ) ); + connect( childExtension, TQ_SIGNAL( speedProgress( int ) ), + m_extension, TQ_SIGNAL( speedProgress( int ) ) ); + connect( childExtension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ), + m_extension, TQ_SIGNAL( selectionInfo( const KFileItemList& ) ) ); + connect( childExtension, TQ_SIGNAL( selectionInfo( const TQString& ) ), + m_extension, TQ_SIGNAL( selectionInfo( const TQString& ) ) ); + connect( childExtension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ), + m_extension, TQ_SIGNAL( selectionInfo( const KURL::List& ) ) ); + connect( childExtension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ), + m_extension, TQ_SIGNAL( mouseOverInfo( const KFileItem* ) ) ); + connect( childExtension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ), + m_extension, TQ_SIGNAL( moveTopLevelWidget( int, int ) ) ); + connect( childExtension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ), + m_extension, TQ_SIGNAL( resizeTopLevelWidget( int, int ) ) ); } m_partIsLoading = false; @@ -414,7 +414,7 @@ void KMultiPart::startOfData() if ( m_gzip ) { m_filter = new HTTPFilterGZip; - connect( m_filter, TQT_SIGNAL( output( const TQByteArray& ) ), this, TQT_SLOT( reallySendData( const TQByteArray& ) ) ); + connect( m_filter, TQ_SIGNAL( output( const TQByteArray& ) ), this, TQ_SLOT( reallySendData( const TQByteArray& ) ) ); } if ( m_mimeType != m_nextMimeType ) @@ -551,7 +551,7 @@ void KMultiPart::slotJobFinished( TDEIO::Job *job ) emit completed(); - //TQTimer::singleShot( 0, this, TQT_SLOT( updateWindowCaption() ) ); + //TQTimer::singleShot( 0, this, TQ_SLOT( updateWindowCaption() ) ); } m_job = 0L; } diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp index 400ff1ac3..81b0b9a4e 100644 --- a/tdehtml/test_regression.cpp +++ b/tdehtml/test_regression.cpp @@ -118,7 +118,7 @@ PartMonitor::PartMonitor(TDEHTMLPart *_part) { m_part = _part; m_completed = false; - connect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted())); + connect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted())); m_timer_waits = 200; m_timeout_timer = new TQTimer(this); } @@ -141,12 +141,12 @@ void PartMonitor::waitForCompletion() kapp->enter_loop(); - //connect(m_timeout_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT( timeout() ) ); + //connect(m_timeout_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT( timeout() ) ); //m_timeout_timer->stop(); //m_timeout_timer->start( visual ? 100 : 2, true ); } - TQTimer::singleShot( 0, this, TQT_SLOT( finishTimers() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( finishTimers() ) ); kapp->enter_loop(); } @@ -161,7 +161,7 @@ void PartMonitor::finishTimers() --m_timer_waits; if ( m_timer_waits && (w && w->winq->hasTimers()) || m_part->inProgress()) { // wait a bit - TQTimer::singleShot( 10, this, TQT_SLOT(finishTimers() ) ); + TQTimer::singleShot( 10, this, TQ_SLOT(finishTimers() ) ); return; } kapp->exit_loop(); @@ -172,9 +172,9 @@ void PartMonitor::partCompleted() m_completed = true; RenderWidget::flushWidgetResizes(); m_timeout_timer->stop(); - connect(m_timeout_timer, TQT_SIGNAL(timeout()),this, TQT_SLOT( timeout() ) ); + connect(m_timeout_timer, TQ_SIGNAL(timeout()),this, TQ_SLOT( timeout() ) ); m_timeout_timer->start( visual ? 100 : 2, true ); - disconnect(m_part,TQT_SIGNAL(completed()),this,TQT_SLOT(partCompleted())); + disconnect(m_part,TQ_SIGNAL(completed()),this,TQ_SLOT(partCompleted())); } static void signal_handler( int ) @@ -593,10 +593,10 @@ int main(int argc, char *argv[]) args->isSet("genoutput"), !args->isSet( "html" ), !args->isSet( "js" )); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), - regressionTest, TQT_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); - TQObject::connect(part->browserExtension(), TQT_SIGNAL(resizeTopLevelWidget( int, int )), - regressionTest, TQT_SLOT(resizeTopLevelWidget( int, int ))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)), + regressionTest, TQ_SLOT(slotOpenURL(const KURL&, const KParts::URLArgs &))); + TQObject::connect(part->browserExtension(), TQ_SIGNAL(resizeTopLevelWidget( int, int )), + regressionTest, TQ_SLOT(resizeTopLevelWidget( int, int ))); bool result = false; QCStringList tests = args->getOptionList("test"); diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp index 40a28621e..6c3d1506e 100644 --- a/tdehtml/testtdehtml.cpp +++ b/tdehtml/testtdehtml.cpp @@ -56,10 +56,10 @@ int main(int argc, char *argv[]) TDEHTMLPart *doc = new TDEHTMLPart( toplevel, 0, toplevel, 0, TDEHTMLPart::BrowserViewGUI ); Dummy *dummy = new Dummy( doc ); - TQObject::connect( doc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - dummy, TQT_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) ); + TQObject::connect( doc->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + dummy, TQ_SLOT( slotOpenURL( const KURL&, const KParts::URLArgs & ) ) ); - TQObject::connect( doc, TQT_SIGNAL(completed()), dummy, TQT_SLOT(handleDone()) ); + TQObject::connect( doc, TQ_SIGNAL(completed()), dummy, TQ_SLOT(handleDone()) ); if (args->url(0).url().right(4).find(".xml", 0, false) == 0) { KParts::URLArgs ags(doc->browserExtension()->urlArgs()); @@ -105,16 +105,16 @@ int main(int argc, char *argv[]) e.setAttribute( "name", "print" ); toolBar.insertBefore( e, toolBar.firstChild() ); - (void)new TDEAction( "Reload", "reload", TQt::Key_F5, dummy, TQT_SLOT( reload() ), doc->actionCollection(), "reload" ); - (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQT_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" ); - TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQT_SLOT( print() ), doc->actionCollection(), "print" ); + (void)new TDEAction( "Reload", "reload", TQt::Key_F5, dummy, TQ_SLOT( reload() ), doc->actionCollection(), "reload" ); + (void)new TDEAction( "Benchmark...", 0, 0, dummy, TQ_SLOT( doBenchmark() ), doc->actionCollection(), "debugDoBenchmark" ); + TDEAction* kprint = new TDEAction( "Print", "print", 0, doc->browserExtension(), TQ_SLOT( print() ), doc->actionCollection(), "print" ); kprint->setEnabled(true); TDEToggleAction *ta = new TDEToggleAction( "Navigable", "edit-clear", 0, doc->actionCollection(), "navigable" ); ta->setChecked(doc->isCaretMode()); - TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleNavigable(bool) )); + TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleNavigable(bool) )); ta = new TDEToggleAction( "Editable", "edit", 0, doc->actionCollection(), "editable" ); ta->setChecked(doc->isEditable()); - TQWidget::connect(ta, TQT_SIGNAL(toggled(bool)), dummy, TQT_SLOT( toggleEditable(bool) )); + TQWidget::connect(ta, TQ_SIGNAL(toggled(bool)), dummy, TQ_SLOT( toggleEditable(bool) )); toplevel->guiFactory()->addClient( doc ); doc->setJScriptEnabled(true); @@ -122,8 +122,8 @@ int main(int argc, char *argv[]) doc->setPluginsEnabled( true ); doc->setURLCursor(TQCursor(TQt::PointingHandCursor)); a.setTopWidget(doc->widget()); - TQWidget::connect(doc, TQT_SIGNAL(setWindowCaption(const TQString &)), - doc->widget()->topLevelWidget(), TQT_SLOT(setCaption(const TQString &))); + TQWidget::connect(doc, TQ_SIGNAL(setWindowCaption(const TQString &)), + doc->widget()->topLevelWidget(), TQ_SLOT(setCaption(const TQString &))); doc->widget()->show(); toplevel->show(); ((TQScrollView *)doc->widget())->viewport()->show(); diff --git a/tdehtml/xml/dom_docimpl.cpp b/tdehtml/xml/dom_docimpl.cpp index c6dca1096..245585d74 100644 --- a/tdehtml/xml/dom_docimpl.cpp +++ b/tdehtml/xml/dom_docimpl.cpp @@ -1334,7 +1334,7 @@ void DocumentImpl::open( bool clearEventListeners ) m_tokenizer = createTokenizer(); m_decoderMibEnum = 0; - connect(m_tokenizer,TQT_SIGNAL(finishedParsing()),this,TQT_SIGNAL(finishedParsing())); + connect(m_tokenizer,TQ_SIGNAL(finishedParsing()),this,TQ_SIGNAL(finishedParsing())); m_tokenizer->begin(); } diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp index bfdf677f0..8325f3acb 100644 --- a/tdeinit/tdelauncher.cpp +++ b/tdeinit/tdelauncher.cpp @@ -69,7 +69,7 @@ template class TQPtrList; IdleSlave::IdleSlave(TDESocket *socket) { mConn.init(socket); - mConn.connect(this, TQT_SLOT(gotInput())); + mConn.connect(this, TQ_SLOT(gotInput())); mConn.send( CMD_SLAVE_STATUS ); mPid = 0; mBirthDate = time(0); @@ -172,12 +172,12 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup) #ifdef Q_WS_X11 mCached_dpy = NULL; #endif - connect(&mAutoTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoStart())); + connect(&mAutoTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoStart())); requestList.setAutoDelete(true); mSlaveWaitRequest.setAutoDelete(true); dcopClient()->setNotifications( true ); - connect(dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString &)), - this, TQT_SLOT( slotAppRegistered( const TQCString &))); + connect(dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString &)), + this, TQ_SLOT( slotAppRegistered( const TQCString &))); dcopClient()->connectDCOPSignal( "DCOPServer", "", "terminateTDE()", objId(), "terminateTDE()", false ); @@ -195,14 +195,14 @@ TDELauncher::TDELauncher(int _tdeinitSocket, bool new_startup) domainname.unlink(); #endif mPoolSocket = new TDEServerSocket(static_cast(TQFile::encodeName(mPoolSocketName))); - connect(mPoolSocket, TQT_SIGNAL(accepted( TDESocket *)), - TQT_SLOT(acceptSlave(TDESocket *))); + connect(mPoolSocket, TQ_SIGNAL(accepted( TDESocket *)), + TQ_SLOT(acceptSlave(TDESocket *))); - connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(idleTimeout())); + connect(&mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(idleTimeout())); tdeinitNotifier = new TQSocketNotifier(tdeinitSocket, TQSocketNotifier::Read); - connect(tdeinitNotifier, TQT_SIGNAL( activated( int )), - this, TQT_SLOT( slotKDEInitData( int ))); + connect(tdeinitNotifier, TQ_SIGNAL( activated( int )), + this, TQ_SLOT( slotKDEInitData( int ))); tdeinitNotifier->setEnabled( true ); lastRequest = 0; bProcessingQueue = false; @@ -1184,7 +1184,7 @@ TDELauncher::queueRequest(TDELaunchRequest *request) if (!bProcessingQueue) { bProcessingQueue = true; - TQTimer::singleShot(0, this, TQT_SLOT( slotDequeue() )); + TQTimer::singleShot(0, this, TQ_SLOT( slotDequeue() )); } } @@ -1358,9 +1358,9 @@ TDELauncher::acceptSlave(TDESocket *slaveSocket) IdleSlave *slave = new IdleSlave(slaveSocket); // Send it a SLAVE_STATUS command. mSlaveList.append(slave); - connect(slave, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotSlaveGone())); - connect(slave, TQT_SIGNAL(statusUpdate(IdleSlave *)), - this, TQT_SLOT(slotSlaveStatus(IdleSlave *))); + connect(slave, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotSlaveGone())); + connect(slave, TQ_SIGNAL(statusUpdate(IdleSlave *)), + this, TQ_SLOT(slotSlaveStatus(IdleSlave *))); if (!mTimer.isActive()) { mTimer.start(1000*10); diff --git a/tdeio/bookmarks/kbookmarkbar.cpp b/tdeio/bookmarks/kbookmarkbar.cpp index b4d548886..ca4d5d8c0 100644 --- a/tdeio/bookmarks/kbookmarkbar.cpp +++ b/tdeio/bookmarks/kbookmarkbar.cpp @@ -96,8 +96,8 @@ KBookmarkBar::KBookmarkBar( KBookmarkManager* mgr, dptr()->m_actions.setAutoDelete( true ); - connect( mgr, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( mgr, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); KBookmarkGroup toolbar = getToolbar(); fillBookmarkBar( toolbar ); @@ -198,8 +198,8 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) else { TDEAction *action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -227,10 +227,10 @@ void KBookmarkBar::fillBookmarkBar(KBookmarkGroup & parent) KBookmarkMenu *menu = new KBookmarkMenu(CURRENT_MANAGER(), m_pOwner, action->popupMenu(), m_actionCollection, false, addEntriesBookmarkBar, bm.address()); - connect(menu, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ), - this, TQT_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) )); - connect(menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) )); + connect(menu, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) ), + this, TQ_SIGNAL( aboutToShowContextMenu(const KBookmark &, TQPopupMenu * ) )); + connect(menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState) )); menu->fillBookmarkMenu(); action->plug(m_toolBar); m_lstSubMenus.append( menu ); diff --git a/tdeio/bookmarks/kbookmarkdombuilder.cpp b/tdeio/bookmarks/kbookmarkdombuilder.cpp index 5c0882d05..2fddaa861 100644 --- a/tdeio/bookmarks/kbookmarkdombuilder.cpp +++ b/tdeio/bookmarks/kbookmarkdombuilder.cpp @@ -36,14 +36,14 @@ KBookmarkDomBuilder::~KBookmarkDomBuilder() { } void KBookmarkDomBuilder::connectImporter(const TQObject *importer) { - connect(importer, TQT_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ), - TQT_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) )); - connect(importer, TQT_SIGNAL( newFolder(const TQString &, bool, const TQString &) ), - TQT_SLOT( newFolder(const TQString &, bool, const TQString &) )); - connect(importer, TQT_SIGNAL( newSeparator() ), - TQT_SLOT( newSeparator() ) ); - connect(importer, TQT_SIGNAL( endFolder() ), - TQT_SLOT( endFolder() ) ); + connect(importer, TQ_SIGNAL( newBookmark(const TQString &, const TQCString &, const TQString &) ), + TQ_SLOT( newBookmark(const TQString &, const TQCString &, const TQString &) )); + connect(importer, TQ_SIGNAL( newFolder(const TQString &, bool, const TQString &) ), + TQ_SLOT( newFolder(const TQString &, bool, const TQString &) )); + connect(importer, TQ_SIGNAL( newSeparator() ), + TQ_SLOT( newSeparator() ) ); + connect(importer, TQ_SIGNAL( endFolder() ), + TQ_SLOT( endFolder() ) ); } void KBookmarkDomBuilder::newBookmark( diff --git a/tdeio/bookmarks/kbookmarkimporter.cpp b/tdeio/bookmarks/kbookmarkimporter.cpp index a83e36c78..3eb13a501 100644 --- a/tdeio/bookmarks/kbookmarkimporter.cpp +++ b/tdeio/bookmarks/kbookmarkimporter.cpp @@ -70,14 +70,14 @@ void KXBELBookmarkImporterImpl::visitLeave(const KBookmarkGroup &) void KBookmarkImporterBase::setupSignalForwards(TQObject *src, TQObject *dst) { - connect(src, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), - dst, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) )); - connect(src, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), - dst, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) )); - connect(src, TQT_SIGNAL( newSeparator() ), - dst, TQT_SIGNAL( newSeparator() ) ); - connect(src, TQT_SIGNAL( endFolder() ), - dst, TQT_SIGNAL( endFolder() ) ); + connect(src, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), + dst, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) )); + connect(src, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), + dst, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) )); + connect(src, TQ_SIGNAL( newSeparator() ), + dst, TQ_SIGNAL( newSeparator() ) ); + connect(src, TQ_SIGNAL( endFolder() ), + dst, TQ_SIGNAL( endFolder() ) ); } KBookmarkImporterBase* KBookmarkImporterBase::factory( const TQString &type ) diff --git a/tdeio/bookmarks/kbookmarkmenu.cpp b/tdeio/bookmarks/kbookmarkmenu.cpp index 38816f8dc..070912eb5 100644 --- a/tdeio/bookmarks/kbookmarkmenu.cpp +++ b/tdeio/bookmarks/kbookmarkmenu.cpp @@ -94,9 +94,9 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr, if (m_actionCollection) { m_actionCollection->setHighlightingEnabled(true); - disconnect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 ); - connect( m_actionCollection, TQT_SIGNAL( actionHighlighted( TDEAction * ) ), - this, TQT_SLOT( slotActionHighlighted( TDEAction * ) ) ); + disconnect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ), 0, 0 ); + connect( m_actionCollection, TQ_SIGNAL( actionHighlighted( TDEAction * ) ), + this, TQ_SLOT( slotActionHighlighted( TDEAction * ) ) ); } m_bNSBookmark = m_parentAddress.isNull(); @@ -104,20 +104,20 @@ KBookmarkMenu::KBookmarkMenu( KBookmarkManager* mgr, { //kdDebug(7043) << "KBookmarkMenu::KBookmarkMenu " << this << " address : " << m_parentAddress << endl; - connect( _parentMenu, TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( slotAboutToShow() ) ); + connect( _parentMenu, TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( slotAboutToShow() ) ); if ( KBookmarkSettings::self()->m_contextmenu ) { (void) _parentMenu->contextMenu(); - connect( _parentMenu, TQT_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ), - this, TQT_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) )); + connect( _parentMenu, TQ_SIGNAL( aboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) ), + this, TQ_SLOT( slotAboutToShowContextMenu(TDEPopupMenu*, int, TQPopupMenu*) )); } if ( m_bIsRoot ) { - connect( m_pManager, TQT_SIGNAL( changed(const TQString &, const TQString &) ), - TQT_SLOT( slotBookmarksChanged(const TQString &) ) ); + connect( m_pManager, TQ_SIGNAL( changed(const TQString &, const TQString &) ), + TQ_SLOT( slotBookmarksChanged(const TQString &) ) ); } } @@ -254,12 +254,12 @@ void RMB::fillContextMenu( TQPopupMenu* contextMenu, const TQString & address, i // TODO rename these, but, message freeze... umm... // if (bookmark.isGroup()) { - id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) ); + id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) ); contextMenu->setItemParameter( id, val ); /* } else { - id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQT_SLOT(slotRMBActionInsert(int)) ); + id = contextMenu->insertItem( SmallIcon("bookmark_add"), i18n( "Add Bookmark Here" ), recv, TQ_SLOT(slotRMBActionInsert(int)) ); contextMenu->setItemParameter( id, val ); }*/ } @@ -271,24 +271,24 @@ void RMB::fillContextMenu2( TQPopupMenu* contextMenu, const TQString & address, int id; if (bookmark.isGroup()) { - id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQT_SLOT(slotRMBActionEditAt(int)) ); + id = contextMenu->insertItem( i18n( "Open Folder in Bookmark Editor" ), recv, TQ_SLOT(slotRMBActionEditAt(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Folder" ), recv, TQ_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); + id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) ); contextMenu->setItemParameter( id, val ); } else { - id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQT_SLOT(slotRMBActionCopyLocation(int)) ); + id = contextMenu->insertItem( i18n( "Copy Link Address" ), recv, TQ_SLOT(slotRMBActionCopyLocation(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQT_SLOT(slotRMBActionRemove(int)) ); + id = contextMenu->insertItem( SmallIcon("edit-delete"), i18n( "Delete Bookmark" ), recv, TQ_SLOT(slotRMBActionRemove(int)) ); contextMenu->setItemParameter( id, val ); contextMenu->insertSeparator(); - id = contextMenu->insertItem( i18n( "Properties" ), recv, TQT_SLOT(slotRMBActionProperties(int)) ); + id = contextMenu->insertItem( i18n( "Properties" ), recv, TQ_SLOT(slotRMBActionProperties(int)) ); contextMenu->setItemParameter( id, val ); } } @@ -487,7 +487,7 @@ void KBookmarkMenu::addAddBookmarksList() "bookmarks_list_add", 0, this, - TQT_SLOT( slotAddBookmarksList() ), + TQ_SLOT( slotAddBookmarksList() ), m_actionCollection, m_bIsRoot ? "add_bookmarks_list" : 0 ); paAddBookmarksList->setToolTip( i18n( "Add a folder of bookmarks for all open tabs." ) ); @@ -507,7 +507,7 @@ void KBookmarkMenu::addAddBookmark() "bookmark_add", m_bIsRoot && m_bAddShortcuts ? TDEStdAccel::addBookmark() : TDEShortcut(), this, - TQT_SLOT( slotAddBookmark() ), + TQ_SLOT( slotAddBookmark() ), m_actionCollection, m_bIsRoot ? "add_bookmark" : 0 ); paAddBookmarks->setToolTip( i18n( "Add a bookmark for the current document" ) ); @@ -521,7 +521,7 @@ void KBookmarkMenu::addEditBookmarks() if (!kapp->authorizeTDEAction("bookmarks")) return; - TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQT_SLOT( slotEditBookmarks() ), + TDEAction * m_paEditBookmarks = KStdAction::editBookmarks( m_pManager, TQ_SLOT( slotEditBookmarks() ), m_actionCollection, "edit_bookmarks" ); m_paEditBookmarks->plug( m_parentMenu ); m_paEditBookmarks->setToolTip( i18n( "Edit your bookmark collection in a separate window" ) ); @@ -542,7 +542,7 @@ void KBookmarkMenu::addNewFolder() "folder-new", //"folder", 0, this, - TQT_SLOT( slotNewFolder() ), + TQ_SLOT( slotNewFolder() ), m_actionCollection ); paNewFolder->setToolTip( i18n( "Create a new bookmark folder in this menu" ) ); @@ -607,11 +607,11 @@ void KBookmarkMenu::fillBookmarkMenu() new KBookmarkMenu( m_pManager, m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append(subMenu); - connect(actionMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), subMenu, TQT_SLOT(slotNSLoad())); + connect(actionMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), subMenu, TQ_SLOT(slotNSLoad())); } } @@ -637,8 +637,8 @@ void KBookmarkMenu::fillBookmarkMenu() { //kdDebug(7043) << "Creating URL bookmark menu item for " << bm.text() << endl; TDEAction * action = new KBookmarkAction( text, bm.icon(), 0, m_actionCollection, 0 ); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - this, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + this, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", bm.url().url() ); action->setProperty( "address", bm.address() ); @@ -664,10 +664,10 @@ void KBookmarkMenu::fillBookmarkMenu() m_bAddBookmark, bm.address() ); - connect(subMenu, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ), - this, TQT_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) )); - connect(subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - this, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect(subMenu, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) ), + this, TQ_SIGNAL( aboutToShowContextMenu( const KBookmark &, TQPopupMenu * ) )); + connect(subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + this, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); m_lstSubMenus.append( subMenu ); } } @@ -767,7 +767,7 @@ KExtendedBookmarkOwner* KBookmarkMenu::extOwner() void KBookmarkMenu::slotNSLoad() { // only fill menu once - m_parentMenu->disconnect(TQT_SIGNAL(aboutToShow())); + m_parentMenu->disconnect(TQ_SIGNAL(aboutToShow())); // not NSImporter, but kept old name for BC reasons KBookmarkMenuNSImporter importer( m_pManager, this, m_actionCollection ); @@ -846,10 +846,10 @@ KBookmarkEditDialog::KBookmarkEditDialog(const TQString& title, const TQString& if ( editType == InsertionMode ) { m_folderTree = KBookmarkFolderTree::createTree( m_mgr, m_main, name, m_address ); - connect( m_folderTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - this, TQT_SLOT( slotDoubleClicked(TQListViewItem*) ) ); + connect( m_folderTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + this, TQ_SLOT( slotDoubleClicked(TQListViewItem*) ) ); vbox->addWidget( m_folderTree ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotUser1() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotUser1() ) ); } } @@ -1043,12 +1043,12 @@ void KBookmarkMenuNSImporter::openBookmarks( const TQString &location, const TQS void KBookmarkMenuNSImporter::connectToImporter(const TQObject &importer) { - connect( &importer, TQT_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), - TQT_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), - TQT_SLOT( newFolder( const TQString &, bool, const TQString & ) ) ); - connect( &importer, TQT_SIGNAL( newSeparator() ), TQT_SLOT( newSeparator() ) ); - connect( &importer, TQT_SIGNAL( endFolder() ), TQT_SLOT( endFolder() ) ); + connect( &importer, TQ_SIGNAL( newBookmark( const TQString &, const TQCString &, const TQString & ) ), + TQ_SLOT( newBookmark( const TQString &, const TQCString &, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newFolder( const TQString &, bool, const TQString & ) ), + TQ_SLOT( newFolder( const TQString &, bool, const TQString & ) ) ); + connect( &importer, TQ_SIGNAL( newSeparator() ), TQ_SLOT( newSeparator() ) ); + connect( &importer, TQ_SIGNAL( endFolder() ), TQ_SLOT( endFolder() ) ); } void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCString & url, const TQString & ) @@ -1056,8 +1056,8 @@ void KBookmarkMenuNSImporter::newBookmark( const TQString & text, const TQCStrin TQString _text = KStringHandler::csqueeze(text); _text.replace( '&', "&&" ); TDEAction * action = new KBookmarkAction(_text, "text-html", 0, 0, "", m_actionCollection, 0); - connect(action, TQT_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), - m_menu, TQT_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); + connect(action, TQ_SIGNAL( activated ( TDEAction::ActivationReason, TQt::ButtonState )), + m_menu, TQ_SLOT( slotBookmarkSelected( TDEAction::ActivationReason, TQt::ButtonState ) )); action->setProperty( "url", url ); action->setToolTip( url ); action->plug( mstack.top()->m_parentMenu ); @@ -1074,8 +1074,8 @@ void KBookmarkMenuNSImporter::newFolder( const TQString & text, bool, const TQSt KBookmarkMenu *subMenu = new KBookmarkMenu( m_pManager, m_menu->m_pOwner, actionMenu->popupMenu(), m_actionCollection, false, m_menu->m_bAddBookmark, TQString::null ); - connect( subMenu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), - m_menu, TQT_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); + connect( subMenu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) ), + m_menu, TQ_SIGNAL( openBookmark( const TQString &, TQt::ButtonState ) )); mstack.top()->m_lstSubMenus.append( subMenu ); mstack.push(subMenu); diff --git a/tdeio/httpfilter/httpfilter.cpp b/tdeio/httpfilter/httpfilter.cpp index 0f6a45790..a2ed52f43 100644 --- a/tdeio/httpfilter/httpfilter.cpp +++ b/tdeio/httpfilter/httpfilter.cpp @@ -37,8 +37,8 @@ void HTTPFilterBase::chain(HTTPFilterBase *previous) { last = previous; - connect(last, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SLOT(slotInput(const TQByteArray &))); + connect(last, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SLOT(slotInput(const TQByteArray &))); } HTTPFilterChain::HTTPFilterChain() @@ -55,14 +55,14 @@ HTTPFilterChain::addFilter(HTTPFilterBase *filter) } else { - disconnect(last, TQT_SIGNAL(output(const TQByteArray &)), 0, 0); + disconnect(last, TQ_SIGNAL(output(const TQByteArray &)), 0, 0); filter->chain(last); } last = filter; - connect(filter, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SIGNAL(output(const TQByteArray &))); - connect(filter, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SIGNAL(error(int, const TQString &))); + connect(filter, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SIGNAL(output(const TQByteArray &))); + connect(filter, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SIGNAL(error(int, const TQString &))); } void diff --git a/tdeio/kpasswdserver/kpasswdserver.cpp b/tdeio/kpasswdserver/kpasswdserver.cpp index 075843259..f9340368a 100644 --- a/tdeio/kpasswdserver/kpasswdserver.cpp +++ b/tdeio/kpasswdserver/kpasswdserver.cpp @@ -76,8 +76,8 @@ KPasswdServer::KPasswdServer(const TQCString &name) m_authPending.setAutoDelete(true); m_seqNr = 0; m_wallet = 0; - connect(this, TQT_SIGNAL(windowUnregistered(long)), - this, TQT_SLOT(removeAuthForWindowId(long))); + connect(this, TQ_SIGNAL(windowUnregistered(long)), + this, TQ_SLOT(removeAuthForWindowId(long))); } KPasswdServer::~KPasswdServer() @@ -279,7 +279,7 @@ KPasswdServer::queryAuthInfo(TDEIO::AuthInfo info, TQString errorMsg, long windo m_authPending.append(request); if (m_authPending.count() == 1) - TQTimer::singleShot(0, this, TQT_SLOT(processRequest())); + TQTimer::singleShot(0, this, TQ_SLOT(processRequest())); return info; } @@ -493,7 +493,7 @@ KPasswdServer::processRequest() } if (m_authPending.count()) - TQTimer::singleShot(0, this, TQT_SLOT(processRequest())); + TQTimer::singleShot(0, this, TQ_SLOT(processRequest())); } diff --git a/tdeio/kssl/ksslcertdlg.cpp b/tdeio/kssl/ksslcertdlg.cpp index 7431d4c0a..6f0d7b5a0 100644 --- a/tdeio/kssl/ksslcertdlg.cpp +++ b/tdeio/kssl/ksslcertdlg.cpp @@ -74,11 +74,11 @@ KSSLCertDlg::KSSLCertDlg(TQWidget *parent, const char *name, bool modal) _ok = new KPushButton(i18n("Send certificate"), this); h->addWidget(_ok); - connect(_ok, TQT_SIGNAL(clicked()), TQT_SLOT(slotSend())); + connect(_ok, TQ_SIGNAL(clicked()), TQ_SLOT(slotSend())); d->p_pb_dontsend = new KPushButton(i18n("Do not send a certificate"), this); h->addWidget(d->p_pb_dontsend); - connect(d->p_pb_dontsend, TQT_SIGNAL(clicked()), TQT_SLOT(slotDont())); + connect(d->p_pb_dontsend, TQ_SIGNAL(clicked()), TQ_SLOT(slotDont())); #ifndef TQT_NO_WIDGET_TOPEXTRA setCaption(i18n("TDE SSL Certificate Dialog")); diff --git a/tdeio/kssl/ksslinfodlg.cpp b/tdeio/kssl/ksslinfodlg.cpp index 9ed7742a7..6d4683d95 100644 --- a/tdeio/kssl/ksslinfodlg.cpp +++ b/tdeio/kssl/ksslinfodlg.cpp @@ -107,12 +107,12 @@ KSSLInfoDlg::KSSLInfoDlg(bool secureConnection, TQWidget *parent, const char *na if (KSSL::doesSSLWork()) { button = new KPushButton(KGuiItem(i18n("C&ryptography Configuration..."),"configure"), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(launchConfig())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(launchConfig())); buttonLayout->addWidget( button ); } button = new KPushButton(KStdGuiItem::close(), this); - connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(close())); + connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(close())); buttonLayout->addWidget( button ); button->setFocus(); @@ -188,7 +188,7 @@ void KSSLInfoDlg::setup(KSSLCertificate *cert, layout->addWidget(new TQLabel(i18n("Chain:"), this), 0, 0); d->_chain = new KComboBox(this); layout->addMultiCellWidget(d->_chain, 1, 1, 0, 1); - connect(d->_chain, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotChain(int))); + connect(d->_chain, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotChain(int))); d->_chain->clear(); @@ -444,7 +444,7 @@ void KSSLCertBox::setValues(TQString certName, TQWidget *mailCatcher) { label->setAlignment(TQt::AlignLeft | TQt::AlignTop); if (mailCatcher) { KURLLabel *mail = new KURLLabel(tmp, tmp, _frame); - connect(mail, TQT_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQT_SLOT(mailClicked(const TQString &))); + connect(mail, TQ_SIGNAL(leftClickedURL(const TQString &)), mailCatcher, TQ_SLOT(mailClicked(const TQString &))); } else { label = new TQLabel(tmp, _frame); label->setTextFormat(TQt::PlainText); diff --git a/tdeio/kssl/ksslkeygen.cpp b/tdeio/kssl/ksslkeygen.cpp index 86fe4717d..aad837d7d 100644 --- a/tdeio/kssl/ksslkeygen.cpp +++ b/tdeio/kssl/ksslkeygen.cpp @@ -51,9 +51,9 @@ KSSLKeyGen::KSSLKeyGen(TQWidget *parent, const char *name, bool modal) setHelpEnabled(page1, false); setHelpEnabled(page2, false); setFinishEnabled(page2, false); - connect(page2->_password1, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged())); - connect(page2->_password2, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPassChanged())); - connect(finishButton(), TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(page2->_password1, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged())); + connect(page2->_password2, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotPassChanged())); + connect(finishButton(), TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); #else // tell him he doesn't have SSL #endif diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp index e076a083e..9e3cafd19 100644 --- a/tdeio/misc/kpac/discovery.cpp +++ b/tdeio/misc/kpac/discovery.cpp @@ -53,12 +53,12 @@ namespace KPAC : Downloader( parent ), m_helper( new KProcIO ) { - connect( m_helper, TQT_SIGNAL( readReady( KProcIO* ) ), TQT_SLOT( helperOutput() ) ); - connect( m_helper, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( failed() ) ); + connect( m_helper, TQ_SIGNAL( readReady( KProcIO* ) ), TQ_SLOT( helperOutput() ) ); + connect( m_helper, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( failed() ) ); *m_helper << "kpac_dhcp_helper"; if ( !m_helper->start() ) - TQTimer::singleShot( 0, this, TQT_SLOT( failed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( failed() ) ); } bool Discovery::initHostName() diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp index 298d660dc..30857df0c 100644 --- a/tdeio/misc/kpac/downloader.cpp +++ b/tdeio/misc/kpac/downloader.cpp @@ -44,9 +44,9 @@ namespace KPAC m_scriptURL = url; TDEIO::TransferJob* job = TDEIO::get( url, false, false ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), TQT_SLOT( result( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), TQ_SLOT( result( TDEIO::Job* ) ) ); } void Downloader::failed() diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp index 695d06858..c1140af1b 100644 --- a/tdeio/misc/kpac/proxyscout.cpp +++ b/tdeio/misc/kpac/proxyscout.cpp @@ -105,8 +105,8 @@ namespace KPAC default: return false; } - connect( m_downloader, TQT_SIGNAL( result( bool ) ), - TQT_SLOT( downloadResult( bool ) ) ); + connect( m_downloader, TQ_SIGNAL( result( bool ) ), + TQ_SLOT( downloadResult( bool ) ) ); return true; } diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp index bf3099094..d1e8ae483 100644 --- a/tdeio/misc/tdesendbugmail/main.cpp +++ b/tdeio/misc/tdesendbugmail/main.cpp @@ -122,8 +122,8 @@ int main(int argc, char **argv) { SMTP *sm = new SMTP; BugMailer bm(sm); - TQObject::connect(sm, TQT_SIGNAL(messageSent()), &bm, TQT_SLOT(slotSend())); - TQObject::connect(sm, TQT_SIGNAL(error(int)), &bm, TQT_SLOT(slotError(int))); + TQObject::connect(sm, TQ_SIGNAL(messageSent()), &bm, TQ_SLOT(slotSend())); + TQObject::connect(sm, TQ_SIGNAL(error(int)), &bm, TQ_SLOT(slotError(int))); sm->setServerHost(server); sm->setPort(25); sm->setSenderAddress(fromaddr); diff --git a/tdeio/misc/tdesendbugmail/smtp.cpp b/tdeio/misc/tdesendbugmail/smtp.cpp index 470f24050..ae507e76a 100644 --- a/tdeio/misc/tdesendbugmail/smtp.cpp +++ b/tdeio/misc/tdesendbugmail/smtp.cpp @@ -38,12 +38,12 @@ SMTP::SMTP(char *serverhost, unsigned short int port, int timeout) kdDebug() << "SMTP object created" << endl; - connect(&connectTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimerTick())); - connect(&timeOutTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(connectTimedOut())); - connect(&interactTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(interactTimedOut())); + connect(&connectTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimerTick())); + connect(&timeOutTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(connectTimedOut())); + connect(&interactTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(interactTimedOut())); // some sendmail will give 'duplicate helo' error, quick fix for now - connect(this, TQT_SIGNAL(messageSent()), TQT_SLOT(closeConnection())); + connect(this, TQ_SIGNAL(messageSent()), TQ_SLOT(closeConnection())); } SMTP::~SMTP() @@ -175,8 +175,8 @@ void SMTP::connectTimerTick(void) state = INIT; serverState = NONE; - connect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); - connect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); + connect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *))); + connect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *))); // sock->enableRead(true); timeOutTimer.stop(); kdDebug() << "connected" << endl; @@ -233,8 +233,8 @@ void SMTP::socketRead(TDESocket *socket) void SMTP::socketClose(TDESocket *socket) { timeOutTimer.stop(); - disconnect(sock, TQT_SIGNAL(readEvent(TDESocket *)), this, TQT_SLOT(socketRead(TDESocket *))); - disconnect(sock, TQT_SIGNAL(closeEvent(TDESocket *)), this, TQT_SLOT(socketClose(TDESocket *))); + disconnect(sock, TQ_SIGNAL(readEvent(TDESocket *)), this, TQ_SLOT(socketRead(TDESocket *))); + disconnect(sock, TQ_SIGNAL(closeEvent(TDESocket *)), this, TQ_SLOT(socketClose(TDESocket *))); socket->enableRead(false); kdDebug() << "connection terminated" << endl; connected = false; diff --git a/tdeio/misc/tdewalletd/ktimeout.cpp b/tdeio/misc/tdewalletd/ktimeout.cpp index c431ecf69..25108bdc5 100644 --- a/tdeio/misc/tdewalletd/ktimeout.cpp +++ b/tdeio/misc/tdewalletd/ktimeout.cpp @@ -52,7 +52,7 @@ void KTimeout::addTimer(int id, int timeout) { } TQTimer *t = new TQTimer; - connect(t, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeout())); + connect(t, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeout())); t->start(timeout); _timers.insert(id, t); } diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp index 0aaec0f9a..5b7840fd0 100644 --- a/tdeio/misc/tdewalletd/tdewalletd.cpp +++ b/tdeio/misc/tdewalletd/tdewalletd.cpp @@ -92,17 +92,17 @@ TDEWalletD::TDEWalletD(const TQCString &name) _timeouts = new KTimeout(17); _closeIdle = false; _idleTime = 0; - connect(_timeouts, TQT_SIGNAL(timedOut(int)), this, TQT_SLOT(timedOut(int))); + connect(_timeouts, TQ_SIGNAL(timedOut(int)), this, TQ_SLOT(timedOut(int))); reconfigure(); TDEGlobal::dirs()->addResourceType("tdewallet", "share/apps/tdewallet"); connect(TDEApplication::dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SIGNAL(applicationRemoved(const TQCString&)), this, - TQT_SLOT(slotAppUnregistered(const TQCString&))); + TQ_SLOT(slotAppUnregistered(const TQCString&))); _dw = new KDirWatch(this, "TDEWallet Directory Watcher"); _dw->addDir(TDEGlobal::dirs()->saveLocation("tdewallet")); _dw->startScan(true); - connect(_dw, TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(emitWalletListDirty())); + connect(_dw, TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(emitWalletListDirty())); } @@ -229,7 +229,7 @@ void TDEWalletD::openAsynchronous(const TQString& wallet, const TQCString& retur DCOPRef(appid, returnObject).send("walletOpenResult", 0); - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); } @@ -266,7 +266,7 @@ int TDEWalletD::open(const TQString& wallet, uint wId) { xact->wId = wId; xact->tType = TDEWalletTransaction::Open; xact->modal = true; // mark dialogs as modal, the app has blocking wait - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); return 0; // process later } @@ -386,7 +386,7 @@ int TDEWalletD::tryOpen(const TQString& wallet, const TQCString& password) _tryOpenBlocked.start (30 * 1000, true /*single shot*/); if (++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } rc = -1; @@ -627,7 +627,7 @@ void TDEWalletD::changePassword(const TQString& wallet, uint wId) { _transactions.append(xact); - TQTimer::singleShot(0, this, TQT_SLOT(processTransactions())); + TQTimer::singleShot(0, this, TQ_SLOT(processTransactions())); checkActiveDialog(); } @@ -801,7 +801,7 @@ bool TDEWalletD::isOpen(int handle) { if (rc == 0 && ++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } else if (rc != 0) { _failed = 0; } @@ -1229,7 +1229,7 @@ TDEWallet::Backend *TDEWalletD::getWallet(const TQCString& appid, int handle) { if (++_failed > 5) { _failed = 0; - TQTimer::singleShot(0, this, TQT_SLOT(notifyFailures())); + TQTimer::singleShot(0, this, TQ_SLOT(notifyFailures())); } return 0L; diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp index a6ed43f03..e8309ea4c 100644 --- a/tdeio/misc/uiserver.cpp +++ b/tdeio/misc/uiserver.cpp @@ -94,11 +94,11 @@ class UIServerSystemTray:public KSystemTray :KSystemTray(uis) { TDEPopupMenu* pop= contextMenu(); - pop->insertItem(i18n("Settings..."), uis, TQT_SLOT(slotConfigure())); - pop->insertItem(i18n("Remove"), uis, TQT_SLOT(slotRemoveSystemTrayIcon())); + pop->insertItem(i18n("Settings..."), uis, TQ_SLOT(slotConfigure())); + pop->insertItem(i18n("Remove"), uis, TQ_SLOT(slotRemoveSystemTrayIcon())); setPixmap(loadIcon("document-save")); //actionCollection()->action("file_quit")->setEnabled(true); - KStdAction::quit(uis, TQT_SLOT(slotQuit()), actionCollection()); + KStdAction::quit(uis, TQ_SLOT(slotQuit()), actionCollection()); } }; @@ -193,8 +193,8 @@ ProgressItem::ProgressItem( ListProgress* view, TQListViewItem *after, TQCString // create dialog, but don't show it defaultProgress = new TDEIO::DefaultProgress( false ); defaultProgress->setOnlyClean( true ); - connect ( defaultProgress, TQT_SIGNAL( stopped() ), this, TQT_SLOT( slotCanceled() ) ); - connect ( &m_showTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT(slotShowDefaultProgress()) ); + connect ( defaultProgress, TQ_SIGNAL( stopped() ), this, TQ_SLOT( slotCanceled() ) ); + connect ( &m_showTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT(slotShowDefaultProgress()) ); if ( showDefault ) { m_showTimer.start( 500, true ); @@ -478,7 +478,7 @@ ListProgress::ListProgress (TQWidget *parent, const char *name) //used for squeezing the text in local file name and url m_squeezer=new KSqueezedTextLabel(this); m_squeezer->hide(); - connect(header(),TQT_SIGNAL(sizeChange(int,int,int)),this,TQT_SLOT(columnWidthChanged(int))); + connect(header(),TQ_SIGNAL(sizeChange(int,int,int)),this,TQ_SLOT(columnWidthChanged(int))); } @@ -595,11 +595,11 @@ UIServer::UIServer() // setup toolbar toolBar()->insertButton("edit-delete", TOOL_CANCEL, - TQT_SIGNAL(clicked()), this, - TQT_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotCancelCurrent()), FALSE, i18n("Cancel")); toolBar()->insertButton("configure", TOOL_CONFIGURE, - TQT_SIGNAL(clicked()), this, - TQT_SLOT(slotConfigure()), true, i18n("Settings...")); + TQ_SIGNAL(clicked()), this, + TQ_SLOT(slotConfigure()), true, i18n("Settings...")); toolBar()->setBarPos( TDEToolBar::Left ); @@ -614,18 +614,18 @@ UIServer::UIServer() setCentralWidget( listProgress ); - connect( listProgress, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelection() ) ); - connect( listProgress, TQT_SIGNAL( executed( TQListViewItem* ) ), - TQT_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) ); - connect( listProgress, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)), - TQT_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); + connect( listProgress, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelection() ) ); + connect( listProgress, TQ_SIGNAL( executed( TQListViewItem* ) ), + TQ_SLOT( slotToggleDefaultProgress( TQListViewItem* ) ) ); + connect( listProgress, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &)), + TQ_SLOT(slotShowContextMenu(TDEListView*, TQListViewItem *, const TQPoint&))); // setup animation timer updateTimer = new TQTimer( this ); - connect( updateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotUpdate() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotUpdate() ) ); m_bUpdateNewJob=false; setCaption(i18n("Progress Dialog")); @@ -675,10 +675,10 @@ void UIServer::slotShowContextMenu(TDEListView*, TQListViewItem* item, const TQP if (m_contextMenu==0) { m_contextMenu=new TQPopupMenu(this); - m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQT_SLOT(slotCancelCurrent())); -// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQT_SLOT(slotToggleDefaultProgress())); + m_idCancelItem = m_contextMenu->insertItem(i18n("Cancel Job"), this, TQ_SLOT(slotCancelCurrent())); +// m_contextMenu->insertItem(i18n("Toggle Progress"), this, TQ_SLOT(slotToggleDefaultProgress())); m_contextMenu->insertSeparator(); - m_contextMenu->insertItem(i18n("Settings..."), this, TQT_SLOT(slotConfigure())); + m_contextMenu->insertItem(i18n("Settings..."), this, TQ_SLOT(slotConfigure())); } if ( item ) item->setSelected( true ); @@ -707,9 +707,9 @@ void UIServer::slotConfigure() if (m_configDialog==0) { m_configDialog=new ProgressConfigDialog(0); -// connect(m_configDialog,TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotCancelConfig())); - connect(m_configDialog,TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotApplyConfig())); - connect(m_configDialog,TQT_SIGNAL(applyClicked()), this, TQT_SLOT(slotApplyConfig())); +// connect(m_configDialog,TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotCancelConfig())); + connect(m_configDialog,TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotApplyConfig())); + connect(m_configDialog,TQ_SIGNAL(applyClicked()), this, TQ_SLOT(slotApplyConfig())); } m_configDialog->m_showSystemTrayCb->setChecked(m_showSystemTray); m_configDialog->m_keepOpenCb->setChecked(m_keepListOpen); @@ -760,8 +760,8 @@ int UIServer::newJob( TQCString observerAppId, bool showProgress ) bool show = !m_bShowList && showProgress; ProgressItem *item = new ProgressItem( listProgress, it.current(), observerAppId, s_jobId, show ); - connect( item, TQT_SIGNAL( jobCanceled( ProgressItem* ) ), - TQT_SLOT( slotJobCanceled( ProgressItem* ) ) ); + connect( item, TQ_SIGNAL( jobCanceled( ProgressItem* ) ), + TQ_SLOT( slotJobCanceled( ProgressItem* ) ) ); if ( m_bShowList && !updateTimer->isActive() ) updateTimer->start( 1000 ); diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp index 0bf668a97..dec306643 100644 --- a/tdeio/tdefile/kacleditwidget.cpp +++ b/tdeio/tdefile/kacleditwidget.cpp @@ -74,16 +74,16 @@ KACLEditWidget::KACLEditWidget( TQWidget *parent, const char *name ) TQHBox *hbox = new TQHBox( parent ); hbox->setSpacing( KDialog::spacingHint() ); m_listView = new KACLListView( hbox, "acl_listview" ); - connect( m_listView, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotUpdateButtons() ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotUpdateButtons() ) ); TQVBox *vbox = new TQVBox( hbox ); vbox->setSpacing( KDialog::spacingHint() ); m_AddBtn = new TQPushButton( i18n( "Add Entry..." ), vbox, "add_entry_button" ); - connect( m_AddBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotAddEntry() ) ); + connect( m_AddBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotAddEntry() ) ); m_EditBtn = new TQPushButton( i18n( "Edit Entry..." ), vbox, "edit_entry_button" ); - connect( m_EditBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotEditEntry() ) ); + connect( m_EditBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotEditEntry() ) ); m_DelBtn = new TQPushButton( i18n( "Delete Entry" ), vbox, "delete_entry_button" ); - connect( m_DelBtn, TQT_SIGNAL( clicked() ), m_listView, TQT_SLOT( slotRemoveEntry() ) ); + connect( m_DelBtn, TQ_SIGNAL( clicked() ), m_listView, TQ_SLOT( slotRemoveEntry() ) ); TQWidget *spacer = new TQWidget( vbox ); spacer->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ); slotUpdateButtons(); @@ -409,10 +409,10 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem if ( allowDefaults ) { m_defaultCB = new TQCheckBox( i18n("Default for new files in this folder"), page, "defaultCB" ); mainLayout->addWidget( m_defaultCB ); - connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateAllowedUsersAndGroups() ) ); - connect( m_defaultCB, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotUpdateAllowedTypes() ) ); + connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateAllowedUsersAndGroups() ) ); + connect( m_defaultCB, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotUpdateAllowedTypes() ) ); } @@ -431,8 +431,8 @@ EditACLEntryDialog::EditACLEntryDialog( KACLListView *listView, KACLListViewItem TQRadioButton *namedGroupType = new TQRadioButton( i18n("Named Group"), m_buttonGroup, "namedGroupType" ); m_buttonGroup->insert( namedGroupType, KACLListView::NamedGroup ); - connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotSelectionChanged( int ) ) ); + connect( m_buttonGroup, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotSelectionChanged( int ) ) ); m_widgetStack = new TQWidgetStack( page ); mainLayout->addWidget( m_widgetStack ); diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp index 23c78b53d..da685daa9 100644 --- a/tdeio/tdefile/kcombiview.cpp +++ b/tdeio/tdefile/kcombiview.cpp @@ -56,8 +56,8 @@ KCombiView::KCombiView( TQWidget *parent, const char *name) left->setAcceptDrops(false); left->installEventFilter( this ); - connect( sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - TQT_SLOT( slotSortingChanged( TQDir::SortSpec ) )); + connect( sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + TQ_SLOT( slotSortingChanged( TQDir::SortSpec ) )); } KCombiView::~KCombiView() diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp index 802acf739..fd6eca83d 100644 --- a/tdeio/tdefile/kcustommenueditor.cpp +++ b/tdeio/tdefile/kcustommenueditor.cpp @@ -95,12 +95,12 @@ KCustomMenuEditor::KCustomMenuEditor(TQWidget *parent) m_listView->setFullWidth(true); m_listView->setSorting(-1); KButtonBox *buttonBox = new KButtonBox(page, TQt::Vertical); - buttonBox->addButton(i18n("New..."), this, TQT_SLOT(slotNewItem())); - d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQT_SLOT(slotRemoveItem())); - d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQT_SLOT(slotMoveUp())); - d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQT_SLOT(slotMoveDown())); + buttonBox->addButton(i18n("New..."), this, TQ_SLOT(slotNewItem())); + d->pbRemove=buttonBox->addButton(i18n("Remove"), this, TQ_SLOT(slotRemoveItem())); + d->pbMoveUp=buttonBox->addButton(i18n("Move Up"), this, TQ_SLOT(slotMoveUp())); + d->pbMoveDown=buttonBox->addButton(i18n("Move Down"), this, TQ_SLOT(slotMoveDown())); buttonBox->layout(); - connect( m_listView, TQT_SIGNAL( selectionChanged () ), this, TQT_SLOT( refreshButton() ) ); + connect( m_listView, TQ_SIGNAL( selectionChanged () ), this, TQ_SLOT( refreshButton() ) ); refreshButton(); } diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp index cae383742..ab8e64d92 100644 --- a/tdeio/tdefile/kdirselectdialog.cpp +++ b/tdeio/tdefile/kdirselectdialog.cpp @@ -99,8 +99,8 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, TQHBoxLayout *hlay = new TQHBoxLayout( page, 0, spacingHint() ); m_mainLayout = new TQVBoxLayout(); d->speedBar = new KFileSpeedBar( page, "speedbar" ); - connect( d->speedBar, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( setCurrentURL( const KURL& )) ); + connect( d->speedBar, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( setCurrentURL( const KURL& )) ); hlay->addWidget( d->speedBar, 0 ); hlay->addLayout( m_mainLayout, 1 ); @@ -118,15 +118,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, d->urlCombo->setCompletionObject( comp, true ); d->urlCombo->setAutoDeleteCompletionObject( true ); d->urlCombo->setDuplicatesEnabled( false ); - connect( d->urlCombo, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotComboTextChanged( const TQString& ) )); + connect( d->urlCombo, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotComboTextChanged( const TQString& ) )); m_contextMenu = new TQPopupMenu( this ); - TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQT_SLOT( slotMkdir() ), this); + TDEAction* newFolder = new TDEAction( i18n("New Folder..."), "folder-new", 0, this, TQ_SLOT( slotMkdir() ), this); newFolder->plug(m_contextMenu); m_contextMenu->insertSeparator(); m_showHiddenFolders = new TDEToggleAction ( i18n( "Show Hidden Folders" ), 0, this, - TQT_SLOT( slotShowHiddenFoldersToggled() ), this); + TQ_SLOT( slotShowHiddenFoldersToggled() ), this); m_showHiddenFolders->plug(m_contextMenu); d->startURL = KFileDialog::getStartURL( startDir, d->recentDirClass ); @@ -151,15 +151,15 @@ KDirSelectDialog::KDirSelectDialog(const TQString &startDir, bool localOnly, m_mainLayout->addWidget( m_treeView, 1 ); m_mainLayout->addWidget( d->urlCombo, 0 ); - connect( m_treeView, TQT_SIGNAL( currentChanged( TQListViewItem * )), - TQT_SLOT( slotCurrentChanged() )); - connect( m_treeView, TQT_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )), - TQT_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ))); + connect( m_treeView, TQ_SIGNAL( currentChanged( TQListViewItem * )), + TQ_SLOT( slotCurrentChanged() )); + connect( m_treeView, TQ_SIGNAL( contextMenu( TDEListView *, TQListViewItem *, const TQPoint & )), + TQ_SLOT( slotContextMenu( TDEListView *, TQListViewItem *, const TQPoint & ))); - connect( d->urlCombo, TQT_SIGNAL( activated( const TQString& )), - TQT_SLOT( slotURLActivated( const TQString& ))); - connect( d->urlCombo, TQT_SIGNAL( returnPressed( const TQString& )), - TQT_SLOT( slotURLActivated( const TQString& ))); + connect( d->urlCombo, TQ_SIGNAL( activated( const TQString& )), + TQ_SLOT( slotURLActivated( const TQString& ))); + connect( d->urlCombo, TQ_SIGNAL( returnPressed( const TQString& )), + TQ_SLOT( slotURLActivated( const TQString& ))); setCurrentURL( d->startURL ); } @@ -194,10 +194,10 @@ void KDirSelectDialog::setCurrentURL( const KURL& url ) d->branch = createBranch( root ); } - d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *))); - connect( d->branch, TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - TQT_SLOT( slotNextDirToList( KFileTreeViewItem * ) )); + d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *))); + connect( d->branch, TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + TQ_SLOT( slotNextDirToList( KFileTreeViewItem * ) )); KURL dirToList = root; d->dirsToList.clear(); @@ -260,8 +260,8 @@ void KDirSelectDialog::slotNextDirToList( KFileTreeViewItem *item ) openNextDir( item ); else { - d->branch->disconnect( TQT_SIGNAL( populateFinished( KFileTreeViewItem * )), - this, TQT_SLOT( slotNextDirToList( KFileTreeViewItem *))); + d->branch->disconnect( TQ_SIGNAL( populateFinished( KFileTreeViewItem * )), + this, TQ_SLOT( slotNextDirToList( KFileTreeViewItem *))); view()->setCurrentItem( item ); item->setSelected( true ); } diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp index b2d48b4bf..40d0b5d13 100644 --- a/tdeio/tdefile/kdirsize.cpp +++ b/tdeio/tdefile/kdirsize.cpp @@ -35,7 +35,7 @@ KDirSize::KDirSize( const KURL & directory ) KDirSize::KDirSize( const KFileItemList & lstItems ) : TDEIO::Job(false /*No GUI*/), m_bAsync(true), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems) { - TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(processList()) ); } void KDirSize::processList() @@ -70,9 +70,9 @@ void KDirSize::processList() void KDirSize::startNextJob( const KURL & url ) { TDEIO::ListJob * listJob = TDEIO::listRecursive( url, false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( listJob ); } diff --git a/tdeio/tdefile/kdiskfreesp.cpp b/tdeio/tdefile/kdiskfreesp.cpp index 1552e01d2..e29060312 100644 --- a/tdeio/tdefile/kdiskfreesp.cpp +++ b/tdeio/tdefile/kdiskfreesp.cpp @@ -48,10 +48,10 @@ KDiskFreeSp::KDiskFreeSp(TQObject *parent, const char *name) { dfProc = new TDEProcess(); TQ_CHECK_PTR(dfProc); dfProc->setEnvironment("LANGUAGE", "C"); - connect( dfProc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), - this, TQT_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); - connect(dfProc,TQT_SIGNAL(processExited(TDEProcess *) ), - this, TQT_SLOT(dfDone() ) ); + connect( dfProc, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int) ), + this, TQ_SLOT (receivedDFStdErrOut(TDEProcess *, char *, int)) ); + connect(dfProc,TQ_SIGNAL(processExited(TDEProcess *) ), + this, TQ_SLOT(dfDone() ) ); readingDFStdErrOut=false; } diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp index 60372f12c..654c32396 100644 --- a/tdeio/tdefile/kicondialog.cpp +++ b/tdeio/tdefile/kicondialog.cpp @@ -93,9 +93,9 @@ TDEIconCanvas::TDEIconCanvas(TQWidget *parent, const char *name) { d = new TDEIconCanvasPrivate; mpTimer = new TQTimer(this); - connect(mpTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotLoadFiles())); - connect(this, TQT_SIGNAL(currentChanged(TQIconViewItem *)), - TQT_SLOT(slotCurrentChanged(TQIconViewItem *))); + connect(mpTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotLoadFiles())); + connect(this, TQ_SIGNAL(currentChanged(TQIconViewItem *)), + TQ_SLOT(slotCurrentChanged(TQIconViewItem *))); setGridX(80); setWordWrapIconText(false); setShowToolTips(true); @@ -271,12 +271,12 @@ void TDEIconDialog::init() bgroup->layout()->setSpacing(KDialog::spacingHint()); bgroup->layout()->setMargin(KDialog::marginHint()); top->addWidget(bgroup); - connect(bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotButtonClicked(int))); + connect(bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotButtonClicked(int))); TQGridLayout *grid = new TQGridLayout(bgroup->layout(), 3, 2); mpRb1 = new TQRadioButton(i18n("S&ystem icons:"), bgroup); grid->addWidget(mpRb1, 1, 0); mpCombo = new TQComboBox(bgroup); - connect(mpCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotContext(int))); + connect(mpCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotContext(int))); grid->addWidget(mpCombo, 1, 1); mpRb2 = new TQRadioButton(i18n("O&ther icons:"), bgroup); grid->addWidget(mpRb2, 2, 0); @@ -303,7 +303,7 @@ void TDEIconDialog::init() // signals and slots connections - connect(clearSearch, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(clicked()), d->searchLine, TQ_SLOT(clear())); TQString wtstr = i18n("Search interactively for icon names (e.g. folder)."); TQWhatsThis::add(searchLabel, wtstr); @@ -311,20 +311,20 @@ void TDEIconDialog::init() mpCanvas = new TDEIconCanvas(main); - connect(mpCanvas, TQT_SIGNAL(executed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons())); - connect(mpCanvas, TQT_SIGNAL(returnPressed(TQIconViewItem *)), TQT_SLOT(slotAcceptIcons())); + connect(mpCanvas, TQ_SIGNAL(executed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons())); + connect(mpCanvas, TQ_SIGNAL(returnPressed(TQIconViewItem *)), TQ_SLOT(slotAcceptIcons())); mpCanvas->setMinimumSize(400, 125); top->addWidget(mpCanvas); d->searchLine->setIconView(mpCanvas); mpProgress = new KProgress(main); top->addWidget(mpProgress); - connect(mpCanvas, TQT_SIGNAL(startLoading(int)), TQT_SLOT(slotStartLoading(int))); - connect(mpCanvas, TQT_SIGNAL(progress(int)), TQT_SLOT(slotProgress(int))); - connect(mpCanvas, TQT_SIGNAL(finished()), TQT_SLOT(slotFinished())); + connect(mpCanvas, TQ_SIGNAL(startLoading(int)), TQ_SLOT(slotStartLoading(int))); + connect(mpCanvas, TQ_SIGNAL(progress(int)), TQ_SLOT(slotProgress(int))); + connect(mpCanvas, TQ_SIGNAL(finished()), TQ_SLOT(slotFinished())); // When pressing Ok or Cancel, stop loading icons - connect(this, TQT_SIGNAL(hidden()), mpCanvas, TQT_SLOT(stopLoading())); + connect(this, TQ_SIGNAL(hidden()), mpCanvas, TQ_SLOT(stopLoading())); static const char* const context_text[] = { I18N_NOOP( "Actions" ), @@ -679,7 +679,7 @@ void TDEIconButton::init( TDEIconLoader *loader ) mpLoader = loader; mpDialog = 0L; - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(slotChangeIcon())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(slotChangeIcon())); } TDEIconButton::~TDEIconButton() @@ -723,7 +723,7 @@ void TDEIconButton::setIcon(const TQString& icon) if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } if ( mbUser ) @@ -741,7 +741,7 @@ void TDEIconButton::slotChangeIcon() if (!mpDialog) { mpDialog = new TDEIconDialog(mpLoader, this); - connect(mpDialog, TQT_SIGNAL(newIconName(const TQString&)), TQT_SLOT(newIconName(const TQString&))); + connect(mpDialog, TQ_SIGNAL(newIconName(const TQString&)), TQ_SLOT(newIconName(const TQString&))); } mpDialog->setup( mGroup, mContext, d->m_bStrictIconSize, d->iconSize, mbUser ); diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp index a1aa22454..140b2fded 100644 --- a/tdeio/tdefile/kimagefilepreview.cpp +++ b/tdeio/tdefile/kimagefilepreview.cpp @@ -53,14 +53,14 @@ KImageFilePreview::KImageFilePreview( TQWidget *parent ) autoPreview = new TQCheckBox( i18n("&Automatic preview"), this ); autoPreview->setChecked( autoMode ); hb->addWidget( autoPreview ); - connect( autoPreview, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) ); + connect( autoPreview, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) ); previewButton = new KPushButton( SmallIconSet("thumbnail"), i18n("&Preview"), this ); hb->addWidget( previewButton ); - connect( previewButton, TQT_SIGNAL(clicked()), TQT_SLOT(showPreview()) ); + connect( previewButton, TQ_SIGNAL(clicked()), TQ_SLOT(showPreview()) ); timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(showPreview()) ); + connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(showPreview()) ); setSupportedMimeTypes( TDEIO::PreviewJob::supportedMimeTypes() ); } @@ -109,14 +109,14 @@ void KImageFilePreview::showPreview( const KURL &url, bool force ) if ( force ) // explicitly requested previews shall always be generated! m_job->setIgnoreMaximumSize( true ); - connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slotResult( TDEIO::Job * ))); - connect( m_job, TQT_SIGNAL( gotPreview( const KFileItem*, + connect( m_job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slotResult( TDEIO::Job * ))); + connect( m_job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); + TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); - connect( m_job, TQT_SIGNAL( failed( const KFileItem* )), - this, TQT_SLOT( slotFailed( const KFileItem* ) )); + connect( m_job, TQ_SIGNAL( failed( const KFileItem* )), + this, TQ_SLOT( slotFailed( const KFileItem* ) )); } } } diff --git a/tdeio/tdefile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp index e511d5b61..88dff7415 100644 --- a/tdeio/tdefile/kmetaprops.cpp +++ b/tdeio/tdefile/kmetaprops.cpp @@ -184,7 +184,7 @@ void KFileMetaPropsPlugin::createLayout() if (!val) kdDebug(7033) << "didn't get a validator for " << *git << "/" << (*iit).key() << endl; w = new KFileMetaInfoWidget(*iit, val, groupBox); d->m_editWidgets.append( w ); - connect(w, TQT_SIGNAL(valueChanged(const TQVariant&)), this, TQT_SIGNAL(changed())); + connect(w, TQ_SIGNAL(valueChanged(const TQVariant&)), this, TQ_SIGNAL(changed())); } // and then the read only items @@ -203,7 +203,7 @@ void KFileMetaPropsPlugin::createLayout() /* d->m_add = new TQPushButton(i18n("&Add"), topframe); d->m_add->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); - connect(d->m_add, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAdd())); + connect(d->m_add, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAdd())); tmp->addWidget(d->m_add); // if nothing can be added, deactivate it diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp index 330a19b30..b4f4d9c7d 100644 --- a/tdeio/tdefile/knotifydialog.cpp +++ b/tdeio/tdefile/knotifydialog.cpp @@ -170,8 +170,8 @@ KNotifyDialog::KNotifyDialog( TQWidget *parent, const char *name, bool modal, if ( aboutData ) addApplicationEvents( aboutData->appName() ); - connect( this, TQT_SIGNAL( okClicked() ), m_notifyWidget, TQT_SLOT( save() )); - connect( this, TQT_SIGNAL( applyClicked() ), m_notifyWidget, TQT_SLOT( save() )); + connect( this, TQ_SIGNAL( okClicked() ), m_notifyWidget, TQ_SLOT( save() )); + connect( this, TQ_SIGNAL( applyClicked() ), m_notifyWidget, TQ_SLOT( save() )); } KNotifyDialog::~KNotifyDialog() @@ -264,47 +264,47 @@ KNotifyWidget::KNotifyWidget( TQWidget *parent, const char *name, d->toolTip = new KNotifyToolTip( header ); m_playButton->setIconSet( SmallIconSet( "media-playback-start" ) ); - connect( m_playButton, TQT_SIGNAL( clicked() ), TQT_SLOT( playSound() )); - - connect( m_listview, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - TQT_SLOT( slotEventChanged( TQListViewItem * ) )); - connect( m_listview, TQT_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int ))); - - connect( m_playSound, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( soundToggled( bool )) ); - connect( m_logToFile, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( loggingToggled( bool )) ); - connect( m_execute, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( executeToggled( bool )) ); - connect( m_messageBox, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( messageBoxChanged() ) ); - connect( m_passivePopup, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( messageBoxChanged() ) ); - connect( m_stderr, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( stderrToggled( bool ) ) ); - connect( m_taskbar, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( taskbarToggled( bool ) ) ); - - connect( m_soundPath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( soundFileChanged( const TQString& ))); - connect( m_logfilePath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( logfileChanged( const TQString& ) )); - connect( m_executePath, TQT_SIGNAL( textChanged( const TQString& )), - TQT_SLOT( commandlineChanged( const TQString& ) )); - - connect( m_soundPath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openSoundDialog( KURLRequester * ))); - connect( m_logfilePath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openLogDialog( KURLRequester * ))); - connect( m_executePath, TQT_SIGNAL( openFileDialog( KURLRequester * )), - TQT_SLOT( openExecDialog( KURLRequester * ))); - - connect( m_extension, TQT_SIGNAL( clicked() ), - TQT_SLOT( toggleAdvanced()) ); - - connect( m_buttonEnable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() )); - connect( m_buttonDisable, TQT_SIGNAL( clicked() ), TQT_SLOT( enableAll() )); + connect( m_playButton, TQ_SIGNAL( clicked() ), TQ_SLOT( playSound() )); + + connect( m_listview, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + TQ_SLOT( slotEventChanged( TQListViewItem * ) )); + connect( m_listview, TQ_SIGNAL(clicked( TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( slotItemClicked( TQListViewItem *, const TQPoint&, int ))); + + connect( m_playSound, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( soundToggled( bool )) ); + connect( m_logToFile, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( loggingToggled( bool )) ); + connect( m_execute, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( executeToggled( bool )) ); + connect( m_messageBox, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( messageBoxChanged() ) ); + connect( m_passivePopup, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( messageBoxChanged() ) ); + connect( m_stderr, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( stderrToggled( bool ) ) ); + connect( m_taskbar, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( taskbarToggled( bool ) ) ); + + connect( m_soundPath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( soundFileChanged( const TQString& ))); + connect( m_logfilePath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( logfileChanged( const TQString& ) )); + connect( m_executePath, TQ_SIGNAL( textChanged( const TQString& )), + TQ_SLOT( commandlineChanged( const TQString& ) )); + + connect( m_soundPath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openSoundDialog( KURLRequester * ))); + connect( m_logfilePath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openLogDialog( KURLRequester * ))); + connect( m_executePath, TQ_SIGNAL( openFileDialog( KURLRequester * )), + TQ_SLOT( openExecDialog( KURLRequester * ))); + + connect( m_extension, TQ_SIGNAL( clicked() ), + TQ_SLOT( toggleAdvanced()) ); + + connect( m_buttonEnable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() )); + connect( m_buttonDisable, TQ_SIGNAL( clicked() ), TQ_SLOT( enableAll() )); TQString whatsThis = i18n("You may use the following macros
    " "in the commandline:
    " @@ -851,8 +851,8 @@ Event * KNotifyWidget::currentEvent() void KNotifyWidget::openSoundDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openSoundDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openSoundDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); fileDialog->setCaption( i18n("Select Sound File") ); @@ -887,8 +887,8 @@ void KNotifyWidget::openSoundDialog( KURLRequester *requester ) void KNotifyWidget::openLogDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openLogDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openLogDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); fileDialog->setCaption( i18n("Select Log File") ); @@ -900,8 +900,8 @@ void KNotifyWidget::openLogDialog( KURLRequester *requester ) void KNotifyWidget::openExecDialog( KURLRequester *requester ) { // only need to init this once - requester->disconnect( TQT_SIGNAL( openFileDialog( KURLRequester * )), - this, TQT_SLOT( openExecDialog( KURLRequester * ))); + requester->disconnect( TQ_SIGNAL( openFileDialog( KURLRequester * )), + this, TQ_SLOT( openExecDialog( KURLRequester * ))); KFileDialog *fileDialog = requester->fileDialog(); diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp index 8124db5e5..527f53b51 100644 --- a/tdeio/tdefile/kopenwith.cpp +++ b/tdeio/tdefile/kopenwith.cpp @@ -157,10 +157,10 @@ TDEApplicationTree::TDEApplicationTree( TQWidget *parent ) addDesktopGroup( TQString::null ); cleanupTree(); - connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), - TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) ); - connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), - TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( currentChanged(TQListViewItem*) ), + TQ_SLOT( slotItemHighlighted(TQListViewItem*) ) ); + connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), + TQ_SLOT( slotSelectionChanged(TQListViewItem*) ) ); } // ---------------------------------------------------------------------- @@ -404,7 +404,7 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) TQToolButton *clearButton = new TQToolButton( this ); clearButton->setIconSet( BarIcon( "locationbar_erase" ) ); clearButton->setFixedSize( clearButton->sizeHint() ); - connect( clearButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotClear() ) ); + connect( clearButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotClear() ) ); TQToolTip::add( clearButton, i18n( "Clear input field" ) ); hbox->addWidget( clearButton ); @@ -455,23 +455,23 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) edit->comboBox()->setAutoDeleteCompletionObject( true ); } - connect ( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOK()) ); - connect ( edit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged()) ); + connect ( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOK()) ); + connect ( edit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged()) ); m_pTree = new TDEApplicationTree( this ); topLayout->addWidget(m_pTree); - connect( m_pTree, TQT_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) ); - connect( m_pTree, TQT_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ), - TQT_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) ); - connect( m_pTree, TQT_SIGNAL( doubleClicked(TQListViewItem*) ), - TQT_SLOT( slotDbClick() ) ); + connect( m_pTree, TQ_SIGNAL( selected( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotSelected( const TQString&, const TQString&, const TQString& ) ) ); + connect( m_pTree, TQ_SIGNAL( highlighted( const TQString&, const TQString&, const TQString& ) ), + TQ_SLOT( slotHighlighted( const TQString&, const TQString&, const TQString& ) ) ); + connect( m_pTree, TQ_SIGNAL( doubleClicked(TQListViewItem*) ), + TQ_SLOT( slotDbClick() ) ); terminal = new TQCheckBox( i18n("Run in &terminal"), this ); if (bReadOnly) terminal->hide(); - connect(terminal, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotTerminalToggled(bool))); + connect(terminal, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotTerminalToggled(bool))); topLayout->addWidget(terminal); @@ -509,10 +509,10 @@ void KOpenWithDlg::init( const TQString& _text, const TQString& _value ) d->ok = b->addButton( KStdGuiItem::ok() ); d->ok->setDefault( true ); - connect( d->ok, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOK() ) ); + connect( d->ok, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOK() ) ); TQPushButton* cancel = b->addButton( KStdGuiItem::cancel() ); - connect( cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( cancel, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) ); b->layout(); topLayout->addWidget( b ); diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp index 069746fac..d5288e822 100644 --- a/tdeio/tdefile/kpreviewprops.cpp +++ b/tdeio/tdefile/kpreviewprops.cpp @@ -54,7 +54,7 @@ void KPreviewPropsPlugin::createLayout() preview = new KFileMetaPreview(topframe); tmp->addWidget(preview) ; - connect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); + connect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), TQ_SLOT( aboutToShowPage( TQWidget* ) ) ); } KPreviewPropsPlugin::~KPreviewPropsPlugin() @@ -82,7 +82,7 @@ void KPreviewPropsPlugin::aboutToShowPage( TQWidget* widget ) if ( widget != preview->parent() ) return; - disconnect( properties, TQT_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQT_SLOT( aboutToShowPage( TQWidget* ) ) ); + disconnect( properties, TQ_SIGNAL( aboutToShowPage( TQWidget * ) ), this, TQ_SLOT( aboutToShowPage( TQWidget* ) ) ); preview->showPreview(properties->item()->url()); } diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp index c4be31d02..e226996e3 100644 --- a/tdeio/tdefile/kpropertiesdialog.cpp +++ b/tdeio/tdefile/kpropertiesdialog.cpp @@ -372,8 +372,8 @@ KPropertiesDialog::~KPropertiesDialog() void KPropertiesDialog::insertPlugin (KPropsDlgPlugin* plugin) { - connect (plugin, TQT_SIGNAL (changed ()), - plugin, TQT_SLOT (setDirty ())); + connect (plugin, TQ_SIGNAL (changed ()), + plugin, TQ_SLOT (setDirty ())); m_pageList.append (plugin); } @@ -890,8 +890,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) } iconButton->setIcon(iconStr); iconArea = iconButton; - connect( iconButton, TQT_SIGNAL( iconChanged(TQString) ), - this, TQT_SLOT( slotIconChanged() ) ); + connect( iconButton, TQ_SIGNAL( iconChanged(TQString) ), + this, TQ_SLOT( slotIconChanged() ) ); } else { TQLabel *iconLabel = new TQLabel( d->m_frame ); int bsize = 66 + 2 * iconLabel->style().pixelMetric(TQStyle::PM_ButtonMargin); @@ -935,8 +935,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) d->m_lined->setSelection(0, lastDot); } - connect( d->m_lined, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( nameFileChanged(const TQString & ) ) ); + connect( d->m_lined, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( nameFileChanged(const TQString & ) ) ); } grid->addWidget(nameArea, curRow++, 2); @@ -969,7 +969,7 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) else TQToolTip::add(button, i18n("Edit file type")); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( slotEditFileType() )); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( slotEditFileType() )); if (!kapp->authorizeTDEAction("editfiletype")) button->hide(); @@ -1024,8 +1024,8 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) // buttons m_sizeDetermineButton = new TQPushButton( i18n("Calculate"), d->m_frame ); m_sizeStopButton = new TQPushButton( i18n("Stop"), d->m_frame ); - connect( m_sizeDetermineButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeDetermine() ) ); - connect( m_sizeStopButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSizeStop() ) ); + connect( m_sizeDetermineButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeDetermine() ) ); + connect( m_sizeStopButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSizeStop() ) ); sizelay->addWidget(m_sizeDetermineButton, 0); sizelay->addWidget(m_sizeStopButton, 0); sizelay->addStretch(10); // so that the buttons don't grow horizontally @@ -1110,9 +1110,9 @@ KFilePropsPlugin::KFilePropsPlugin( KPropertiesDialog *_props ) grid->addWidget( d->m_freeSpaceLabel, curRow++, 2 ); KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountPoint ); } @@ -1274,11 +1274,11 @@ void KFilePropsPlugin::slotSizeDetermine() kdDebug(250) << " URL=" << properties->item()->url().url() << endl; d->dirSizeJob = KDirSize::dirSizeJob( properties->items() ); d->dirSizeUpdateTimer = new TQTimer(this); - connect( d->dirSizeUpdateTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotDirSizeUpdate() ) ); + connect( d->dirSizeUpdateTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotDirSizeUpdate() ) ); d->dirSizeUpdateTimer->start(500); - connect( d->dirSizeJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); + connect( d->dirSizeJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotDirSizeFinished( TDEIO::Job * ) ) ); m_sizeStopButton->setEnabled(true); m_sizeDetermineButton->setEnabled(false); @@ -1291,9 +1291,9 @@ void KFilePropsPlugin::slotSizeDetermine() TQString mountPoint = TDEIO::findPathMountPoint( url.path() ); KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountPoint ); } @@ -1379,10 +1379,10 @@ void KFilePropsPlugin::applyChanges() job = TDEIO::copy( oldurl, properties->kurl() ); } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), - TQT_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotCopyFinished( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( renamed( TDEIO::Job *, const KURL &, const KURL & ) ), + TQ_SLOT( slotFileRenamed( TDEIO::Job *, const KURL &, const KURL & ) ) ); // wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -1698,7 +1698,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->ownerPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 1, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that the owner is allowed to do.")); lbl = new TQLabel( i18n("Gro&up:"), gb); @@ -1706,7 +1706,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->groupPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 2, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that the members of the group are allowed to do.")); lbl = new TQLabel( i18n("O&thers:"), gb); @@ -1714,7 +1714,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr l = d->othersPermCombo = new TQComboBox(gb); lbl->setBuddy(l); gl->addWidget(l, 3, 1); - connect(l, TQT_SIGNAL( highlighted(int) ), this, TQT_SIGNAL( changed() )); + connect(l, TQ_SIGNAL( highlighted(int) ), this, TQ_SIGNAL( changed() )); TQWhatsThis::add(l, i18n("Specifies the actions that all users, who are neither " "owner nor in the group, are allowed to do.")); @@ -1723,7 +1723,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr i18n("Only own&er can rename and delete folder content") : i18n("Is &executable"), gb ); - connect( d->extraCheckbox, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) ); + connect( d->extraCheckbox, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) ); gl->addWidget(l, 4, 1); TQWhatsThis::add(l, hasDir ? i18n("Enable this option to allow only the folder's owner to " "delete or rename the contained files and folders. Other " @@ -1738,7 +1738,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr pbAdvancedPerm = new TQPushButton(i18n("A&dvanced Permissions"), gb); gl->addMultiCellWidget(pbAdvancedPerm, 6, 6, 0, 1, TQt::AlignRight); - connect(pbAdvancedPerm, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowAdvancedPermissions() )); + connect(pbAdvancedPerm, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowAdvancedPermissions() )); } else d->extraCheckbox = 0; @@ -1781,8 +1781,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr TDEGlobalSettings::CompletionNone); usrEdit->setText(strOwner); gl->addWidget(usrEdit, 1, 1); - connect( usrEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( usrEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); } else { @@ -1863,8 +1863,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr grpEdit->setCompletionMode(TDEGlobalSettings::CompletionAuto); grpEdit->setText(strGroup); gl->addWidget(grpEdit, 2, 1); - connect( grpEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( grpEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); } else if ((groupList.count() > 1) && isMyFile && isLocal) { @@ -1872,8 +1872,8 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr grpCombo->insertStringList(groupList); grpCombo->setCurrentItem(groupList.findIndex(strGroup)); gl->addWidget(grpCombo, 2, 1); - connect( grpCombo, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( grpCombo, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed() ) ); } else { @@ -1887,7 +1887,7 @@ KFilePermissionsPropsPlugin::KFilePermissionsPropsPlugin( KPropertiesDialog *_pr if ( hasDir && !isLink && !isTrash ) { d->cbRecursive = new TQCheckBox( i18n("Apply changes to all subfolders and their contents"), d->m_frame ); - connect( d->cbRecursive, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( changed() ) ); + connect( d->cbRecursive, TQ_SIGNAL( clicked() ), this, TQ_SIGNAL( changed() ) ); box->addWidget( d->cbRecursive ); } @@ -2553,8 +2553,8 @@ void KFilePermissionsPropsPlugin::applyChanges() if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2569,8 +2569,8 @@ void KFilePermissionsPropsPlugin::applyChanges() if ( defaultACLChange && d->fileSystemSupportsACLs ) job->addMetaData( "DEFAULT_ACL_STRING", d->defaultACL.isValid()?d->defaultACL.asString():"ACL_DELETE" ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotChmodResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotChmodResult( TDEIO::Job * ) ) ); // Wait for job TQWidget dummy(0,0,(WFlags)(WType_Dialog|WShowModal)); tqt_enter_modal(&dummy); @@ -2641,8 +2641,8 @@ KURLPropsPlugin::KURLPropsPlugin( KPropertiesDialog *_props ) URLEdit->setURL( URLStr ); } - connect( URLEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( URLEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); layout->addStretch (1); } @@ -2798,14 +2798,14 @@ KBindingPropsPlugin::KBindingPropsPlugin( KPropertiesDialog *_props ) : KPropsDl else cbAutoEmbed->setNoChange(); - connect( patternEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( mimeEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( cbAutoEmbed, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); + connect( patternEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( mimeEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( cbAutoEmbed, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); } KBindingPropsPlugin::~KBindingPropsPlugin() @@ -2924,8 +2924,8 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP device = new TQComboBox( true, d->m_frame, "ComboBox_device" ); device->insertStringList( devices ); layout->addWidget(device, 0, 1); - connect( device, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotActivated( int ) ) ); + connect( device, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotActivated( int ) ) ); readonly = new TQCheckBox( d->m_frame, "CheckBox_readonly" ); readonly->setText( i18n("Read only") ); @@ -3018,17 +3018,17 @@ KDevicePropsPlugin::KDevicePropsPlugin( KPropertiesDialog *_props ) : KPropsDlgP unmounted->setIcon( unmountedStr ); - connect( device, TQT_SIGNAL( activated( int ) ), - this, TQT_SIGNAL( changed() ) ); - connect( device, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( readonly, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( unmounted, TQT_SIGNAL( iconChanged( TQString ) ), - this, TQT_SIGNAL( changed() ) ); + connect( device, TQ_SIGNAL( activated( int ) ), + this, TQ_SIGNAL( changed() ) ); + connect( device, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( readonly, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( unmounted, TQ_SIGNAL( iconChanged( TQString ) ), + this, TQ_SIGNAL( changed() ) ); - connect( device, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( slotDeviceChanged() ) ); + connect( device, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( slotDeviceChanged() ) ); processLockouts(); } @@ -3065,9 +3065,9 @@ void KDevicePropsPlugin::updateInfo() if ( !mountpoint->text().isEmpty() ) { KDiskFreeSp * job = new KDiskFreeSp; - connect( job, TQT_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, + connect( job, TQ_SIGNAL( foundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ), - this, TQT_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, + this, TQ_SLOT( slotFoundMountPoint( const unsigned long&, const unsigned long&, const unsigned long&, const TQString& ) ) ); job->readDF( mountpoint->text() ); @@ -3187,16 +3187,16 @@ KDesktopPropsPlugin::KDesktopPropsPlugin( KPropertiesDialog *_props ) w->pathEdit->setMode(KFile::Directory | KFile::LocalOnly); w->pathEdit->lineEdit()->setAcceptDrops(false); - connect( w->nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->commandEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); - connect( w->pathEdit, TQT_SIGNAL( textChanged( const TQString & ) ), this, TQT_SIGNAL( changed() ) ); + connect( w->nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->commandEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); + connect( w->pathEdit, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SIGNAL( changed() ) ); - connect( w->browseButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) ); - connect( w->addFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAddFiletype() ) ); - connect( w->delFiletypeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDelFiletype() ) ); - connect( w->advancedButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotAdvanced() ) ); + connect( w->browseButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) ); + connect( w->addFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddFiletype() ) ); + connect( w->delFiletypeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDelFiletype() ) ); + connect( w->advancedButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdvanced() ) ); // now populate the page TQString path = _props->kurl().path(); @@ -3313,10 +3313,10 @@ void KDesktopPropsPlugin::slotAddFiletype() mw->listView->setFullWidth(true); mw->listView->setMinimumSize(500,400); - connect(mw->listView, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectMimetype())); - connect(mw->listView, TQT_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), - &dlg, TQT_SLOT( slotOk())); + connect(mw->listView, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectMimetype())); + connect(mw->listView, TQ_SIGNAL(doubleClicked( TQListViewItem *, const TQPoint &, int )), + &dlg, TQ_SLOT( slotOk())); TQMap majorMap; TQListViewItem *majorGroup; @@ -3577,22 +3577,22 @@ void KDesktopPropsPlugin::slotAdvanced() delete kcom; } - connect( w->terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->terminalCloseCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->terminalCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->suidCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->startupInfoCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->systrayCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( w->dcopCombo, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( w->terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->terminalCloseCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->terminalCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->suidCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->startupInfoCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->systrayCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( w->dcopCombo, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SIGNAL( changed() ) ); if ( dlg.exec() == TQDialog::Accepted ) { @@ -3851,27 +3851,27 @@ KExecPropsPlugin::KExecPropsPlugin( KPropertiesDialog *_props ) delete kcom; } - connect( swallowExecEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( swallowTitleEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( execEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( terminalEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); + connect( swallowExecEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( swallowTitleEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( execEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( terminalEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); if (d->nocloseonexitCheck) - connect( d->nocloseonexitCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( terminalCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( suidCheck, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SIGNAL( changed() ) ); - connect( suidEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - - connect( execBrowse, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBrowseExec() ) ); - connect( terminalCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableCheckedEdit() ) ); - connect( suidCheck, TQT_SIGNAL( clicked() ), this, TQT_SLOT( enableSuidEdit() ) ); + connect( d->nocloseonexitCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( terminalCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( suidCheck, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SIGNAL( changed() ) ); + connect( suidEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + + connect( execBrowse, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBrowseExec() ) ); + connect( terminalCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableCheckedEdit() ) ); + connect( suidCheck, TQ_SIGNAL( clicked() ), this, TQ_SLOT( enableSuidEdit() ) ); } @@ -3988,15 +3988,15 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props addExtensionButton->setIconSet( iconSet ); pixMap = iconSet.pixmap( TQIconSet::Small, TQIconSet::Normal ); addExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect( addExtensionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotAddExtension() ) ); + connect( addExtensionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotAddExtension() ) ); delExtensionButton = new TQPushButton( TQString::null, d->m_frame ); iconSet = SmallIconSet( "forward" ); delExtensionButton->setIconSet( iconSet ); delExtensionButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); - connect( delExtensionButton, TQT_SIGNAL( clicked() ), - TQT_SLOT( slotDelExtension() ) ); + connect( delExtensionButton, TQ_SIGNAL( clicked() ), + TQ_SLOT( slotDelExtension() ) ); TQLabel *l; @@ -4092,26 +4092,26 @@ TDEApplicationPropsPlugin::TDEApplicationPropsPlugin( KPropertiesDialog *_props updateButton(); - connect( extensionsList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( updateButton() ) ); - connect( availableExtensionsList, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( updateButton() ) ); + connect( extensionsList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( updateButton() ) ); + connect( availableExtensionsList, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( updateButton() ) ); - connect( addExtensionButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( changed() ) ); - connect( delExtensionButton, TQT_SIGNAL( clicked() ), - this, TQT_SIGNAL( changed() ) ); + connect( addExtensionButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( changed() ) ); + connect( delExtensionButton, TQ_SIGNAL( clicked() ), + this, TQ_SIGNAL( changed() ) ); if ( nameEdit ) - connect( nameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( commentEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( genNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SIGNAL( changed() ) ); - connect( availableExtensionsList, TQT_SIGNAL( selected( int ) ), - this, TQT_SIGNAL( changed() ) ); - connect( extensionsList, TQT_SIGNAL( selected( int ) ), - this, TQT_SIGNAL( changed() ) ); + connect( nameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( commentEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( genNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SIGNAL( changed() ) ); + connect( availableExtensionsList, TQ_SIGNAL( selected( int ) ), + this, TQ_SIGNAL( changed() ) ); + connect( extensionsList, TQ_SIGNAL( selected( int ) ), + this, TQ_SIGNAL( changed() ) ); } TDEApplicationPropsPlugin::~TDEApplicationPropsPlugin() diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp index 17ef303ac..b42de3706 100644 --- a/tdeio/tdefile/kurlbar.cpp +++ b/tdeio/tdefile/kurlbar.cpp @@ -412,15 +412,15 @@ void KURLBar::setListBox( KURLBarListBox *view ) paletteChange( palette() ); m_listBox->setFocusPolicy( TQWidget::TabFocus ); - connect( m_listBox, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - TQT_SLOT( slotSelected( int, TQListBoxItem * ))); - connect( m_listBox, TQT_SIGNAL( dropped( TQDropEvent * )), - this, TQT_SLOT( slotDropped( TQDropEvent * ))); - connect( m_listBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem *, + connect( m_listBox, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), + TQ_SLOT( slotSelected( int, TQListBoxItem * ))); + connect( m_listBox, TQ_SIGNAL( dropped( TQDropEvent * )), + this, TQ_SLOT( slotDropped( TQDropEvent * ))); + connect( m_listBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem *, const TQPoint& )), - TQT_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& ))); - connect( m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotSelected( TQListBoxItem * ) )); + TQ_SLOT( slotContextMenuRequested( TQListBoxItem *, const TQPoint& ))); + connect( m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotSelected( TQListBoxItem * ) )); } void KURLBar::setIconSize( int size ) @@ -985,7 +985,7 @@ KURLBarItemDialog::KURLBarItemDialog( bool allowGlobal, const KURL& url, } else m_appLocal = 0L; - connect(m_urlEdit->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(urlChanged(const TQString & ))); + connect(m_urlEdit->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(urlChanged(const TQString & ))); m_edit->setFocus(); setMainWidget( box ); } diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp index 66fe8efb8..f19dbe961 100644 --- a/tdeio/tdefile/kurlcombobox.cpp +++ b/tdeio/tdefile/kurlcombobox.cpp @@ -74,7 +74,7 @@ void KURLComboBox::init( Mode mode ) opendirPix = SmallIcon(TQString::fromLatin1("folder_open")); - connect( this, TQT_SIGNAL( activated( int )), TQT_SLOT( slotActivated( int ))); + connect( this, TQ_SIGNAL( activated( int )), TQ_SLOT( slotActivated( int ))); } diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp index a28512c13..aa88c34b7 100644 --- a/tdeio/tdefile/kurlrequester.cpp +++ b/tdeio/tdefile/kurlrequester.cpp @@ -116,12 +116,12 @@ public: else sender = edit; - connect( sender, TQT_SIGNAL( textChanged( const TQString& )), - receiver, TQT_SIGNAL( textChanged( const TQString& ))); - connect( sender, TQT_SIGNAL( returnPressed() ), - receiver, TQT_SIGNAL( returnPressed() )); - connect( sender, TQT_SIGNAL( returnPressed( const TQString& ) ), - receiver, TQT_SIGNAL( returnPressed( const TQString& ) )); + connect( sender, TQ_SIGNAL( textChanged( const TQString& )), + receiver, TQ_SIGNAL( textChanged( const TQString& ))); + connect( sender, TQ_SIGNAL( returnPressed() ), + receiver, TQ_SIGNAL( returnPressed() )); + connect( sender, TQ_SIGNAL( returnPressed( const TQString& ) ), + receiver, TQ_SIGNAL( returnPressed( const TQString& ) )); } void setCompletionObject( TDECompletion *comp ) { @@ -212,7 +212,7 @@ void KURLRequester::init() myButton->setFixedSize( pixMap.width()+8, pixMap.height()+8 ); TQToolTip::add(myButton, i18n("Open file dialog")); - connect( myButton, TQT_SIGNAL( pressed() ), TQT_SLOT( slotUpdateURL() )); + connect( myButton, TQ_SIGNAL( pressed() ), TQ_SLOT( slotUpdateURL() )); setSpacing( KDialog::spacingHint() ); @@ -221,13 +221,13 @@ void KURLRequester::init() setFocusProxy( widget ); d->connectSignals( this ); - connect( myButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotOpenDialog() )); + connect( myButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenDialog() )); myCompletion = new KURLCompletion(); d->setCompletionObject( myCompletion ); TDEAccel *accel = new TDEAccel( this ); - accel->insert( TDEStdAccel::Open, this, TQT_SLOT( slotOpenDialog() )); + accel->insert( TDEStdAccel::Open, this, TQ_SLOT( slotOpenDialog() )); accel->readSettings(); } diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp index 9f2ea9d46..a5ad1f07d 100644 --- a/tdeio/tdefile/kurlrequesterdlg.cpp +++ b/tdeio/tdefile/kurlrequesterdlg.cpp @@ -70,8 +70,8 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) urlRequester_->setMinimumWidth( urlRequester_->sizeHint().width() * 3 ); topLayout->addWidget( urlRequester_ ); urlRequester_->setFocus(); - connect( urlRequester_->lineEdit(), TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&)) ); + connect( urlRequester_->lineEdit(), TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&)) ); bool state = !urlName.isEmpty(); enableButtonOK( state ); enableButton( KDialogBase::User1, state ); @@ -80,7 +80,7 @@ void KURLRequesterDlg::initDialog(const TQString &text,const TQString &urlName) KFile::ExistingOnly ); urlRequester_->setMode( mode ); */ - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( slotClear() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( slotClear() ) ); } void KURLRequesterDlg::slotTextChanged(const TQString & text) diff --git a/tdeio/tdefile/tdediroperator.cpp b/tdeio/tdefile/tdediroperator.cpp index 8d9a27962..9bf947f20 100644 --- a/tdeio/tdefile/tdediroperator.cpp +++ b/tdeio/tdefile/tdediroperator.cpp @@ -124,16 +124,16 @@ KDirOperator::KDirOperator(const KURL& _url, setDirLister( new KDirLister( true ) ); - connect(&myCompletion, TQT_SIGNAL(match(const TQString&)), - TQT_SLOT(slotCompletionMatch(const TQString&))); + connect(&myCompletion, TQ_SIGNAL(match(const TQString&)), + TQ_SLOT(slotCompletionMatch(const TQString&))); progress = new KProgress(this, "progress"); progress->adjustSize(); progress->move(2, height() - progress->height() -2); d->progressDelayTimer = new TQTimer( this, "progress delay timer" ); - connect( d->progressDelayTimer, TQT_SIGNAL( timeout() ), - TQT_SLOT( slotShowProgress() )); + connect( d->progressDelayTimer, TQ_SIGNAL( timeout() ), + TQ_SLOT( slotShowProgress() )); myCompleteListDirty = false; @@ -192,10 +192,10 @@ void KDirOperator::insertViewDependentActions() { if (viewActionCollection) { - disconnect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )), - this, TQT_SLOT( slotViewActionAdded( TDEAction * ))); - disconnect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )), - this, TQT_SLOT( slotViewActionRemoved( TDEAction * ))); + disconnect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )), + this, TQ_SLOT( slotViewActionAdded( TDEAction * ))); + disconnect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )), + this, TQ_SLOT( slotViewActionRemoved( TDEAction * ))); } viewActionMenu->popupMenu()->clear(); @@ -237,10 +237,10 @@ void KDirOperator::insertViewDependentActions() } } - connect( viewActionCollection, TQT_SIGNAL( inserted( TDEAction * )), - TQT_SLOT( slotViewActionAdded( TDEAction * ))); - connect( viewActionCollection, TQT_SIGNAL( removed( TDEAction * )), - TQT_SLOT( slotViewActionRemoved( TDEAction * ))); + connect( viewActionCollection, TQ_SIGNAL( inserted( TDEAction * )), + TQ_SLOT( slotViewActionAdded( TDEAction * ))); + connect( viewActionCollection, TQ_SIGNAL( removed( TDEAction * )), + TQ_SLOT( slotViewActionRemoved( TDEAction * ))); } } @@ -1050,18 +1050,18 @@ void KDirOperator::connectView(KFileView *view) viewActionCollection = 0L; KFileViewSignaler *sig = view->signaler(); - connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), - this, TQT_SLOT( activatedMenu(const KFileItem *, const TQPoint& ))); - connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *) ), - this, TQT_SLOT( selectDir(const KFileItem*) ) ); - connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *) ), - this, TQT_SLOT( selectFile(const KFileItem*) ) ); - connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ), - this, TQT_SLOT( highlightFile(const KFileItem*) )); - connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - this, TQT_SLOT( slotViewSortingChanged( TQDir::SortSpec ))); - connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), - this, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) ); + connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), + this, TQ_SLOT( activatedMenu(const KFileItem *, const TQPoint& ))); + connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *) ), + this, TQ_SLOT( selectDir(const KFileItem*) ) ); + connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *) ), + this, TQ_SLOT( selectFile(const KFileItem*) ) ); + connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ), + this, TQ_SLOT( highlightFile(const KFileItem*) )); + connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + this, TQ_SLOT( slotViewSortingChanged( TQDir::SortSpec ))); + connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), + this, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&)) ); if ( reverseAction->isChecked() != m_fileView->isReversed() ) slotSortReversed(); @@ -1124,20 +1124,20 @@ void KDirOperator::setDirLister( KDirLister *lister ) dir->setMainWindow (mainWidget); kdDebug (tdefile_area) << "mainWidget=" << mainWidget << endl; - connect( dir, TQT_SIGNAL( percent( int )), - TQT_SLOT( slotProgress( int ) )); - connect( dir, TQT_SIGNAL(started( const KURL& )), TQT_SLOT(slotStarted())); - connect( dir, TQT_SIGNAL(newItems(const KFileItemList &)), - TQT_SLOT(insertNewFiles(const KFileItemList &))); - connect( dir, TQT_SIGNAL(completed()), TQT_SLOT(slotIOFinished())); - connect( dir, TQT_SIGNAL(canceled()), TQT_SLOT(slotCanceled())); - connect( dir, TQT_SIGNAL(deleteItem(KFileItem *)), - TQT_SLOT(itemDeleted(KFileItem *))); - connect( dir, TQT_SIGNAL(redirection( const KURL& )), - TQT_SLOT( slotRedirected( const KURL& ))); - connect( dir, TQT_SIGNAL( clear() ), TQT_SLOT( slotClearView() )); - connect( dir, TQT_SIGNAL( refreshItems( const KFileItemList& ) ), - TQT_SLOT( slotRefreshItems( const KFileItemList& ) ) ); + connect( dir, TQ_SIGNAL( percent( int )), + TQ_SLOT( slotProgress( int ) )); + connect( dir, TQ_SIGNAL(started( const KURL& )), TQ_SLOT(slotStarted())); + connect( dir, TQ_SIGNAL(newItems(const KFileItemList &)), + TQ_SLOT(insertNewFiles(const KFileItemList &))); + connect( dir, TQ_SIGNAL(completed()), TQ_SLOT(slotIOFinished())); + connect( dir, TQ_SIGNAL(canceled()), TQ_SLOT(slotCanceled())); + connect( dir, TQ_SIGNAL(deleteItem(KFileItem *)), + TQ_SLOT(itemDeleted(KFileItem *))); + connect( dir, TQ_SIGNAL(redirection( const KURL& )), + TQ_SLOT( slotRedirected( const KURL& ))); + connect( dir, TQ_SIGNAL( clear() ), TQ_SLOT( slotClearView() )); + connect( dir, TQ_SIGNAL( refreshItems( const KFileItemList& ) ), + TQ_SLOT( slotRefreshItems( const KFileItemList& ) ) ); } void KDirOperator::insertNewFiles(const KFileItemList &newone) @@ -1163,7 +1163,7 @@ void KDirOperator::insertNewFiles(const KFileItemList &newone) ++it; } - TQTimer::singleShot(200, this, TQT_SLOT(resetCursor())); + TQTimer::singleShot(200, this, TQ_SLOT(resetCursor())); } void KDirOperator::selectDir(const KFileItem *item) @@ -1256,23 +1256,23 @@ void KDirOperator::setupActions() myActionCollection = new TDEActionCollection( topLevelWidget(), this, "KDirOperator::myActionCollection" ); actionMenu = new TDEActionMenu( i18n("Menu"), myActionCollection, "popupMenu" ); - upAction = KStdAction::up( this, TQT_SLOT( cdUp() ), myActionCollection, "up" ); + upAction = KStdAction::up( this, TQ_SLOT( cdUp() ), myActionCollection, "up" ); upAction->setText( i18n("Parent Folder") ); - backAction = KStdAction::back( this, TQT_SLOT( back() ), myActionCollection, "back" ); - forwardAction = KStdAction::forward( this, TQT_SLOT(forward()), myActionCollection, "forward" ); - homeAction = KStdAction::home( this, TQT_SLOT( home() ), myActionCollection, "home" ); + backAction = KStdAction::back( this, TQ_SLOT( back() ), myActionCollection, "back" ); + forwardAction = KStdAction::forward( this, TQ_SLOT(forward()), myActionCollection, "forward" ); + homeAction = KStdAction::home( this, TQ_SLOT( home() ), myActionCollection, "home" ); homeAction->setText(i18n("Home Folder")); - reloadAction = KStdAction::redisplay( this, TQT_SLOT(rereadDir()), myActionCollection, "reload" ); + reloadAction = KStdAction::redisplay( this, TQ_SLOT(rereadDir()), myActionCollection, "reload" ); actionSeparator = new TDEActionSeparator( myActionCollection, "separator" ); d->viewActionSeparator = new TDEActionSeparator( myActionCollection, "viewActionSeparator" ); mkdirAction = new TDEAction( i18n("New Folder..."), 0, - this, TQT_SLOT( mkdir() ), myActionCollection, "mkdir" ); + this, TQ_SLOT( mkdir() ), myActionCollection, "mkdir" ); TDEAction* trash = new TDEAction( i18n( "Move to Trash" ), "edittrash", Key_Delete, myActionCollection, "trash" ); - connect( trash, TQT_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), - this, TQT_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); + connect( trash, TQ_SIGNAL( activated( TDEAction::ActivationReason, TQt::ButtonState ) ), + this, TQ_SLOT( trashSelected( TDEAction::ActivationReason, TQt::ButtonState ) ) ); new TDEAction( i18n( "Delete" ), "edit-delete", SHIFT+Key_Delete, this, - TQT_SLOT( deleteSelected() ), myActionCollection, "delete" ); + TQ_SLOT( deleteSelected() ), myActionCollection, "delete" ); mkdirAction->setIcon( TQString::fromLatin1("folder-new") ); reloadAction->setText( i18n("Reload") ); reloadAction->setShortcut( TDEStdAccel::shortcut( TDEStdAccel::Reload )); @@ -1281,16 +1281,16 @@ void KDirOperator::setupActions() // the sort menu actions sortActionMenu = new TDEActionMenu( i18n("Sorting"), myActionCollection, "sorting menu"); byNameAction = new TDERadioAction( i18n("By Name"), 0, - this, TQT_SLOT( slotSortByName() ), + this, TQ_SLOT( slotSortByName() ), myActionCollection, "by name" ); byDateAction = new TDERadioAction( i18n("By Date"), 0, - this, TQT_SLOT( slotSortByDate() ), + this, TQ_SLOT( slotSortByDate() ), myActionCollection, "by date" ); bySizeAction = new TDERadioAction( i18n("By Size"), 0, - this, TQT_SLOT( slotSortBySize() ), + this, TQ_SLOT( slotSortBySize() ), myActionCollection, "by size" ); reverseAction = new TDEToggleAction( i18n("Reverse"), 0, - this, TQT_SLOT( slotSortReversed() ), + this, TQ_SLOT( slotSortReversed() ), myActionCollection, "reversed" ); TQString sortGroup = TQString::fromLatin1("sort"); @@ -1304,17 +1304,17 @@ void KDirOperator::setupActions() caseInsensitiveAction = new TDEToggleAction(i18n("Case Insensitive"), 0, myActionCollection, "case insensitive" ); - connect( dirsFirstAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleDirsFirst() )); - connect( caseInsensitiveAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleIgnoreCase() )); + connect( dirsFirstAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleDirsFirst() )); + connect( caseInsensitiveAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleIgnoreCase() )); // the view menu actions viewActionMenu = new TDEActionMenu( i18n("&View"), myActionCollection, "view menu" ); - connect( viewActionMenu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_SLOT( insertViewDependentActions() )); + connect( viewActionMenu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + TQ_SLOT( insertViewDependentActions() )); shortAction = new TDERadioAction( i18n("Short View"), "view_multicolumn", TDEShortcut(), myActionCollection, "short view" ); @@ -1326,30 +1326,30 @@ void KDirOperator::setupActions() // showHiddenAction->setCheckedState( i18n("Hide Hidden Files") ); separateDirsAction = new TDEToggleAction( i18n("Separate Folders"), TDEShortcut(), this, - TQT_SLOT(slotSeparateDirs()), + TQ_SLOT(slotSeparateDirs()), myActionCollection, "separate dirs" ); TDEToggleAction *previewAction = new TDEToggleAction(i18n("Show Preview"), "thumbnail", TDEShortcut(), myActionCollection, "preview" ); previewAction->setCheckedState(i18n("Hide Preview")); - connect( previewAction, TQT_SIGNAL( toggled( bool )), - TQT_SLOT( togglePreview( bool ))); + connect( previewAction, TQ_SIGNAL( toggled( bool )), + TQ_SLOT( togglePreview( bool ))); TQString viewGroup = TQString::fromLatin1("view"); shortAction->setExclusiveGroup( viewGroup ); detailedAction->setExclusiveGroup( viewGroup ); - connect( shortAction, TQT_SIGNAL( activated() ), - TQT_SLOT( slotSimpleView() )); - connect( detailedAction, TQT_SIGNAL( activated() ), - TQT_SLOT( slotDetailedView() )); - connect( showHiddenAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( slotToggleHidden( bool ) )); + connect( shortAction, TQ_SIGNAL( activated() ), + TQ_SLOT( slotSimpleView() )); + connect( detailedAction, TQ_SIGNAL( activated() ), + TQ_SLOT( slotDetailedView() )); + connect( showHiddenAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( slotToggleHidden( bool ) )); new TDEAction( i18n("Properties"), TDEShortcut(ALT+Key_Return), this, - TQT_SLOT(slotProperties()), myActionCollection, "properties" ); + TQ_SLOT(slotProperties()), myActionCollection, "properties" ); } void KDirOperator::setupMenu() diff --git a/tdeio/tdefile/tdediroperator.h b/tdeio/tdefile/tdediroperator.h index 74abdd585..89b1a1709 100644 --- a/tdeio/tdefile/tdediroperator.h +++ b/tdeio/tdefile/tdediroperator.h @@ -72,14 +72,14 @@ namespace TDEIO { * \code * KDirOperator *op = new KDirOperator( KURL( "file:/home/gis" ), this ); * // some signals you might be interested in - * connect(op, TQT_SIGNAL(urlEntered(const KURL&)), - * TQT_SLOT(urlEntered(const KURL&))); - * connect(op, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - * TQT_SLOT(fileHighlighted(const KFileItem *))); - * connect(op, TQT_SIGNAL(fileSelected(const KFileItem *)), - * TQT_SLOT(fileSelected(const KFileItem *))); - * connect(op, TQT_SIGNAL(finishedLoading()), - * TQT_SLOT(slotLoadingFinished())); + * connect(op, TQ_SIGNAL(urlEntered(const KURL&)), + * TQ_SLOT(urlEntered(const KURL&))); + * connect(op, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + * TQ_SLOT(fileHighlighted(const KFileItem *))); + * connect(op, TQ_SIGNAL(fileSelected(const KFileItem *)), + * TQ_SLOT(fileSelected(const KFileItem *))); + * connect(op, TQ_SIGNAL(finishedLoading()), + * TQ_SLOT(slotLoadingFinished())); * * op->readConfig( TDEGlobal::config(), "Your KDiroperator ConfigGroup" ); * op->setView(KFile::Default); diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp index 724d20218..321684ac7 100644 --- a/tdeio/tdefile/tdefiledetailview.cpp +++ b/tdeio/tdefile/tdefiledetailview.cpp @@ -72,21 +72,21 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name) setAllColumnsShowFocus( true ); setDragEnabled(true); - connect( header(), TQT_SIGNAL( clicked(int)), - TQT_SLOT(slotSortingChanged(int) )); + connect( header(), TQ_SIGNAL( clicked(int)), + TQ_SLOT(slotSortingChanged(int) )); - connect( this, TQT_SIGNAL( returnPressed(TQListViewItem *) ), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed(TQListViewItem *) ), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( selected( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), - TQT_SLOT( slotActivate( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( clicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( selected( TQListViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked(TQListViewItem *, const TQPoint&, int)), + TQ_SLOT( slotActivate( TQListViewItem *) ) ); - connect( this, TQT_SIGNAL(contextMenuRequested( TQListViewItem *, + connect( this, TQ_SIGNAL(contextMenuRequested( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); + this, TQ_SLOT( slotActivateMenu( TQListViewItem *, const TQPoint& ))); KFile::SelectionMode sm = KFileView::selectionMode(); switch ( sm ) { @@ -107,15 +107,15 @@ KFileDetailView::KFileDetailView(TQWidget *parent, const char *name) // for highlighting if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - TQT_SLOT( highlighted( TQListViewItem * ) )); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + TQ_SLOT( highlighted( TQListViewItem * ) )); // DND - connect( &(d->autoOpenTimer), TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpen() )); + connect( &(d->autoOpenTimer), TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpen() )); setSorting( sorting() ); @@ -253,8 +253,8 @@ void KFileDetailView::highlighted( TQListViewItem *item ) void KFileDetailView::setSelectionMode( KFile::SelectionMode sm ) { - disconnect( this, TQT_SIGNAL( selectionChanged() )); - disconnect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) )); + disconnect( this, TQ_SIGNAL( selectionChanged() )); + disconnect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) )); KFileView::setSelectionMode( sm ); @@ -275,11 +275,11 @@ void KFileDetailView::setSelectionMode( KFile::SelectionMode sm ) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * )), - TQT_SLOT( highlighted( TQListViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * )), + TQ_SLOT( highlighted( TQListViewItem * ))); } bool KFileDetailView::isSelected( const KFileItem *i ) const diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp index 1b12e8a5b..e5cb4c3e4 100644 --- a/tdeio/tdefile/tdefiledialog.cpp +++ b/tdeio/tdefile/tdefiledialog.cpp @@ -561,8 +561,8 @@ void KFileDialog::slotOk() job->setWindow (topLevelWidget()); TDEIO::Scheduler::scheduleJob( job ); d->statJobs.append( job ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - TQT_SLOT( slotStatResult( TDEIO::Job *) )); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + TQ_SLOT( slotStatResult( TDEIO::Job *) )); } return; } @@ -570,7 +570,7 @@ void KFileDialog::slotOk() job = TDEIO::stat(d->url,!d->url.isLocalFile()); job->setWindow (topLevelWidget()); d->statJobs.append( job ); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotStatResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotStatResult(TDEIO::Job*))); } @@ -770,11 +770,11 @@ void KFileDialog::setLocationText( const TQString& text ) // setCurrentItem() will cause textChanged() being emitted, // so slotLocationChanged() will be called. Make sure we don't clear // the KDirOperator's view-selection in there - disconnect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotLocationChanged( const TQString& ) ) ); + disconnect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotLocationChanged( const TQString& ) ) ); locationEdit->setCurrentItem( 0 ); - connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotLocationChanged( const TQString& )) ); + connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotLocationChanged( const TQString& )) ); locationEdit->setEditText( text ); // don't change selection when user has clicked on an item @@ -827,8 +827,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->okButton = new KPushButton( KStdGuiItem::ok(), d->mainWidget ); d->okButton->setDefault( true ); d->cancelButton = new KPushButton(KStdGuiItem::cancel(), d->mainWidget); - connect( d->okButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOk() )); - connect( d->cancelButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotCancel() )); + connect( d->okButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOk() )); + connect( d->cancelButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotCancel() )); d->customWidget = widget; d->autoSelectExtCheckBox = 0; // delayed loading d->autoSelectExtChecked = false; @@ -896,14 +896,14 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge ops = new KDirOperator(d->url, d->mainWidget, "KFileDialog::ops"); ops->setOnlyDoubleClickSelectsFiles( true ); - connect(ops, TQT_SIGNAL(urlEntered(const KURL&)), - TQT_SLOT(urlEntered(const KURL&))); - connect(ops, TQT_SIGNAL(fileHighlighted(const KFileItem *)), - TQT_SLOT(fileHighlighted(const KFileItem *))); - connect(ops, TQT_SIGNAL(fileSelected(const KFileItem *)), - TQT_SLOT(fileSelected(const KFileItem *))); - connect(ops, TQT_SIGNAL(finishedLoading()), - TQT_SLOT(slotLoadingFinished())); + connect(ops, TQ_SIGNAL(urlEntered(const KURL&)), + TQ_SLOT(urlEntered(const KURL&))); + connect(ops, TQ_SIGNAL(fileHighlighted(const KFileItem *)), + TQ_SLOT(fileHighlighted(const KFileItem *))); + connect(ops, TQ_SIGNAL(fileSelected(const KFileItem *)), + TQ_SLOT(fileSelected(const KFileItem *))); + connect(ops, TQ_SIGNAL(finishedLoading()), + TQ_SLOT(slotLoadingFinished())); ops->setupMenu(KDirOperator::SortActions | KDirOperator::FileActions | @@ -928,14 +928,14 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge TDEToggleAction *showSidebarAction = new TDEToggleAction(i18n("Show Quick Access Navigation Panel"), Key_F9, coll,"toggleSpeedbar"); showSidebarAction->setCheckedState(i18n("Hide Quick Access Navigation Panel")); - connect( showSidebarAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleSpeedbar( bool )) ); + connect( showSidebarAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleSpeedbar( bool )) ); TDEToggleAction *showBookmarksAction = new TDEToggleAction(i18n("Show Bookmarks"), 0, coll, "toggleBookmarks"); showBookmarksAction->setCheckedState(i18n("Hide Bookmarks")); - connect( showBookmarksAction, TQT_SIGNAL( toggled( bool ) ), - TQT_SLOT( toggleBookmarks( bool )) ); + connect( showBookmarksAction, TQ_SIGNAL( toggled( bool ) ), + TQ_SLOT( toggleBookmarks( bool )) ); TDEActionMenu *menu = new TDEActionMenu( i18n("Configure"), "configure", this, "extra menu" ); menu->setWhatsThis(i18n("This is the configuration menu for the file dialog. " @@ -963,8 +963,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge menu->insert( coll->action( "separate dirs" )); menu->setDelayed( false ); - connect( menu->popupMenu(), TQT_SIGNAL( aboutToShow() ), - ops, TQT_SLOT( updateSelectionDependentActions() )); + connect( menu->popupMenu(), TQ_SIGNAL( aboutToShow() ), + ops, TQ_SLOT( updateSelectionDependentActions() )); menu->plug( toolbar ); //Insert a separator. @@ -984,12 +984,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge d->pathCombo->setCompletionObject( pathCompletionObj ); d->pathCombo->setAutoDeleteCompletionObject( true ); - connect( d->pathCombo, TQT_SIGNAL( urlActivated( const KURL& )), - this, TQT_SLOT( enterURL( const KURL& ) )); - connect( d->pathCombo, TQT_SIGNAL( returnPressed( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); - connect( d->pathCombo, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( urlActivated( const KURL& )), + this, TQ_SLOT( enterURL( const KURL& ) )); + connect( d->pathCombo, TQ_SIGNAL( returnPressed( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); + connect( d->pathCombo, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( enterURL( const TQString& ) )); TQString whatsThisText; @@ -998,8 +998,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge locationEdit = new KURLComboBox(KURLComboBox::Files, true, d->mainWidget, "LocationEdit"); locationEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); - connect( locationEdit, TQT_SIGNAL( textChanged( const TQString& ) ), - TQT_SLOT( slotLocationChanged( const TQString& )) ); + connect( locationEdit, TQ_SIGNAL( textChanged( const TQString& ) ), + TQ_SLOT( slotLocationChanged( const TQString& )) ); updateLocationWhatsThis (); d->locationLabel->setBuddy(locationEdit); @@ -1011,13 +1011,13 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge fileCompletionObj->setDir( dir ); locationEdit->setCompletionObject( fileCompletionObj ); locationEdit->setAutoDeleteCompletionObject( true ); - connect( fileCompletionObj, TQT_SIGNAL( match( const TQString& ) ), - TQT_SLOT( fileCompletion( const TQString& )) ); + connect( fileCompletionObj, TQ_SIGNAL( match( const TQString& ) ), + TQ_SLOT( fileCompletion( const TQString& )) ); - connect( locationEdit, TQT_SIGNAL( returnPressed() ), - this, TQT_SLOT( slotOk())); - connect(locationEdit, TQT_SIGNAL( activated( const TQString& )), - this, TQT_SLOT( locationActivated( const TQString& ) )); + connect( locationEdit, TQ_SIGNAL( returnPressed() ), + this, TQ_SLOT( slotOk())); + connect(locationEdit, TQ_SIGNAL( activated( const TQString& )), + this, TQ_SLOT( locationActivated( const TQString& ) )); // the Filter label/edit whatsThisText = i18n("This is the filter to apply to the file list. " @@ -1034,12 +1034,12 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge TQWhatsThis::add(filterWidget, whatsThisText); setFilter(filter); d->filterLabel->setBuddy(filterWidget); - connect(filterWidget, TQT_SIGNAL(filterChanged()), TQT_SLOT(slotFilterChanged())); + connect(filterWidget, TQ_SIGNAL(filterChanged()), TQ_SLOT(slotFilterChanged())); // the Automatically Select Extension checkbox // (the text, visibility etc. is set in updateAutoSelectExtension(), which is called by readConfig()) d->autoSelectExtCheckBox = new TQCheckBox (d->mainWidget); - connect(d->autoSelectExtCheckBox, TQT_SIGNAL(clicked()), TQT_SLOT(slotAutoSelectExtClicked())); + connect(d->autoSelectExtCheckBox, TQ_SIGNAL(clicked()), TQ_SLOT(slotAutoSelectExtClicked())); initGUI(); // activate GM @@ -1056,8 +1056,8 @@ void KFileDialog::init(const TQString& startDir, const TQString& filter, TQWidge void KFileDialog::initSpeedbar() { d->urlBar = new KFileSpeedBar( d->mainWidget, "url bar" ); - connect( d->urlBar, TQT_SIGNAL( activated( const KURL& )), - TQT_SLOT( enterURL( const KURL& )) ); + connect( d->urlBar, TQ_SIGNAL( activated( const KURL& )), + TQ_SLOT( enterURL( const KURL& )) ); // need to set the current url of the urlbar manually (not via urlEntered() // here, because the initial url of KDirOperator might be the same as the @@ -2263,8 +2263,8 @@ void KFileDialog::toggleBookmarks(bool show) } d->bookmarkHandler = new KFileBookmarkHandler( this ); - connect( d->bookmarkHandler, TQT_SIGNAL( openURL( const TQString& )), - TQT_SLOT( enterURL( const TQString& ))); + connect( d->bookmarkHandler, TQ_SIGNAL( openURL( const TQString& )), + TQ_SLOT( enterURL( const TQString& ))); toolbar->insertButton(TQString::fromLatin1("bookmark"), (int)HOTLIST_BUTTON, true, diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h index a8b622fd5..9807893d0 100644 --- a/tdeio/tdefile/tdefiledialog.h +++ b/tdeio/tdefile/tdefiledialog.h @@ -713,7 +713,7 @@ public: * items into it, e.g.: * \code * yourAction = new TDEAction( i18n("Your Action"), 0, - * this, TQT_SLOT( yourSlot() ), + * this, TQ_SLOT( yourSlot() ), * this, "action name" ); * yourAction->plug( tdefileDialog->toolBar() ); * \endcode diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp index ba7621c89..de4d45518 100644 --- a/tdeio/tdefile/tdefilefiltercombo.cpp +++ b/tdeio/tdefile/tdefilefiltercombo.cpp @@ -49,9 +49,9 @@ KFileFilterCombo::KFileFilterCombo( TQWidget *parent, const char *name) { setTrapReturnKey( true ); setInsertionPolicy(NoInsertion); - connect( this, TQT_SIGNAL( activated( int )), this, TQT_SIGNAL( filterChanged() )); - connect( this, TQT_SIGNAL( returnPressed() ), this, TQT_SIGNAL( filterChanged() )); - connect( this, TQT_SIGNAL( filterChanged() ), TQT_SLOT( slotFilterChanged() )); + connect( this, TQ_SIGNAL( activated( int )), this, TQ_SIGNAL( filterChanged() )); + connect( this, TQ_SIGNAL( returnPressed() ), this, TQ_SIGNAL( filterChanged() )); + connect( this, TQ_SIGNAL( filterChanged() ), TQ_SLOT( slotFilterChanged() )); m_allTypes = false; } diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp index 01e14b014..65d33912b 100644 --- a/tdeio/tdefile/tdefileiconview.cpp +++ b/tdeio/tdefile/tdefileiconview.cpp @@ -60,12 +60,12 @@ public: noArrangement = false; ignoreMaximumSize = false; smallColumns = new TDERadioAction( i18n("Small Icons"), 0, parent, - TQT_SLOT( slotSmallColumns() ), + TQ_SLOT( slotSmallColumns() ), parent->actionCollection(), "small columns" ); largeRows = new TDERadioAction( i18n("Large Icons"), 0, parent, - TQT_SLOT( slotLargeRows() ), + TQ_SLOT( slotLargeRows() ), parent->actionCollection(), "large rows" ); @@ -75,22 +75,22 @@ public: previews = new TDEToggleAction( i18n("Thumbnail Previews"), 0, parent->actionCollection(), "show previews" ); - zoomIn = KStdAction::zoomIn( parent, TQT_SLOT( zoomIn() ), + zoomIn = KStdAction::zoomIn( parent, TQ_SLOT( zoomIn() ), parent->actionCollection(), "zoomIn" ); - zoomOut = KStdAction::zoomOut( parent, TQT_SLOT( zoomOut() ), + zoomOut = KStdAction::zoomOut( parent, TQ_SLOT( zoomOut() ), parent->actionCollection(), "zoomOut" ); previews->setGroup("previews"); zoomIn->setGroup("previews"); zoomOut->setGroup("previews"); - connect( previews, TQT_SIGNAL( toggled( bool )), - parent, TQT_SLOT( slotPreviewsToggled( bool ))); + connect( previews, TQ_SIGNAL( toggled( bool )), + parent, TQ_SLOT( slotPreviewsToggled( bool ))); - connect( &previewTimer, TQT_SIGNAL( timeout() ), - parent, TQT_SLOT( showPreviews() )); - connect( &autoOpenTimer, TQT_SIGNAL( timeout() ), - parent, TQT_SLOT( slotAutoOpen() )); + connect( &previewTimer, TQ_SIGNAL( timeout() ), + parent, TQ_SLOT( showPreviews() )); + connect( &autoOpenTimer, TQ_SIGNAL( timeout() ), + parent, TQ_SLOT( slotAutoOpen() )); } ~KFileIconViewPrivate() { @@ -133,21 +133,21 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name) slotSmallColumns(); d->smallColumns->setChecked( true ); - connect( this, TQT_SIGNAL( returnPressed(TQIconViewItem *) ), - TQT_SLOT( slotActivate( TQIconViewItem *) ) ); + connect( this, TQ_SIGNAL( returnPressed(TQIconViewItem *) ), + TQ_SLOT( slotActivate( TQIconViewItem *) ) ); // we want single click _and_ double click (as convenience) - connect( this, TQT_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ), - TQT_SLOT( selected( TQIconViewItem *) ) ); - connect( this, TQT_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ), - TQT_SLOT( slotActivate( TQIconViewItem *) ) ); - - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - TQT_SLOT( showToolTip( TQIconViewItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), - TQT_SLOT( removeToolTip() ) ); - connect( this, TQT_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)), - TQT_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) ); + connect( this, TQ_SIGNAL( clicked(TQIconViewItem *, const TQPoint&) ), + TQ_SLOT( selected( TQIconViewItem *) ) ); + connect( this, TQ_SIGNAL( doubleClicked(TQIconViewItem *, const TQPoint&) ), + TQ_SLOT( slotActivate( TQIconViewItem *) ) ); + + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + TQ_SLOT( showToolTip( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + TQ_SLOT( removeToolTip() ) ); + connect( this, TQ_SIGNAL( contextMenuRequested(TQIconViewItem*,const TQPoint&)), + TQ_SLOT( slotActivateMenu( TQIconViewItem*, const TQPoint& ) ) ); KFile::SelectionMode sm = KFileView::selectionMode(); switch ( sm ) { @@ -167,11 +167,11 @@ KFileIconView::KFileIconView(TQWidget *parent, const char *name) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )), - TQT_SLOT( highlighted( TQIconViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )), + TQ_SLOT( highlighted( TQIconViewItem * ))); viewport()->installEventFilter( this ); @@ -398,8 +398,8 @@ void KFileIconView::highlighted( TQIconViewItem *item ) void KFileIconView::setSelectionMode( KFile::SelectionMode sm ) { - disconnect( TQT_SIGNAL( selectionChanged() ), this ); - disconnect( TQT_SIGNAL( selectionChanged( TQIconViewItem * )), this ); + disconnect( TQ_SIGNAL( selectionChanged() ), this ); + disconnect( TQ_SIGNAL( selectionChanged( TQIconViewItem * )), this ); KFileView::setSelectionMode( sm ); switch ( KFileView::selectionMode() ) { @@ -419,11 +419,11 @@ void KFileIconView::setSelectionMode( KFile::SelectionMode sm ) } if ( sm == KFile::Multi || sm == KFile::Extended ) - connect( this, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() )); + connect( this, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() )); else - connect( this, TQT_SIGNAL( selectionChanged( TQIconViewItem * )), - TQT_SLOT( highlighted( TQIconViewItem * ))); + connect( this, TQ_SIGNAL( selectionChanged( TQIconViewItem * )), + TQ_SLOT( highlighted( TQIconViewItem * ))); } bool KFileIconView::isSelected( const KFileItem *i ) const @@ -593,12 +593,12 @@ void KFileIconView::showPreviews() d->job = TDEIO::filePreview(*items(), d->previewIconSize,d->previewIconSize); d->job->setIgnoreMaximumSize(d->ignoreMaximumSize); - connect( d->job, TQT_SIGNAL( result( TDEIO::Job * )), - this, TQT_SLOT( slotPreviewResult( TDEIO::Job * ))); - connect( d->job, TQT_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), - TQT_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); -// connect( d->job, TQT_SIGNAL( failed( const KFileItem* )), -// this, TQT_SLOT( slotFailed( const KFileItem* ) )); + connect( d->job, TQ_SIGNAL( result( TDEIO::Job * )), + this, TQ_SLOT( slotPreviewResult( TDEIO::Job * ))); + connect( d->job, TQ_SIGNAL( gotPreview( const KFileItem*, const TQPixmap& )), + TQ_SLOT( gotPreview( const KFileItem*, const TQPixmap& ) )); +// connect( d->job, TQ_SIGNAL( failed( const KFileItem* )), +// this, TQ_SLOT( slotFailed( const KFileItem* ) )); } void KFileIconView::slotPreviewResult( TDEIO::Job *job ) diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp index 9727716c3..f271b4541 100644 --- a/tdeio/tdefile/tdefilemetainfowidget.cpp +++ b/tdeio/tdefile/tdefilemetainfowidget.cpp @@ -185,7 +185,7 @@ TQWidget* KFileMetaInfoWidget::makeBoolWidget() { TQCheckBox* cb = new TQCheckBox(this, "metainfo bool widget"); cb->setChecked(m_item.value().toBool()); - connect(cb, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChanged(bool))); + connect(cb, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChanged(bool))); return cb; } @@ -209,7 +209,7 @@ TQWidget* KFileMetaInfoWidget::makeIntWidget() if (m_item.type() == TQVariant::UInt) sb->setMinValue(TQMAX(sb->minValue(), 0)); - connect(sb, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanged(int))); + connect(sb, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotChanged(int))); return sb; } @@ -229,7 +229,7 @@ TQWidget* KFileMetaInfoWidget::makeDoubleWidget() reparentValidator(dni, m_validator); } - connect(dni, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(slotChanged(double))); + connect(dni, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(slotChanged(double))); return dni; } @@ -242,7 +242,7 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() (m_validator); b->insertStringList(val->stringList()); b->setCurrentText(m_item.value().toString()); - connect(b, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotComboChanged(const TQString &))); + connect(b, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotComboChanged(const TQString &))); b->setValidator(val); reparentValidator(b, val); return b; @@ -251,8 +251,8 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() if ( m_item.attributes() & KFileMimeTypeInfo::MultiLine ) { KEdit *edit = new KEdit( this ); edit->setText( m_item.value().toString() ); - connect( edit, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( slotMultiLineEditChanged() )); + connect( edit, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( slotMultiLineEditChanged() )); // can't use a validator with a TQTextEdit, but we may need to delete it if ( m_validator ) reparentValidator( edit, m_validator ); @@ -265,16 +265,16 @@ TQWidget* KFileMetaInfoWidget::makeStringWidget() e->setValidator(m_validator); reparentValidator(e, m_validator); } - connect(e, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotLineEditChanged(const TQString&))); + connect(e, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotLineEditChanged(const TQString&))); return e; } TQWidget* KFileMetaInfoWidget::makeDateWidget() { TQWidget *e = new TQDateEdit(m_item.value().toDate(), this); - connect(e, TQT_SIGNAL(valueChanged(const TQDate&)), - this, TQT_SLOT(slotDateChanged(const TQDate&))); + connect(e, TQ_SIGNAL(valueChanged(const TQDate&)), + this, TQ_SLOT(slotDateChanged(const TQDate&))); return e; } diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp index acec61475..36fc81eb5 100644 --- a/tdeio/tdefile/tdefilepreview.cpp +++ b/tdeio/tdefile/tdefilepreview.cpp @@ -95,8 +95,8 @@ void KFilePreview::setFileView( KFileView *view ) view->setSorting( sorting() ); left = view; - connect( left->signaler(), TQT_SIGNAL( fileHighlighted(const KFileItem*) ), - TQT_SLOT( slotHighlighted( const KFileItem * ))); + connect( left->signaler(), TQ_SIGNAL( fileHighlighted(const KFileItem*) ), + TQ_SLOT( slotHighlighted( const KFileItem * ))); // Why copy the actions? --ellis, 13 Jan 02. //for ( uint i = 0; i < view->actionCollection()->count(); i++ ) @@ -110,10 +110,10 @@ void KFilePreview::setPreviewWidget(const TQWidget *w, const KURL &) left->setOnlyDoubleClickSelectsFiles( onlyDoubleClickSelectsFiles() ); if (w) { - connect(this, TQT_SIGNAL( showPreview(const KURL &) ), - w, TQT_SLOT( showPreview(const KURL &) )); - connect( this, TQT_SIGNAL( clearPreview() ), - w, TQT_SLOT( clearPreview() )); + connect(this, TQ_SIGNAL( showPreview(const KURL &) ), + w, TQ_SLOT( showPreview(const KURL &) )); + connect( this, TQ_SIGNAL( clearPreview() ), + w, TQ_SLOT( clearPreview() )); } else { preview->hide(); diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp index 8c18a582a..326e2d21e 100644 --- a/tdeio/tdefile/tdefilesharedlg.cpp +++ b/tdeio/tdefile/tdefilesharedlg.cpp @@ -152,17 +152,17 @@ void KFileSharePropsPlugin::init() TQButtonGroup *rbGroup = new TQButtonGroup( m_widget ); rbGroup->hide(); m_rbUnShare = new TQRadioButton( i18n("Not shared"), m_widget ); - connect( m_rbUnShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbUnShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbUnShare, 0 ); rbGroup->insert( m_rbUnShare ); m_rbShare = new TQRadioButton( i18n("Shared - read only for others"), m_widget ); - connect( m_rbShare, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbShare, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbShare, 0 ); rbGroup->insert( m_rbShare ); m_rbSharerw = new TQRadioButton( i18n("Shared - writeable for others"), m_widget ); - connect( m_rbSharerw, TQT_SIGNAL( toggled(bool) ), TQT_SIGNAL( changed() ) ); + connect( m_rbSharerw, TQ_SIGNAL( toggled(bool) ), TQ_SIGNAL( changed() ) ); vbox->addWidget( m_rbSharerw, 0 ); rbGroup->insert( m_rbSharerw ); @@ -193,7 +193,7 @@ void KFileSharePropsPlugin::init() label->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::WordBreak ); vbox->addWidget( label, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); - connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); + connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) ); vbox->addWidget( m_pbConfig, 0, TQt::AlignHCenter ); vbox->addStretch( 10 ); @@ -220,7 +220,7 @@ void KFileSharePropsPlugin::init() TQHBoxLayout* hBox = new TQHBoxLayout( (TQWidget *)0L ); vbox->addLayout( hBox, 0 ); m_pbConfig = new TQPushButton( i18n("Configure File Sharing..."), m_widget ); - connect( m_pbConfig, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) ); + connect( m_pbConfig, TQ_SIGNAL( clicked() ), TQ_SLOT( slotConfigureFileSharing() ) ); hBox->addWidget( m_pbConfig, 0, TQt::AlignHCenter ); vbox->addStretch( 10 ); // align items on top break; @@ -244,8 +244,8 @@ void KFileSharePropsPlugin::slotConfigureFileSharing() d->m_configProc = 0; return; } - connect(d->m_configProc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotConfigureFileSharingDone())); + connect(d->m_configProc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotConfigureFileSharingDone())); m_pbConfig->setEnabled(false); } diff --git a/tdeio/tdefile/tdefiletreebranch.cpp b/tdeio/tdefile/tdefiletreebranch.cpp index b55c3ffb2..70e7d7c40 100644 --- a/tdeio/tdefile/tdefiletreebranch.cpp +++ b/tdeio/tdefile/tdefiletreebranch.cpp @@ -64,32 +64,32 @@ KFileTreeBranch::KFileTreeBranch( KFileTreeView *parent, const KURL& url, setShowingDotFiles( showHidden ); - connect( this, TQT_SIGNAL( refreshItems(const KFileItemList&)), - this, TQT_SLOT ( slotRefreshItems( const KFileItemList& ))); + connect( this, TQ_SIGNAL( refreshItems(const KFileItemList&)), + this, TQ_SLOT ( slotRefreshItems( const KFileItemList& ))); - connect( this, TQT_SIGNAL( newItems(const KFileItemList&)), - this, TQT_SLOT ( addItems( const KFileItemList& ))); + connect( this, TQ_SIGNAL( newItems(const KFileItemList&)), + this, TQ_SLOT ( addItems( const KFileItemList& ))); - connect( this, TQT_SIGNAL( completed(const KURL& )), - this, TQT_SLOT(slCompleted(const KURL&))); + connect( this, TQ_SIGNAL( completed(const KURL& )), + this, TQ_SLOT(slCompleted(const KURL&))); - connect( this, TQT_SIGNAL( started( const KURL& )), - this, TQT_SLOT( slotListerStarted( const KURL& ))); + connect( this, TQ_SIGNAL( started( const KURL& )), + this, TQ_SLOT( slotListerStarted( const KURL& ))); - connect( this, TQT_SIGNAL( deleteItem( KFileItem* )), - this, TQT_SLOT( slotDeleteItem( KFileItem* ))); + connect( this, TQ_SIGNAL( deleteItem( KFileItem* )), + this, TQ_SLOT( slotDeleteItem( KFileItem* ))); - connect( this, TQT_SIGNAL( canceled(const KURL&) ), - this, TQT_SLOT( slotCanceled(const KURL&) )); + connect( this, TQ_SIGNAL( canceled(const KURL&) ), + this, TQ_SLOT( slotCanceled(const KURL&) )); - connect( this, TQT_SIGNAL( clear()), - this, TQT_SLOT( slotDirlisterClear())); + connect( this, TQ_SIGNAL( clear()), + this, TQ_SLOT( slotDirlisterClear())); - connect( this, TQT_SIGNAL( clear(const KURL&)), - this, TQT_SLOT( slotDirlisterClearURL(const KURL&))); + connect( this, TQ_SIGNAL( clear(const KURL&)), + this, TQ_SLOT( slotDirlisterClearURL(const KURL&))); - connect( this, TQT_SIGNAL( redirection( const KURL& , const KURL& ) ), - this, TQT_SLOT( slotRedirect( const KURL&, const KURL& ))); + connect( this, TQ_SIGNAL( redirection( const KURL& , const KURL& ) ), + this, TQ_SLOT( slotRedirect( const KURL&, const KURL& ))); m_openChildrenURLs.append( url ); } diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp index 2710d4c08..e9c87f5b6 100644 --- a/tdeio/tdefile/tdefiletreeview.cpp +++ b/tdeio/tdefile/tdefiletreeview.cpp @@ -48,32 +48,32 @@ KFileTreeView::KFileTreeView( TQWidget *parent, const char *name ) setSelectionModeExt( TDEListView::Single ); m_animationTimer = new TQTimer( this ); - connect( m_animationTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAnimation() ) ); + connect( m_animationTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAnimation() ) ); m_currentBeforeDropItem = 0; m_dropItem = 0; m_autoOpenTimer = new TQTimer( this ); - connect( m_autoOpenTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoOpenFolder() ) ); + connect( m_autoOpenTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoOpenFolder() ) ); /* The executed-Slot only opens a path, while the expanded-Slot populates it */ - connect( this, TQT_SIGNAL( executed( TQListViewItem * ) ), - this, TQT_SLOT( slotExecuted( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( expanded ( TQListViewItem *) ), - this, TQT_SLOT( slotExpanded( TQListViewItem *) )); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem *) ), - this, TQT_SLOT( slotCollapsed( TQListViewItem* ))); + connect( this, TQ_SIGNAL( executed( TQListViewItem * ) ), + this, TQ_SLOT( slotExecuted( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded ( TQListViewItem *) ), + this, TQ_SLOT( slotExpanded( TQListViewItem *) )); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem *) ), + this, TQ_SLOT( slotCollapsed( TQListViewItem* ))); /* connections from the konqtree widget */ - connect( this, TQT_SIGNAL( selectionChanged() ), - this, TQT_SLOT( slotSelectionChanged() ) ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem * )), - this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), - this, TQT_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); + connect( this, TQ_SIGNAL( selectionChanged() ), + this, TQ_SLOT( slotSelectionChanged() ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem * )), + this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL(itemRenamed(TQListViewItem*, const TQString &, int)), + this, TQ_SLOT(slotItemRenamed(TQListViewItem*, const TQString &, int))); m_bDrag = false; @@ -375,12 +375,12 @@ KFileTreeBranch* KFileTreeView::addBranch( const KURL &path, const TQString& nam KFileTreeBranch *KFileTreeView::addBranch(KFileTreeBranch *newBranch) { - connect( newBranch, TQT_SIGNAL(populateFinished( KFileTreeViewItem* )), - this, TQT_SLOT( slotPopulateFinished( KFileTreeViewItem* ))); + connect( newBranch, TQ_SIGNAL(populateFinished( KFileTreeViewItem* )), + this, TQ_SLOT( slotPopulateFinished( KFileTreeViewItem* ))); - connect( newBranch, TQT_SIGNAL( newTreeViewItems( KFileTreeBranch*, + connect( newBranch, TQ_SIGNAL( newTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& )), - this, TQT_SLOT( slotNewTreeViewItems( KFileTreeBranch*, + this, TQ_SLOT( slotNewTreeViewItems( KFileTreeBranch*, const KFileTreeViewItemList& ))); m_branches.append( newBranch ); diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp index f171975d8..aa82344c1 100644 --- a/tdeio/tdefile/tdefileview.cpp +++ b/tdeio/tdefile/tdefileview.cpp @@ -90,20 +90,20 @@ KFileView::~KFileView() void KFileView::setParentView(KFileView *parent) { if ( parent ) { // pass all signals right to our parent - TQObject::connect(sig, TQT_SIGNAL( activatedMenu(const KFileItem *, + TQObject::connect(sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ) ), - parent->sig, TQT_SIGNAL( activatedMenu(const KFileItem *, + parent->sig, TQ_SIGNAL( activatedMenu(const KFileItem *, const TQPoint& ))); - TQObject::connect(sig, TQT_SIGNAL( dirActivated(const KFileItem *)), - parent->sig, TQT_SIGNAL( dirActivated(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( fileSelected(const KFileItem *)), - parent->sig, TQT_SIGNAL( fileSelected(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( fileHighlighted(const KFileItem *) ), - parent->sig,TQT_SIGNAL(fileHighlighted(const KFileItem*))); - TQObject::connect(sig, TQT_SIGNAL( sortingChanged( TQDir::SortSpec ) ), - parent->sig, TQT_SIGNAL(sortingChanged( TQDir::SortSpec))); - TQObject::connect(sig, TQT_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), - parent->sig, TQT_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&))); + TQObject::connect(sig, TQ_SIGNAL( dirActivated(const KFileItem *)), + parent->sig, TQ_SIGNAL( dirActivated(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( fileSelected(const KFileItem *)), + parent->sig, TQ_SIGNAL( fileSelected(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( fileHighlighted(const KFileItem *) ), + parent->sig,TQ_SIGNAL(fileHighlighted(const KFileItem*))); + TQObject::connect(sig, TQ_SIGNAL( sortingChanged( TQDir::SortSpec ) ), + parent->sig, TQ_SIGNAL(sortingChanged( TQDir::SortSpec))); + TQObject::connect(sig, TQ_SIGNAL( dropped(const KFileItem *, TQDropEvent*, const KURL::List&) ), + parent->sig, TQ_SIGNAL(dropped(const KFileItem *, TQDropEvent*, const KURL::List&))); } } diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp index ce7127d9e..9239d5f4d 100644 --- a/tdeio/tdefile/tests/kfdtest.cpp +++ b/tdeio/tdefile/tests/kfdtest.cpp @@ -10,7 +10,7 @@ KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name ) : TQObject( parent, name ), m_startDir( startDir ) { - TQTimer::singleShot( 1000, this, TQT_SLOT( doit() )); + TQTimer::singleShot( 1000, this, TQ_SLOT( doit() )); } void KFDTest::doit() diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp index da031eac2..1f3f2e67d 100644 --- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp +++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp @@ -45,14 +45,14 @@ testFrame::testFrame():TDEMainWindow(0,"Test FileTreeView"), /* Connect to see the status bar */ KStatusBar* sta = statusBar(); - connect( treeView, TQT_SIGNAL( onItem( const TQString& )), - sta, TQT_SLOT( message( const TQString& ))); + connect( treeView, TQ_SIGNAL( onItem( const TQString& )), + sta, TQ_SLOT( message( const TQString& ))); - connect( treeView, TQT_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )), - this, TQT_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& ))); + connect( treeView, TQ_SIGNAL( dropped( TQWidget*, TQDropEvent*, KURL::List& )), + this, TQ_SLOT( urlsDropped( TQWidget*, TQDropEvent*, KURL::List& ))); - connect( treeView, TQT_SIGNAL( dropped( KURL::List&, KURL& )), this, - TQT_SLOT( copyURLs( KURL::List&, KURL& ))); + connect( treeView, TQ_SIGNAL( dropped( KURL::List&, KURL& )), this, + TQ_SLOT( copyURLs( KURL::List&, KURL& ))); treeView->addColumn( "File" ); treeView->addColumn( "ChildCount" ); @@ -77,10 +77,10 @@ void testFrame::showPath( const KURL &url ) if( dirOnlyMode ) treeView->setDirOnlyMode( nb, true ); nb->setOpenPixmap( pixOpen ); - connect( nb, TQT_SIGNAL(populateFinished(KFileTreeViewItem*)), - this, TQT_SLOT(slotPopulateFinished(KFileTreeViewItem*))); - connect( nb, TQT_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )), - this, TQT_SLOT( slotSetChildCount( KFileTreeViewItem*, int ))); + connect( nb, TQ_SIGNAL(populateFinished(KFileTreeViewItem*)), + this, TQ_SLOT(slotPopulateFinished(KFileTreeViewItem*))); + connect( nb, TQ_SIGNAL( directoryChildCount( KFileTreeViewItem *, int )), + this, TQ_SLOT( slotSetChildCount( KFileTreeViewItem*, int ))); // nb->setChildRecurse(false ); nb->setOpen(true); diff --git a/tdeio/tdeio/chmodjob.cpp b/tdeio/tdeio/chmodjob.cpp index 24a5c247d..54d4aeab1 100644 --- a/tdeio/tdeio/chmodjob.cpp +++ b/tdeio/tdeio/chmodjob.cpp @@ -48,7 +48,7 @@ ChmodJob::ChmodJob( const KFileItemList& lstItems, int permissions, int mask, m_newOwner( newOwner ), m_newGroup( newGroup ), m_recursive( recursive ), m_lstItems( lstItems ) { - TQTimer::singleShot( 0, this, TQT_SLOT(processList()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(processList()) ); } void ChmodJob::processList() @@ -77,9 +77,9 @@ void ChmodJob::processList() { //kdDebug(7007) << "ChmodJob::processList dir -> listing" << endl; TDEIO::ListJob * listJob = TDEIO::listRecursive( item->url(), false /* no GUI */ ); - connect( listJob, TQT_SIGNAL(entries( TDEIO::Job *, + connect( listJob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( listJob ); return; // we'll come back later, when this one's finished diff --git a/tdeio/tdeio/connection.cpp b/tdeio/tdeio/connection.cpp index 5ae0f5685..8b21e3a0c 100644 --- a/tdeio/tdeio/connection.cpp +++ b/tdeio/tdeio/connection.cpp @@ -143,7 +143,7 @@ void Connection::init(TDESocket *sock) if ( m_suspended ) { suspend(); } - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } dequeue(); } @@ -159,7 +159,7 @@ void Connection::init(int _fd_in, int fd_out) if ( m_suspended ) { suspend(); } - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } dequeue(); } @@ -175,7 +175,7 @@ void Connection::connect(TQObject *_receiver, const char *_member) notifier = new TQSocketNotifier(fd_in, TQSocketNotifier::Read); if ( m_suspended ) suspend(); - TQObject::connect(notifier, TQT_SIGNAL(activated(int)), receiver, member); + TQObject::connect(notifier, TQ_SIGNAL(activated(int)), receiver, member); } } diff --git a/tdeio/tdeio/dataslave.cpp b/tdeio/tdeio/dataslave.cpp index 41a76efd1..46c230f06 100644 --- a/tdeio/tdeio/dataslave.cpp +++ b/tdeio/tdeio/dataslave.cpp @@ -62,7 +62,7 @@ DataSlave::DataSlave() : //kdDebug() << this << k_funcinfo << endl; _suspended = false; timer = new TQTimer(this); - connect(timer, TQT_SIGNAL(timeout()), TQT_SLOT(dispatchNext())); + connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(dispatchNext())); } DataSlave::~DataSlave() { diff --git a/tdeio/tdeio/defaultprogress.cpp b/tdeio/tdeio/defaultprogress.cpp index 77b1fc996..063d3e1c8 100644 --- a/tdeio/tdeio/defaultprogress.cpp +++ b/tdeio/tdeio/defaultprogress.cpp @@ -147,7 +147,7 @@ void DefaultProgress::init() topLayout->addWidget( line ); d->keepOpen = new TQCheckBox( i18n("&Keep this window open after transfer is complete"), this); - connect( d->keepOpen, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotKeepOpenToggled(bool) ) ); + connect( d->keepOpen, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotKeepOpenToggled(bool) ) ); topLayout->addWidget(d->keepOpen); d->keepOpen->hide(); @@ -155,20 +155,20 @@ void DefaultProgress::init() topLayout->addLayout(hBox); d->openFile = new KPushButton( i18n("Open &File"), this ); - connect( d->openFile, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenFile() ) ); + connect( d->openFile, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenFile() ) ); hBox->addWidget( d->openFile ); d->openFile->setEnabled(false); d->openFile->hide(); d->openLocation = new KPushButton( i18n("Open &Destination"), this ); - connect( d->openLocation, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOpenLocation() ) ); + connect( d->openLocation, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOpenLocation() ) ); hBox->addWidget( d->openLocation ); d->openLocation->hide(); hBox->addStretch(1); d->cancelClose = new KPushButton( KStdGuiItem::cancel(), this ); - connect( d->cancelClose, TQT_SIGNAL( clicked() ), TQT_SLOT( slotStop() ) ); + connect( d->cancelClose, TQ_SIGNAL( clicked() ), TQ_SLOT( slotStop() ) ); hBox->addWidget( d->cancelClose ); resize( sizeHint() ); diff --git a/tdeio/tdeio/forwardingslavebase.cpp b/tdeio/tdeio/forwardingslavebase.cpp index c4e4daa0c..66ab1202d 100644 --- a/tdeio/tdeio/forwardingslavebase.cpp +++ b/tdeio/tdeio/forwardingslavebase.cpp @@ -318,52 +318,52 @@ void ForwardingSlaveBase::connectJob(TDEIO::Job *job) kdDebug() << it.key() << " = " << it.data() << endl; #endif - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( slotResult(TDEIO::Job *) ) ); - connect( job, TQT_SIGNAL( warning(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( speed(TDEIO::Job *, unsigned long) ), - this, TQT_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( slotResult(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( warning(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotWarning(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( infoMessage(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotInfoMessage(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( totalSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotTotalSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( processedSize(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotProcessedSize(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( speed(TDEIO::Job *, unsigned long) ), + this, TQ_SLOT( slotSpeed(TDEIO::Job *, unsigned long) ) ); } void ForwardingSlaveBase::connectSimpleJob(TDEIO::SimpleJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( redirection(TDEIO::Job *, const KURL &) ), - this, TQT_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) ); + connect( job, TQ_SIGNAL( redirection(TDEIO::Job *, const KURL &) ), + this, TQ_SLOT( slotRedirection(TDEIO::Job *, const KURL &) ) ); } void ForwardingSlaveBase::connectListJob(TDEIO::ListJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), - this, TQT_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); + connect( job, TQ_SIGNAL( entries(TDEIO::Job *, const TDEIO::UDSEntryList &) ), + this, TQ_SLOT( slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &) ) ); } void ForwardingSlaveBase::connectTransferJob(TDEIO::TransferJob *job) { connectSimpleJob(job); - connect( job, TQT_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), - this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); - connect( job, TQT_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), - this, TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) ); - connect( job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) ); - connect( job, TQT_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ), - this, TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( data(TDEIO::Job *, const TQByteArray &) ), + this, TQ_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) ); + connect( job, TQ_SIGNAL( dataReq(TDEIO::Job *, TQByteArray &) ), + this, TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray &) ) ); + connect( job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype(TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( canResume(TDEIO::Job *, TDEIO::filesize_t) ), + this, TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t) ) ); } void ForwardingSlaveBase::connectLocalURLJob(TDEIO::LocalURLJob *job) { connectJob(job); - connect( job, TQT_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ), - this, TQT_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) ); + connect( job, TQ_SIGNAL( localURL(TDEIO::LocalURLJob *, const KURL&, bool) ), + this, TQ_SLOT( slotLocalURL(TDEIO::LocalURLJob *, const KURL&, bool) ) ); } ////////////////////////////////////////////////////////////////////////////// diff --git a/tdeio/tdeio/job.cpp b/tdeio/tdeio/job.cpp index 8bbbebc03..3418da6bc 100644 --- a/tdeio/tdeio/job.cpp +++ b/tdeio/tdeio/job.cpp @@ -137,16 +137,16 @@ Job::Job(bool showProgressInfo) : TQObject(__getJobRoot(), "job"), m_error(0), m addMetaData("progress-id", TQString::number(m_progressId)); //kdDebug(7007) << "Created job " << this << " with progress info -- m_progressId=" << m_progressId << endl; // Connect global progress info signals - connect( this, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ), - Observer::self(), TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) ); - connect( this, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - Observer::self(), TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( this, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString & ) ), + Observer::self(), TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString & ) ) ); + connect( this, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + Observer::self(), TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( this, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); } // Don't exit while this job is running if (kapp) @@ -185,15 +185,15 @@ void Job::addSubjob(Job *job, bool inheritMetaData) //kdDebug(7007) << "addSubjob(" << job << ") this = " << this << endl; subjobs.append(job); - connect( job, TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotResult(TDEIO::Job*)) ); + connect( job, TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotResult(TDEIO::Job*)) ); // Forward information from that subjob. - connect( job, TQT_SIGNAL(speed( TDEIO::Job*, unsigned long )), - TQT_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) ); + connect( job, TQ_SIGNAL(speed( TDEIO::Job*, unsigned long )), + TQ_SLOT(slotSpeed(TDEIO::Job*, unsigned long)) ); - connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), - TQT_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) ); + connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job*, const TQString & )), + TQ_SLOT(slotInfoMessage(TDEIO::Job*, const TQString &)) ); if (inheritMetaData) job->mergeMetaData(m_outgoingMetaData); @@ -240,7 +240,7 @@ void Job::emitSpeed( unsigned long bytes_per_second ) if ( !m_speedTimer ) { m_speedTimer = new TQTimer(); - connect( m_speedTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotSpeedTimeout() ) ); + connect( m_speedTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotSpeedTimeout() ) ); } emit speed( this, bytes_per_second ); m_speedTimer->start( 5000 ); // 5 seconds interval should be enough @@ -478,7 +478,7 @@ SimpleJob::SimpleJob(const KURL& url, int command, const TQByteArray &packedArgs kdDebug() << "ERR_MALFORMED_URL" << endl; m_error = ERR_MALFORMED_URL; m_errorText = m_url.url(); - TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) ); return; } } @@ -524,38 +524,38 @@ void SimpleJob::start(Slave *slave) { m_slave = slave; - connect( m_slave, TQT_SIGNAL( error( int , const TQString & ) ), - TQT_SLOT( slotError( int , const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( error( int , const TQString & ) ), + TQ_SLOT( slotError( int , const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( warning( const TQString & ) ), - TQT_SLOT( slotWarning( const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( warning( const TQString & ) ), + TQ_SLOT( slotWarning( const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( infoMessage( const TQString & ) ), - TQT_SLOT( slotInfoMessage( const TQString & ) ) ); + connect( m_slave, TQ_SIGNAL( infoMessage( const TQString & ) ), + TQ_SLOT( slotInfoMessage( const TQString & ) ) ); - connect( m_slave, TQT_SIGNAL( connected() ), - TQT_SLOT( slotConnected() ) ); + connect( m_slave, TQ_SIGNAL( connected() ), + TQ_SLOT( slotConnected() ) ); - connect( m_slave, TQT_SIGNAL( finished() ), - TQT_SLOT( slotFinished() ) ); + connect( m_slave, TQ_SIGNAL( finished() ), + TQ_SLOT( slotFinished() ) ); if ((extraFlags() & EF_TransferJobDataSent) == 0) { - connect( m_slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); + connect( m_slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); - connect( m_slave, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); + connect( m_slave, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); - connect( m_slave, TQT_SIGNAL( speed( unsigned long ) ), - TQT_SLOT( slotSpeed( unsigned long ) ) ); + connect( m_slave, TQ_SIGNAL( speed( unsigned long ) ), + TQ_SLOT( slotSpeed( unsigned long ) ) ); } - connect( slave, TQT_SIGNAL( needProgressId() ), - TQT_SLOT( slotNeedProgressId() ) ); + connect( slave, TQ_SIGNAL( needProgressId() ), + TQ_SLOT( slotNeedProgressId() ) ); - connect( slave, TQT_SIGNAL(metaData( const TDEIO::MetaData& ) ), - TQT_SLOT( slotMetaData( const TDEIO::MetaData& ) ) ); + connect( slave, TQ_SIGNAL(metaData( const TDEIO::MetaData& ) ), + TQ_SLOT( slotMetaData( const TDEIO::MetaData& ) ) ); if (m_window) { @@ -726,8 +726,8 @@ MkdirJob::MkdirJob( const KURL& url, int command, void MkdirJob::start(Slave *slave) { - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -847,8 +847,8 @@ LocalURLJob::LocalURLJob( const KURL& url, int command, void LocalURLJob::start(Slave *slave) { - connect( slave, TQT_SIGNAL( localURL(const KURL &, bool) ), - TQT_SLOT( slotLocalURL(const KURL &, bool) ) ); + connect( slave, TQ_SIGNAL( localURL(const KURL &, bool) ), + TQ_SLOT( slotLocalURL(const KURL &, bool) ) ); SimpleJob::start(slave); } @@ -888,10 +888,10 @@ void StatJob::start(Slave *slave) m_outgoingMetaData.replace( "statSide", m_bSource ? "source" : "dest" ); m_outgoingMetaData.replace( "details", TQString::number(m_details) ); - connect( slave, TQT_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ), - TQT_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( statEntry( const TDEIO::UDSEntry& ) ), + TQ_SLOT( slotStatEntry( const TDEIO::UDSEntry & ) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -1193,26 +1193,26 @@ void TransferJob::resume() void TransferJob::start(Slave *slave) { assert(slave); - connect( slave, TQT_SIGNAL( data( const TQByteArray & ) ), - TQT_SLOT( slotData( const TQByteArray & ) ) ); + connect( slave, TQ_SIGNAL( data( const TQByteArray & ) ), + TQ_SLOT( slotData( const TQByteArray & ) ) ); - connect( slave, TQT_SIGNAL( dataReq() ), - TQT_SLOT( slotDataReq() ) ); + connect( slave, TQ_SIGNAL( dataReq() ), + TQ_SLOT( slotDataReq() ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); - connect( slave, TQT_SIGNAL(mimeType( const TQString& ) ), - TQT_SLOT( slotMimetype( const TQString& ) ) ); + connect( slave, TQ_SIGNAL(mimeType( const TQString& ) ), + TQ_SLOT( slotMimetype( const TQString& ) ) ); - connect( slave, TQT_SIGNAL(errorPage() ), - TQT_SLOT( slotErrorPage() ) ); + connect( slave, TQ_SIGNAL(errorPage() ), + TQ_SLOT( slotErrorPage() ) ); - connect( slave, TQT_SIGNAL( needSubURLData() ), - TQT_SLOT( slotNeedSubURLData() ) ); + connect( slave, TQ_SIGNAL( needSubURLData() ), + TQ_SLOT( slotNeedSubURLData() ) ); - connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), - TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); if (slave->suspended()) { @@ -1231,8 +1231,8 @@ void TransferJob::slotNeedSubURLData() // Job needs data from subURL. m_subJob = TDEIO::get( m_subUrl, false, false); suspend(); // Put job on hold until we have some data. - connect(m_subJob, TQT_SIGNAL( data(TDEIO::Job*,const TQByteArray &)), - TQT_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &))); + connect(m_subJob, TQ_SIGNAL( data(TDEIO::Job*,const TQByteArray &)), + TQ_SLOT( slotSubURLData(TDEIO::Job*,const TQByteArray &))); addSubjob(m_subJob); } @@ -1425,7 +1425,7 @@ TransferJob *TDEIO::http_post( const KURL& url, const TQByteArray &postData, boo packedArgs, postData, showProgressInfo ); if (redirection) - TQTimer::singleShot(0, job, TQT_SLOT(slotPostRedirection()) ); + TQTimer::singleShot(0, job, TQ_SLOT(slotPostRedirection()) ); return job; } @@ -1458,10 +1458,10 @@ StoredTransferJob::StoredTransferJob(const KURL& url, int command, : TransferJob( url, command, packedArgs, _staticData, showProgressInfo ), m_uploadOffset( 0 ) { - connect( this, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( this, TQT_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), - TQT_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotStoredData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( this, TQ_SIGNAL( dataReq( TDEIO::Job *, TQByteArray & ) ), + TQ_SLOT( slotStoredDataReq( TDEIO::Job *, TQByteArray & ) ) ); } void StoredTransferJob::setData( const TQByteArray& arr ) @@ -1589,8 +1589,8 @@ DirectCopyJob::DirectCopyJob( const KURL& url, int command, void DirectCopyJob::start( Slave* slave ) { - connect( slave, TQT_SIGNAL(canResume( TDEIO::filesize_t ) ), - TQT_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL(canResume( TDEIO::filesize_t ) ), + TQ_SLOT( slotCanResume( TDEIO::filesize_t ) ) ); SimpleJob::start(slave); } @@ -1637,7 +1637,7 @@ FileCopyJob::FileCopyJob( const KURL& src, const KURL& dest, int permissions, d->m_delJob = 0; d->m_sourceSize = (TDEIO::filesize_t) -1; d->m_modificationTime = static_cast( -1 ); - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void FileCopyJob::slotStart() @@ -1731,8 +1731,8 @@ void FileCopyJob::startCopyJob(const KURL &slave_url) m_copyJob = new DirectCopyJob(slave_url, CMD_COPY, packedArgs, false); addSubjob( m_copyJob ); connectSubjob( m_copyJob ); - connect( m_copyJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_copyJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } void FileCopyJob::startRenameJob(const KURL &slave_url) @@ -1745,14 +1745,14 @@ void FileCopyJob::startRenameJob(const KURL &slave_url) void FileCopyJob::connectSubjob( SimpleJob * job ) { - connect( job, TQT_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )), - this, TQT_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) ); + connect( job, TQ_SIGNAL(totalSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQ_SLOT( slotTotalSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )), - this, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) ); + connect( job, TQ_SIGNAL(processedSize( TDEIO::Job*, TDEIO::filesize_t )), + this, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t)) ); - connect( job, TQT_SIGNAL(percent( TDEIO::Job*, unsigned long )), - this, TQT_SLOT( slotPercent(TDEIO::Job*, unsigned long)) ); + connect( job, TQ_SIGNAL(percent( TDEIO::Job*, unsigned long )), + this, TQ_SLOT( slotPercent(TDEIO::Job*, unsigned long)) ); } @@ -1800,10 +1800,10 @@ void FileCopyJob::startDataPump() // The first thing the put job will tell us is whether we can // resume or not (this is always emitted) - connect( m_putJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); - connect( m_putJob, TQT_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)), - TQT_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&))); + connect( m_putJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_putJob, TQ_SIGNAL(dataReq(TDEIO::Job *, TQByteArray&)), + TQ_SLOT( slotDataReq(TDEIO::Job *, TQByteArray&))); addSubjob( m_putJob ); } @@ -1862,8 +1862,8 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) m_getJob->addMetaData( "resume", TDEIO::number(offset) ); // Might or might not get emitted - connect( m_getJob, TQT_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), - TQT_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); + connect( m_getJob, TQ_SIGNAL(canResume(TDEIO::Job *, TDEIO::filesize_t)), + TQ_SLOT( slotCanResume(TDEIO::Job *, TDEIO::filesize_t))); } m_putJob->slave()->setOffset( offset ); @@ -1872,10 +1872,10 @@ void FileCopyJob::slotCanResume( TDEIO::Job* job, TDEIO::filesize_t offset ) connectSubjob( m_getJob ); // Progress info depends on get m_getJob->resume(); // Order a beer - connect( m_getJob, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - TQT_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) ); - connect( m_getJob, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ), - TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + connect( m_getJob, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + TQ_SLOT( slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( m_getJob, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&) ), + TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); } else // copyjob { @@ -2104,9 +2104,9 @@ void ListJob::slotListEntries( const TDEIO::UDSEntryList& list ) prefix + filename + "/", includeHidden); Scheduler::scheduleJob(job); - connect(job, TQT_SIGNAL(entries( TDEIO::Job *, + connect(job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( gotEntries( TDEIO::Job*, + TQ_SLOT( gotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob(job); } @@ -2239,15 +2239,15 @@ void ListJob::start(Slave *slave) { m_error = ERR_ACCESS_DENIED; m_errorText = m_url.url(); - TQTimer::singleShot(0, this, TQT_SLOT(slotFinished()) ); + TQTimer::singleShot(0, this, TQ_SLOT(slotFinished()) ); return; } - connect( slave, TQT_SIGNAL( listEntries( const TDEIO::UDSEntryList& )), - TQT_SLOT( slotListEntries( const TDEIO::UDSEntryList& ))); - connect( slave, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); - connect( slave, TQT_SIGNAL( redirection(const KURL &) ), - TQT_SLOT( slotRedirection(const KURL &) ) ); + connect( slave, TQ_SIGNAL( listEntries( const TDEIO::UDSEntryList& )), + TQ_SLOT( slotListEntries( const TDEIO::UDSEntryList& ))); + connect( slave, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::filesize_t ) ) ); + connect( slave, TQ_SIGNAL( redirection(const KURL &) ), + TQ_SLOT( slotRedirection(const KURL &) ) ); SimpleJob::start(slave); } @@ -2290,13 +2290,13 @@ CopyJob::CopyJob( const KURL::List& src, const KURL& dest, CopyMode mode, bool a d->m_globalDestinationState = destinationState; if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); } - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); /** States: STATE_STATING for the dest @@ -2327,7 +2327,7 @@ void CopyJob::slotStart() */ m_reportTimer = new TQTimer(this); - connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport())); + connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport())); m_reportTimer->start(REPORT_TIMEOUT,false); // Stat the dest @@ -2841,9 +2841,9 @@ void CopyJob::startListing( const KURL & src ) d->m_bURLDirty = true; ListJob * newjob = listRecursive( src, false ); newjob->setUnrestricted(true); - connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob( newjob ); } @@ -3548,10 +3548,10 @@ void CopyJob::copyNextFile() d->m_bURLDirty = true; } addSubjob(newjob); - connect( newjob, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - this, TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( newjob, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - this, TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( newjob, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( newjob, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + this, TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); } else { @@ -4031,29 +4031,29 @@ DeleteJob::DeleteJob( const KURL::List& src, bool /*shred*/, bool showProgressIn { if ( showProgressInfo ) { - connect( this, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - Observer::self(), TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + Observer::self(), TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); // See slotReport - /*connect( this, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + /*connect( this, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + m_observer, TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - m_observer, TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + connect( this, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + m_observer, TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - connect( this, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), - m_observer, TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/ + connect( this, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + m_observer, TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) );*/ m_reportTimer=new TQTimer(this); - connect(m_reportTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotReport())); + connect(m_reportTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotReport())); //this will update the report dialog with 5 Hz, I think this is fast enough, aleXXX m_reportTimer->start(REPORT_TIMEOUT,false); } - TQTimer::singleShot(0, this, TQT_SLOT(slotStart())); + TQTimer::singleShot(0, this, TQ_SLOT(slotStart())); } void DeleteJob::slotStart() @@ -4379,9 +4379,9 @@ void DeleteJob::slotResult( Job *job ) ListJob *newjob = listRecursive( url, false ); newjob->setUnrestricted(true); // No KIOSK restrictions Scheduler::scheduleJob(newjob); - connect(newjob, TQT_SIGNAL(entries( TDEIO::Job *, + connect(newjob, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList& )), - TQT_SLOT( slotEntries( TDEIO::Job*, + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ))); addSubjob(newjob); } else { diff --git a/tdeio/tdeio/jobclasses.h b/tdeio/tdeio/jobclasses.h index b1da73bf1..d83668f5b 100644 --- a/tdeio/tdeio/jobclasses.h +++ b/tdeio/tdeio/jobclasses.h @@ -50,8 +50,8 @@ namespace TDEIO { * * \code * TDEIO::Job * job = TDEIO::someoperation( some parameters ); - * connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - * this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + * connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + * this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); * \endcode * (other connects, specific to the job) * diff --git a/tdeio/tdeio/kautomount.cpp b/tdeio/tdeio/kautomount.cpp index c6fa72371..313c8e47b 100644 --- a/tdeio/tdeio/kautomount.cpp +++ b/tdeio/tdeio/kautomount.cpp @@ -39,7 +39,7 @@ KAutoMount::KAutoMount( bool _readonly, const TQString& _format, const TQString& m_bShowFilemanagerWindow = _show_filemanager_window; TDEIO::Job* job = TDEIO::mount( _readonly, _format.ascii(), _device, _mountpoint ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void KAutoMount::slotResult( TDEIO::Job * job ) @@ -81,7 +81,7 @@ KAutoUnmount::KAutoUnmount( const TQString & _mountpoint, const TQString & _desk : m_desktopFile( _desktopFile ), m_mountpoint( _mountpoint ) { TDEIO::Job * job = TDEIO::unmount( m_mountpoint ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void KAutoUnmount::slotResult( TDEIO::Job * job ) diff --git a/tdeio/tdeio/kdatatool.cpp b/tdeio/tdeio/kdatatool.cpp index 5ec790aa7..8d67808df 100644 --- a/tdeio/tdeio/kdatatool.cpp +++ b/tdeio/tdeio/kdatatool.cpp @@ -251,7 +251,7 @@ TQPtrList KDataToolAction::dataToolActionList( const TQValueListsetWindow( lister->d->window ); } - connect( job, TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ), - this, TQT_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ), - this, TQT_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ), + this, TQ_SLOT( slotEntries( TDEIO::Job *, const TDEIO::UDSEntryList & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( redirection( TDEIO::Job *, const KURL & ) ), + this, TQ_SLOT( slotRedirection( TDEIO::Job *, const KURL & ) ) ); emit lister->started( _url ); @@ -608,10 +608,10 @@ void KDirListerCache::updateDirectory( const KURL& _dir ) job = TDEIO::listDir( _dir, false /* no default GUI */ ); jobs.insert( job, TQValueList() ); - connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); + connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) ); kdDebug(7004) << k_funcinfo << "update started in " << _dir << endl; @@ -925,7 +925,7 @@ void KDirListerCache::slotFileDirty( const KURL& _url ) { // Nice hack to save memory: use the qt object name to store the filename TQTimer *timer = new TQTimer( this, _url.path().utf8() ); - connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFileDirtyDelayed()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotFileDirtyDelayed()) ); pendingUpdates.insert( _url.path(), timer ); timer->start( 500, true ); } @@ -1357,10 +1357,10 @@ void KDirListerCache::slotRedirection( TDEIO::Job *j, const KURL& url ) // make the job an update job job->disconnect( this ); - connect( job, TQT_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), - this, TQT_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotUpdateResult( TDEIO::Job * )) ); + connect( job, TQ_SIGNAL(entries( TDEIO::Job *, const TDEIO::UDSEntryList & )), + this, TQ_SLOT(slotUpdateEntries( TDEIO::Job *, const TDEIO::UDSEntryList & )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotUpdateResult( TDEIO::Job * )) ); // FIXME: autoUpdate-Counts!! @@ -1953,8 +1953,8 @@ bool KDirLister::openURL( const KURL& _url, bool _keep, bool _reload ) d->openURL_url[localURLJob] = _url; d->openURL_keep[localURLJob] = _keep; d->openURL_reload[localURLJob] = _reload; - connect(localURLJob, TQT_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQT_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); - connect(localURLJob, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotLocalURLKIODestroyed())); + connect(localURLJob, TQ_SIGNAL(localURL(TDEIO::LocalURLJob*, const KURL&, bool)), this, TQ_SLOT(slotOpenURLGotLocalURL(TDEIO::LocalURLJob*, const KURL&, bool))); + connect(localURLJob, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotLocalURLKIODestroyed())); } return true; } @@ -2641,16 +2641,16 @@ void KDirLister::jobStarted( TDEIO::ListJob *job ) void KDirLister::connectJob( TDEIO::ListJob *job ) { - connect( job, TQT_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )), - this, TQT_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) ); - connect( job, TQT_SIGNAL(percent( TDEIO::Job *, unsigned long )), - this, TQT_SLOT(slotPercent( TDEIO::Job *, unsigned long )) ); - connect( job, TQT_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )), - this, TQT_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) ); - connect( job, TQT_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )), - this, TQT_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) ); - connect( job, TQT_SIGNAL(speed( TDEIO::Job *, unsigned long )), - this, TQT_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) ); + connect( job, TQ_SIGNAL(infoMessage( TDEIO::Job *, const TQString& )), + this, TQ_SLOT(slotInfoMessage( TDEIO::Job *, const TQString& )) ); + connect( job, TQ_SIGNAL(percent( TDEIO::Job *, unsigned long )), + this, TQ_SLOT(slotPercent( TDEIO::Job *, unsigned long )) ); + connect( job, TQ_SIGNAL(totalSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQ_SLOT(slotTotalSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQ_SIGNAL(processedSize( TDEIO::Job *, TDEIO::filesize_t )), + this, TQ_SLOT(slotProcessedSize( TDEIO::Job *, TDEIO::filesize_t )) ); + connect( job, TQ_SIGNAL(speed( TDEIO::Job *, unsigned long )), + this, TQ_SLOT(slotSpeed( TDEIO::Job *, unsigned long )) ); } void KDirLister::emitCompleted( const KURL& _url ) diff --git a/tdeio/tdeio/kdirwatch.cpp b/tdeio/tdeio/kdirwatch.cpp index c87558e1d..680b18cab 100644 --- a/tdeio/tdeio/kdirwatch.cpp +++ b/tdeio/tdeio/kdirwatch.cpp @@ -226,7 +226,7 @@ KDirWatchPrivate::KDirWatchPrivate() : rescan_timer(0, "KDirWatchPrivate::rescan_timer") { timer = new TQTimer(this, "KDirWatchPrivate::timer"); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); freq = 3600000; // 1 hour as upper bound statEntries = 0; delayRemove = false; @@ -240,7 +240,7 @@ KDirWatchPrivate::KDirWatchPrivate() // used for FAM and DNOTIFY rescan_all = false; - connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan())); + connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan())); #ifdef HAVE_FAM // It's possible that FAM server can't be started @@ -249,8 +249,8 @@ KDirWatchPrivate::KDirWatchPrivate() use_fam=true; sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc), TQSocketNotifier::Read, this); - connect( sn, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(famEventReceived()) ); + connect( sn, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(famEventReceived()) ); } else { kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl; @@ -286,7 +286,7 @@ KDirWatchPrivate::KDirWatchPrivate() fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this ); - connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) ); + connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) ); } #endif @@ -320,7 +320,7 @@ KDirWatchPrivate::KDirWatchPrivate() fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL)); fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL)); mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this); - connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated())); + connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated())); // Install the signal handler only once if ( dnotify_signal == 0 ) { @@ -1420,7 +1420,7 @@ void KDirWatchPrivate::slotRescan() timer->start(freq); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } bool KDirWatchPrivate::isNoisyFile( const char * filename ) @@ -1469,7 +1469,7 @@ void KDirWatchPrivate::famEventReceived() checkFAMEvent(&fe); } - TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed())); } void KDirWatchPrivate::checkFAMEvent(FAMEvent* fe) diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp index 758cd4940..b8bbf9679 100644 --- a/tdeio/tdeio/kmimetypechooser.cpp +++ b/tdeio/tdeio/kmimetypechooser.cpp @@ -93,12 +93,12 @@ KMimeTypeChooser::KMimeTypeChooser( const TQString &text, ((TQBoxLayout*)btns->layout())->addStretch(1); d->btnEditMimeType = new TQPushButton( i18n("&Edit..."), btns ); - connect( d->btnEditMimeType, TQT_SIGNAL(clicked()), this, TQT_SLOT(editMimeType()) ); + connect( d->btnEditMimeType, TQ_SIGNAL(clicked()), this, TQ_SLOT(editMimeType()) ); d->btnEditMimeType->setEnabled( false ); - connect( d->lvMimeTypes, TQT_SIGNAL( doubleClicked ( TQListViewItem * )), - this, TQT_SLOT( editMimeType())); - connect( d->lvMimeTypes, TQT_SIGNAL(currentChanged(TQListViewItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListViewItem*)) ); + connect( d->lvMimeTypes, TQ_SIGNAL( doubleClicked ( TQListViewItem * )), + this, TQ_SLOT( editMimeType())); + connect( d->lvMimeTypes, TQ_SIGNAL(currentChanged(TQListViewItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListViewItem*)) ); TQWhatsThis::add( d->btnEditMimeType, i18n( "Click this button to display the familiar TDE mime type editor.") ); @@ -193,8 +193,8 @@ void KMimeTypeChooser::editMimeType() return; TQString mt = (d->lvMimeTypes->currentItem()->parent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 ); // thanks to libkonq/konq_operations.cpp - connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()), - this, TQT_SLOT(slotSycocaDatabaseChanged()) ); + connect( KSycoca::self(), TQ_SIGNAL(databaseChanged()), + this, TQ_SLOT(slotSycocaDatabaseChanged()) ); TQString keditfiletype = TQString::fromLatin1("keditfiletype"); KRun::runCommand( keditfiletype + " --parent " + TQString::number( (ulong)topLevelWidget()->winId()) diff --git a/tdeio/tdeio/kmimetyperesolver.h b/tdeio/tdeio/kmimetyperesolver.h index b36d1ffb2..b0a6d7f9e 100644 --- a/tdeio/tdeio/kmimetyperesolver.h +++ b/tdeio/tdeio/kmimetyperesolver.h @@ -56,12 +56,12 @@ public: : m_resolver( resolver ), m_timer( new TQTimer( this ) ) { - connect( m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotProcessMimeIcons() )); + connect( m_timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotProcessMimeIcons() )); - connect( view->horizontalScrollBar(), TQT_SIGNAL( sliderMoved(int) ), - TQT_SLOT( slotAdjust() ) ); - connect( view->verticalScrollBar(), TQT_SIGNAL( sliderMoved(int) ), - TQT_SLOT( slotAdjust() ) ); + connect( view->horizontalScrollBar(), TQ_SIGNAL( sliderMoved(int) ), + TQ_SLOT( slotAdjust() ) ); + connect( view->verticalScrollBar(), TQ_SIGNAL( sliderMoved(int) ), + TQ_SLOT( slotAdjust() ) ); view->viewport()->installEventFilter( this ); } diff --git a/tdeio/tdeio/knfsshare.cpp b/tdeio/tdeio/knfsshare.cpp index b4a3d903a..b72a94318 100644 --- a/tdeio/tdeio/knfsshare.cpp +++ b/tdeio/tdeio/knfsshare.cpp @@ -162,8 +162,8 @@ KNFSShare::KNFSShare() { d = new KNFSSharePrivate(); if (TQFile::exists(d->exportsFile)) { KDirWatch::self()->addFile(d->exportsFile); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString&))); } } diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp index ca08c9d85..909594c1e 100644 --- a/tdeio/tdeio/krun.cpp +++ b/tdeio/tdeio/krun.cpp @@ -918,7 +918,7 @@ void KRun::init ( const KURL& url, TQWidget* window, const TQCString& asn, mode_ // loop and do initialization afterwards. // Reason: We must complete the constructor before we do anything else. m_bInit = true; - connect( &m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotTimeout() ) ); + connect( &m_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) ); m_timer.start( 0, true ); kdDebug(7010) << " new KRun " << this << " " << url.prettyURL() << " timer=" << &m_timer << endl; @@ -1109,8 +1109,8 @@ void KRun::init() // It may be a directory or a file, let's stat TDEIO::StatJob *job = TDEIO::stat( m_strURL, true, 0 /* no details */, m_bProgressInfo ); job->setWindow (d->m_window); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; kdDebug(7010) << " Job " << job << " is about stating " << m_strURL.url() << endl; } @@ -1158,10 +1158,10 @@ void KRun::scanFile() TDEIO::TransferJob *job = TDEIO::get( m_strURL, false /*reload*/, m_bProgressInfo ); job->setWindow (d->m_window); - connect(job, TQT_SIGNAL( result(TDEIO::Job *)), - this, TQT_SLOT( slotScanFinished(TDEIO::Job *))); - connect(job, TQT_SIGNAL( mimetype(TDEIO::Job *, const TQString &)), - this, TQT_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &))); + connect(job, TQ_SIGNAL( result(TDEIO::Job *)), + this, TQ_SLOT( slotScanFinished(TDEIO::Job *))); + connect(job, TQ_SIGNAL( mimetype(TDEIO::Job *, const TQString &)), + this, TQ_SLOT( slotScanMimeType(TDEIO::Job *, const TQString &))); m_job = job; kdDebug(7010) << " Job " << job << " is about getting from " << m_strURL.url() << endl; } @@ -1341,8 +1341,8 @@ void KRun::foundMimeType( const TQString& type ) // (For instance a tar.gz is a directory contained inside a file) // It may be a directory or a file, let's stat TDEIO::StatJob *job = TDEIO::stat( m_strURL, m_bProgressInfo ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( slotStatResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( slotStatResult( TDEIO::Job * ) ) ); m_job = job; return; @@ -1485,8 +1485,8 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName ) binName( _binName ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + process_, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) @@ -1501,8 +1501,8 @@ TDEProcessRunner::TDEProcessRunner(TDEProcess * p, const TQString & _binName, co id_( id ) { TQObject::connect( - process_, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(slotProcessExited(TDEProcess *))); + process_, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(slotProcessExited(TDEProcess *))); process_->start(); if ( !process_->pid() ) diff --git a/tdeio/tdeio/ksambashare.cpp b/tdeio/tdeio/ksambashare.cpp index 608594ee5..d209812dd 100644 --- a/tdeio/tdeio/ksambashare.cpp +++ b/tdeio/tdeio/ksambashare.cpp @@ -181,8 +181,8 @@ KSambaShare::KSambaShare() { if (TQFile::exists(d->smbConf)) { KDirWatch::self()->addFile(d->smbConf); KDirWatch::self()->addFile(FILESHARECONF); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString&))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString&))); } } diff --git a/tdeio/tdeio/kscan.h b/tdeio/tdeio/kscan.h index eb9ab9116..cfc70e08a 100644 --- a/tdeio/tdeio/kscan.h +++ b/tdeio/tdeio/kscan.h @@ -43,8 +43,8 @@ class TQImage; * if ( !m_scanDialog ) // no scanning support installed? * return; * - * connect( m_scanDialog, TQT_SIGNAL( finalImage( const TQImage&, int )), - * TQT_SLOT( slotScanned( const TQImage&, int ) )); + * connect( m_scanDialog, TQ_SIGNAL( finalImage( const TQImage&, int )), + * TQ_SLOT( slotScanned( const TQImage&, int ) )); * } * * if ( m_scanDialog->setup() ) // only if scanner configured/available diff --git a/tdeio/tdeio/kservice.cpp b/tdeio/tdeio/kservice.cpp index 3f431cb2c..74df1a6b1 100644 --- a/tdeio/tdeio/kservice.cpp +++ b/tdeio/tdeio/kservice.cpp @@ -927,7 +927,7 @@ void KService::rebuildKSycoca(TQWidget *parent) DCOPClient *client = kapp->dcopClient(); int result = client->callAsync("kded", "tdebuildsycoca", "recreate()", - data, &dlg, TQT_SLOT(slotFinished())); + data, &dlg, TQ_SLOT(slotFinished())); if (result) { @@ -939,7 +939,7 @@ KServiceProgressDialog::KServiceProgressDialog(TQWidget *parent, const char *nam const TQString &caption, const TQString &text) : KProgressDialog(parent, name, caption, text, true) { - connect(&m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotProgress())); + connect(&m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotProgress())); progressBar()->setTotalSteps(20); m_timeStep = 700; m_timer.start(m_timeStep); @@ -968,7 +968,7 @@ KServiceProgressDialog::slotFinished() { progressBar()->setProgress(20); m_timer.stop(); - TQTimer::singleShot(1000, this, TQT_SLOT(close())); + TQTimer::singleShot(1000, this, TQ_SLOT(close())); } #include "kservice_p.moc" diff --git a/tdeio/tdeio/kurlcompletion.cpp b/tdeio/tdeio/kurlcompletion.cpp index f7d095ced..1bbac7cfe 100644 --- a/tdeio/tdeio/kurlcompletion.cpp +++ b/tdeio/tdeio/kurlcompletion.cpp @@ -1333,12 +1333,12 @@ void KURLCompletion::slotIOFinished( TDEIO::Job * job ) assert( d->list_job ); connect( d->list_job, - TQT_SIGNAL(result(TDEIO::Job*)), - TQT_SLOT(slotIOFinished(TDEIO::Job*)) ); + TQ_SIGNAL(result(TDEIO::Job*)), + TQ_SLOT(slotIOFinished(TDEIO::Job*)) ); connect( d->list_job, - TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) ); + TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&)) ); delete kurl; } diff --git a/tdeio/tdeio/metainfojob.cpp b/tdeio/tdeio/metainfojob.cpp index 4f0721492..e00c262c8 100644 --- a/tdeio/tdeio/metainfojob.cpp +++ b/tdeio/tdeio/metainfojob.cpp @@ -61,7 +61,7 @@ MetaInfoJob::MetaInfoJob(const KFileItemList &items, bool deleteItems) // Return to event loop first, determineNextFile() might delete this; // (no idea what that means, it comes from previewjob) - TQTimer::singleShot(0, this, TQT_SLOT(start())); + TQTimer::singleShot(0, this, TQ_SLOT(start())); } MetaInfoJob::~MetaInfoJob() @@ -130,8 +130,8 @@ void MetaInfoJob::getMetaInfo() TDEIO::TransferJob* job = TDEIO::get(URL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), - this, TQT_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), + this, TQ_SLOT(slotMetaInfo(TDEIO::Job *, const TQByteArray &))); job->addMetaData("mimeType", d->currentItem->current()->mimetype()); } diff --git a/tdeio/tdeio/netaccess.cpp b/tdeio/tdeio/netaccess.cpp index 05aec6743..da141e3ae 100644 --- a/tdeio/tdeio/netaccess.cpp +++ b/tdeio/tdeio/netaccess.cpp @@ -316,8 +316,8 @@ bool NetAccess::filecopyInternal(const KURL& src, const KURL& target, int permis ? TDEIO::file_move( src, target, permissions, overwrite, resume ) : TDEIO::file_copy( src, target, permissions, overwrite, resume ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -332,8 +332,8 @@ bool NetAccess::dircopyInternal(const KURL::List& src, const KURL& target, ? TDEIO::move( src, target ) : TDEIO::copy( src, target ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; @@ -347,8 +347,8 @@ bool NetAccess::statInternal( const KURL & url, int details, bool source, job->setWindow (window); job->setDetails( details ); job->setSide( source ); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -358,8 +358,8 @@ KURL NetAccess::localURLInternal( const KURL & url, TQWidget* window ) m_localURL = url; TDEIO::LocalURLJob* job = TDEIO::localURL(url); job->setWindow (window); - connect(job, TQT_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ), - this, TQT_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) )); + connect(job, TQ_SIGNAL( localURL(TDEIO::Job*, const KURL&, bool) ), + this, TQ_SLOT( slotLocalURL(TDEIO::Job*, const KURL&, bool) )); enter_loop(); return m_localURL; } @@ -369,8 +369,8 @@ bool NetAccess::delInternal( const KURL & url, TQWidget* window ) bJobOK = true; // success unless further error occurs TDEIO::Job * job = TDEIO::del( url ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -381,8 +381,8 @@ bool NetAccess::mkdirInternal( const KURL & url, int permissions, bJobOK = true; // success unless further error occurs TDEIO::Job * job = TDEIO::mkdir( url, permissions ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); return bJobOK; } @@ -393,10 +393,10 @@ TQString NetAccess::mimetypeInternal( const KURL & url, TQWidget* window ) m_mimetype = TQString::fromLatin1("unknown"); TDEIO::Job * job = TDEIO::mimetype( url ); job->setWindow (window); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); - connect( job, TQT_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ), - this, TQT_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( mimetype (TDEIO::Job *, const TQString &) ), + this, TQ_SLOT( slotMimetype (TDEIO::Job *, const TQString &) ) ); enter_loop(); return m_mimetype; } @@ -437,8 +437,8 @@ TQString NetAccess::fish_executeInternal(const KURL & url, const TQString comman TDEIO::Job * job = TDEIO::special( tempPathUrl, packedArgs, true ); job->setWindow( window ); - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); enter_loop(); // since the TDEIO::special does not provide feedback we need to download the result @@ -482,21 +482,21 @@ bool NetAccess::synchronousRunInternal( Job* job, TQWidget* window, TQByteArray* } } - connect( job, TQT_SIGNAL( result (TDEIO::Job *) ), - this, TQT_SLOT( slotResult (TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result (TDEIO::Job *) ), + this, TQ_SLOT( slotResult (TDEIO::Job *) ) ); TQMetaObject *meta = job->metaObject(); static const char dataSignal[] = "data(TDEIO::Job*,const " "TQByteArray" "&)"; if ( meta->findSignal( dataSignal ) != -1 ) { - connect( job, TQT_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), - this, TQT_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); + connect( job, TQ_SIGNAL(data(TDEIO::Job*,const TQByteArray&)), + this, TQ_SLOT(slotData(TDEIO::Job*,const TQByteArray&)) ); } static const char redirSignal[] = "redirection(TDEIO::Job*,const KURL&)"; if ( meta->findSignal( redirSignal ) != -1 ) { - connect( job, TQT_SIGNAL(redirection(TDEIO::Job*,const KURL&)), - this, TQT_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) ); + connect( job, TQ_SIGNAL(redirection(TDEIO::Job*,const KURL&)), + this, TQ_SLOT(slotRedirection(TDEIO::Job*, const KURL&)) ); } enter_loop(); diff --git a/tdeio/tdeio/passdlg.cpp b/tdeio/tdeio/passdlg.cpp index c0109f3cf..63c13ff22 100644 --- a/tdeio/tdeio/passdlg.cpp +++ b/tdeio/tdeio/passdlg.cpp @@ -148,13 +148,13 @@ void PasswordDialog::init( const TQString& prompt, const TQString& user, d->keepCheckBox->setFixedSize( d->keepCheckBox->sizeHint() ); d->keep = cfg->readBoolEntry("Keep", false ); d->keepCheckBox->setChecked( d->keep ); - connect(d->keepCheckBox, TQT_SIGNAL(toggled( bool )), TQT_SLOT(slotKeep( bool ))); + connect(d->keepCheckBox, TQ_SIGNAL(toggled( bool )), TQ_SLOT(slotKeep( bool ))); d->layout->addWidget( hbox, 8, 2 ); } // Configure necessary key-bindings and connect necessar slots and signals - connect( d->userEdit, TQT_SIGNAL(returnPressed()), d->passEdit, TQT_SLOT(setFocus()) ); - connect( d->passEdit, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotOk()) ); + connect( d->userEdit, TQ_SIGNAL(returnPressed()), d->passEdit, TQ_SLOT(setFocus()) ); + connect( d->passEdit, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotOk()) ); if ( !user.isEmpty() ) { @@ -315,8 +315,8 @@ void PasswordDialog::setKnownLogins( const TQMap& knownLogin d->userEditCombo->insertStringList( knownLogins.keys() ); d->userEditCombo->setFocus(); - connect( d->userEditCombo, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( slotActivated( const TQString& ) ) ); + connect( d->userEditCombo, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( slotActivated( const TQString& ) ) ); } void PasswordDialog::slotActivated( const TQString& userName ) diff --git a/tdeio/tdeio/pastedialog.cpp b/tdeio/tdeio/pastedialog.cpp index d95cc7e88..61fb12c48 100644 --- a/tdeio/tdeio/pastedialog.cpp +++ b/tdeio/tdeio/pastedialog.cpp @@ -53,17 +53,17 @@ TDEIO::PasteDialog::PasteDialog( const TQString &caption, const TQString &label, layout->addStretch(); - //connect( m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - // TQT_SLOT( slotEditTextChanged( const TQString & ) ) ); - //connect( this, TQT_SIGNAL( user1Clicked() ), m_lineEdit, TQT_SLOT( clear() ) ); + //connect( m_lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + // TQ_SLOT( slotEditTextChanged( const TQString & ) ) ); + //connect( this, TQ_SIGNAL( user1Clicked() ), m_lineEdit, TQ_SLOT( clear() ) ); //slotEditTextChanged( value ); setMinimumWidth( 350 ); m_clipboardChanged = false; if ( clipboard ) - connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ), - this, TQT_SLOT( slotClipboardDataChanged() ) ); + connect( TQApplication::clipboard(), TQ_SIGNAL( dataChanged() ), + this, TQ_SLOT( slotClipboardDataChanged() ) ); } void TDEIO::PasteDialog::slotClipboardDataChanged() diff --git a/tdeio/tdeio/previewjob.cpp b/tdeio/tdeio/previewjob.cpp index 38ee74ac2..d1820a69e 100644 --- a/tdeio/tdeio/previewjob.cpp +++ b/tdeio/tdeio/previewjob.cpp @@ -139,7 +139,7 @@ PreviewJob::PreviewJob( const KFileItemList &items, int width, int height, d->ignoreMaximumSize = false; // Return to event loop first, determineNextFile() might delete this; - connect(&d->startPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startPreview()) ); + connect(&d->startPreviewTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startPreview()) ); d->startPreviewTimer.start(0, true); } @@ -450,7 +450,7 @@ void PreviewJob::createThumbnail( TQString pixPath ) thumbURL.setPath(pixPath); TDEIO::TransferJob *job = TDEIO::get(thumbURL, false, false); addSubjob(job); - connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQT_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); + connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), TQ_SLOT(slotThumbData(TDEIO::Job *, const TQByteArray &))); bool save = d->bSave && d->currentItem.plugin->property("CacheThumbnail").toBool(); job->addMetaData("mimeType", d->currentItem.item->mimetype()); job->addMetaData("width", TQString().setNum(save ? d->cacheWidth : d->width)); diff --git a/tdeio/tdeio/progressbase.cpp b/tdeio/tdeio/progressbase.cpp index 146f4182e..608213c6a 100644 --- a/tdeio/tdeio/progressbase.cpp +++ b/tdeio/tdeio/progressbase.cpp @@ -37,14 +37,14 @@ ProgressBase::ProgressBase( TQWidget *parent ) void ProgressBase::setJob( TDEIO::Job *job ) { // first connect all slots - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; @@ -54,37 +54,37 @@ void ProgressBase::setJob( TDEIO::Job *job ) void ProgressBase::setJob( TDEIO::CopyJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ), - TQT_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) ); - connect( job, TQT_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( copying( TDEIO::Job*, const KURL& , const KURL& ) ), + TQ_SLOT( slotCopying( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQ_SIGNAL( moving( TDEIO::Job*, const KURL& , const KURL& ) ), + TQ_SLOT( slotMoving( TDEIO::Job*, const KURL&, const KURL& ) ) ); + connect( job, TQ_SIGNAL( creatingDir( TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotCreatingDir( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; @@ -94,33 +94,33 @@ void ProgressBase::setJob( TDEIO::CopyJob *job ) void ProgressBase::setJob( TDEIO::DeleteJob *job ) { // first connect all slots - connect( job, TQT_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), - TQT_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); - connect( job, TQT_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), - TQT_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); - - connect( job, TQT_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), - TQT_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) ); - - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); - - connect( job, TQT_SIGNAL( canceled( TDEIO::Job* ) ), - TQT_SLOT( slotFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( totalSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotTotalSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( totalFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( totalDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotTotalDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( processedSize( TDEIO::Job*, TDEIO::filesize_t ) ), + TQ_SLOT( slotProcessedSize( TDEIO::Job*, TDEIO::filesize_t ) ) ); + connect( job, TQ_SIGNAL( processedFiles( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedFiles( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( processedDirs( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotProcessedDirs( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( speed( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotSpeed( TDEIO::Job*, unsigned long ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job*, unsigned long ) ), + TQ_SLOT( slotPercent( TDEIO::Job*, unsigned long ) ) ); + + connect( job, TQ_SIGNAL( deleting( TDEIO::Job*, const KURL& ) ), + TQ_SLOT( slotDeleting( TDEIO::Job*, const KURL& ) ) ); + + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); + + connect( job, TQ_SIGNAL( canceled( TDEIO::Job* ) ), + TQ_SLOT( slotFinished( TDEIO::Job* ) ) ); // then assign job m_pJob = job; diff --git a/tdeio/tdeio/renamedlg.cpp b/tdeio/tdeio/renamedlg.cpp index c41c94a00..37e8ba385 100644 --- a/tdeio/tdeio/renamedlg.cpp +++ b/tdeio/tdeio/renamedlg.cpp @@ -113,42 +113,42 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, setCaption( _caption ); d->bCancel = new KPushButton( KStdGuiItem::cancel(), this ); - connect(d->bCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed())); + connect(d->bCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed())); if ( ! (_mode & M_NORENAME ) ) { d->bRename = new TQPushButton( i18n( "&Rename" ), this ); d->bRename->setEnabled(false); d->bSuggestNewName = new TQPushButton( i18n( "Suggest New &Name" ), this ); - connect(d->bSuggestNewName, TQT_SIGNAL(clicked()), this, TQT_SLOT(b8Pressed())); - connect(d->bRename, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed())); + connect(d->bSuggestNewName, TQ_SIGNAL(clicked()), this, TQ_SLOT(b8Pressed())); + connect(d->bRename, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed())); } if ( ( _mode & M_MULTI ) && ( _mode & M_SKIP ) ) { d->bSkip = new TQPushButton( i18n( "&Skip" ), this ); - connect(d->bSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed())); + connect(d->bSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed())); d->bAutoSkip = new TQPushButton( i18n( "&Auto Skip" ), this ); - connect(d->bAutoSkip, TQT_SIGNAL(clicked()), this, TQT_SLOT(b3Pressed())); + connect(d->bAutoSkip, TQ_SIGNAL(clicked()), this, TQ_SLOT(b3Pressed())); } if ( _mode & M_OVERWRITE ) { d->bOverwrite = new TQPushButton( i18n( "&Overwrite" ), this ); - connect(d->bOverwrite, TQT_SIGNAL(clicked()), this, TQT_SLOT(b4Pressed())); + connect(d->bOverwrite, TQ_SIGNAL(clicked()), this, TQ_SLOT(b4Pressed())); if ( _mode & M_MULTI ) { d->bOverwriteAll = new TQPushButton( i18n( "O&verwrite All" ), this ); - connect(d->bOverwriteAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b5Pressed())); + connect(d->bOverwriteAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b5Pressed())); } } if ( _mode & M_RESUME ) { d->bResume = new TQPushButton( i18n( "&Resume" ), this ); - connect(d->bResume, TQT_SIGNAL(clicked()), this, TQT_SLOT(b6Pressed())); + connect(d->bResume, TQ_SIGNAL(clicked()), this, TQ_SLOT(b6Pressed())); if ( _mode & M_MULTI ) { d->bResumeAll = new TQPushButton( i18n( "R&esume All" ), this ); - connect(d->bResumeAll, TQT_SIGNAL(clicked()), this, TQT_SLOT(b7Pressed())); + connect(d->bResumeAll, TQ_SIGNAL(clicked()), this, TQ_SLOT(b7Pressed())); } } @@ -325,8 +325,8 @@ RenameDlg::RenameDlg(TQWidget *parent, const TQString & _caption, TQString fileName = d->dest.fileName(); d->m_pLineEdit->setText( TDEIO::decodeFileName( fileName ) ); if ( d->bRename || d->bOverwrite ) - connect(d->m_pLineEdit, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(enableRenameButton(const TQString &))); + connect(d->m_pLineEdit, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(enableRenameButton(const TQString &))); if ( d->bSuggestNewName ) { layout2->addWidget( d->bSuggestNewName ); diff --git a/tdeio/tdeio/scheduler.cpp b/tdeio/tdeio/scheduler.cpp index 77e6eed99..30c2d8375 100644 --- a/tdeio/tdeio/scheduler.cpp +++ b/tdeio/tdeio/scheduler.cpp @@ -139,9 +139,9 @@ Scheduler::Scheduler() extraJobData = new ExtraJobData; sessionData = new SessionData; slaveConfig = SlaveConfig::self(); - connect(&slaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(startStep())); - connect(&coSlaveTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotScheduleCoSlave())); - connect(&cleanupTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotCleanIdleSlaves())); + connect(&slaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(startStep())); + connect(&coSlaveTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotScheduleCoSlave())); + connect(&cleanupTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotCleanIdleSlaves())); busy = false; } @@ -541,15 +541,15 @@ Slave *Scheduler::createSlave(ProtocolInfo *protInfo, SimpleJob *job, const KURL { slaveList->append(slave); idleSlaves->append(slave); - connect(slave, TQT_SIGNAL(slaveDied(TDEIO::Slave *)), - TQT_SLOT(slotSlaveDied(TDEIO::Slave *))); - connect(slave, TQT_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), - TQT_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); - - connect(slave,TQT_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)), - sessionData,TQT_SLOT(slotAuthData(const TQCString&, const TQCString&, bool))); - connect(slave,TQT_SIGNAL(delAuthorization(const TQCString&)), sessionData, - TQT_SLOT(slotDelAuthData(const TQCString&))); + connect(slave, TQ_SIGNAL(slaveDied(TDEIO::Slave *)), + TQ_SLOT(slotSlaveDied(TDEIO::Slave *))); + connect(slave, TQ_SIGNAL(slaveStatus(pid_t,const TQCString &,const TQString &, bool)), + TQ_SLOT(slotSlaveStatus(pid_t,const TQCString &, const TQString &, bool))); + + connect(slave,TQ_SIGNAL(authorizationKey(const TQCString&, const TQCString&, bool)), + sessionData,TQ_SLOT(slotAuthData(const TQCString&, const TQCString&, bool))); + connect(slave,TQ_SIGNAL(delAuthorization(const TQCString&)), sessionData, + TQ_SLOT(slotDelAuthData(const TQCString&))); } else { @@ -713,10 +713,10 @@ Scheduler::_getConnectedSlave(const KURL &url, const TDEIO::MetaData &config ) setupSlave(slave, url, protocol, proxy, true, &config); slave->send( CMD_CONNECT ); - connect(slave, TQT_SIGNAL(connected()), - TQT_SLOT(slotSlaveConnected())); - connect(slave, TQT_SIGNAL(error(int, const TQString &)), - TQT_SLOT(slotSlaveError(int, const TQString &))); + connect(slave, TQ_SIGNAL(connected()), + TQ_SLOT(slotSlaveConnected())); + connect(slave, TQ_SIGNAL(error(int, const TQString &)), + TQ_SLOT(slotSlaveError(int, const TQString &))); coSlaves.insert(slave, new TQPtrList()); // kdDebug(7006) << "_getConnectedSlave( " << slave << ")" << endl; @@ -772,8 +772,8 @@ Scheduler::slotSlaveConnected() Slave *slave = (Slave *)sender(); // kdDebug(7006) << "slotSlaveConnected( " << slave << ")" << endl; slave->setConnected(true); - disconnect(slave, TQT_SIGNAL(connected()), - this, TQT_SLOT(slotSlaveConnected())); + disconnect(slave, TQ_SIGNAL(connected()), + this, TQ_SLOT(slotSlaveConnected())); emit slaveConnected(slave); assert(!coIdleSlaves->contains(slave)); coIdleSlaves->append(slave); @@ -838,10 +838,10 @@ Scheduler::_disconnectSlave(TDEIO::Slave *slave) delete list; coIdleSlaves->removeRef(slave); assert(!coIdleSlaves->contains(slave)); - disconnect(slave, TQT_SIGNAL(connected()), - this, TQT_SLOT(slotSlaveConnected())); - disconnect(slave, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SLOT(slotSlaveError(int, const TQString &))); + disconnect(slave, TQ_SIGNAL(connected()), + this, TQ_SLOT(slotSlaveConnected())); + disconnect(slave, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SLOT(slotSlaveError(int, const TQString &))); if (slave->isAlive()) { idleSlaves->append(slave); @@ -873,8 +873,8 @@ Scheduler::_registerWindow(TQWidget *wid) // access TQWidget::winId() (already destructed) WId windowId = wid->winId(); m_windowList.insert(obj, windowId); - connect(wid, TQT_SIGNAL(destroyed(TQObject *)), - this, TQT_SLOT(slotUnregisterWindow(TQObject*))); + connect(wid, TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(slotUnregisterWindow(TQObject*))); TQByteArray params; TQDataStream stream(params, IO_WriteOnly); stream << windowId; @@ -894,8 +894,8 @@ Scheduler::slotUnregisterWindow(TQObject *obj) if (it == m_windowList.end()) return; WId windowId = it.data(); - disconnect( it.key(), TQT_SIGNAL(destroyed(TQObject *)), - this, TQT_SLOT(slotUnregisterWindow(TQObject*))); + disconnect( it.key(), TQ_SIGNAL(destroyed(TQObject *)), + this, TQ_SLOT(slotUnregisterWindow(TQObject*))); m_windowList.remove( it ); if (kapp) { diff --git a/tdeio/tdeio/skipdlg.cpp b/tdeio/tdeio/skipdlg.cpp index 5871bbd09..84dfaefa5 100644 --- a/tdeio/tdeio/skipdlg.cpp +++ b/tdeio/tdeio/skipdlg.cpp @@ -56,15 +56,15 @@ SkipDlg::SkipDlg(TQWidget *parent, bool _multi, const TQString& _error_text, boo setCaption( i18n( "Information" ) ); b0 = new KPushButton( KStdGuiItem::cancel(), this ); - connect(b0, TQT_SIGNAL(clicked()), this, TQT_SLOT(b0Pressed())); + connect(b0, TQ_SIGNAL(clicked()), this, TQ_SLOT(b0Pressed())); if ( _multi ) { b1 = new TQPushButton( i18n( "Skip" ), this ); - connect(b1, TQT_SIGNAL(clicked()), this, TQT_SLOT(b1Pressed())); + connect(b1, TQ_SIGNAL(clicked()), this, TQ_SLOT(b1Pressed())); b2 = new TQPushButton( i18n( "Auto Skip" ), this ); - connect(b2, TQT_SIGNAL(clicked()), this, TQT_SLOT(b2Pressed())); + connect(b2, TQ_SIGNAL(clicked()), this, TQ_SLOT(b2Pressed())); } TQVBoxLayout *vlayout = new TQVBoxLayout( this, 10, 0 ); diff --git a/tdeio/tdeio/slave.cpp b/tdeio/tdeio/slave.cpp index b4a7c8f2a..56d45a315 100644 --- a/tdeio/tdeio/slave.cpp +++ b/tdeio/tdeio/slave.cpp @@ -94,7 +94,7 @@ void Slave::accept(TDESocket *socket) #endif delete serv; serv = 0; - slaveconn.connect(this, TQT_SLOT(gotInput())); + slaveconn.connect(this, TQ_SLOT(gotInput())); unlinkSocket(); } @@ -116,7 +116,7 @@ void Slave::timeout() kdDebug(7002) << "slave is slow... pid=" << m_pid << " t=" << delta_t << endl; if (delta_t < SLAVE_CONNECTION_TIMEOUT_MAX) { - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, this, TQ_SLOT(timeout())); return; } } @@ -152,8 +152,8 @@ Slave::Slave(TDEServerSocket *socket, const TQString &protocol, const TQString & m_pid = 0; m_port = 0; #ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( TDESocket* )), - TQT_SLOT(accept(TDESocket*) ) ); + connect(serv, TQ_SIGNAL(accepted( TDESocket* )), + TQ_SLOT(accept(TDESocket*) ) ); #endif } @@ -174,8 +174,8 @@ Slave::Slave(bool /*derived*/, TDEServerSocket *socket, const TQString &protocol m_port = 0; if (serv != 0) { #ifndef Q_WS_WIN - connect(serv, TQT_SIGNAL(accepted( TDESocket* )), - TQT_SLOT(accept(TDESocket*) ) ); + connect(serv, TQ_SIGNAL(accepted( TDESocket* )), + TQ_SLOT(accept(TDESocket*) ) ); #endif } } @@ -420,7 +420,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error #ifndef Q_WS_WIN slave->setPID(proc.pid()); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } @@ -452,7 +452,7 @@ Slave* Slave::createSlave( const TQString &protocol, const KURL& url, int& error } #ifndef Q_WS_WIN slave->setPID(pid); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } @@ -507,7 +507,7 @@ Slave* Slave::holdSlave( const TQString &protocol, const KURL& url ) } #ifndef Q_WS_WIN slave->setPID(pid); - TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQT_SLOT(timeout())); + TQTimer::singleShot(1000*SLAVE_CONNECTION_TIMEOUT_MIN, slave, TQ_SLOT(timeout())); #endif return slave; } diff --git a/tdeio/tdeio/slaveinterface.cpp b/tdeio/tdeio/slaveinterface.cpp index 47f935cda..1b9e853ed 100644 --- a/tdeio/tdeio/slaveinterface.cpp +++ b/tdeio/tdeio/slaveinterface.cpp @@ -135,7 +135,7 @@ SlaveInterface::SlaveInterface( Connection * connection ) m_progressId = 0; d = new SlaveInterfacePrivate; - connect(&d->speed_timer, TQT_SIGNAL(timeout()), TQT_SLOT(calcSpeed())); + connect(&d->speed_timer, TQ_SIGNAL(timeout()), TQ_SLOT(calcSpeed())); } SlaveInterface::~SlaveInterface() diff --git a/tdeio/tdeio/statusbarprogress.cpp b/tdeio/tdeio/statusbarprogress.cpp index 3d28f9ad1..270c997d3 100644 --- a/tdeio/tdeio/statusbarprogress.cpp +++ b/tdeio/tdeio/statusbarprogress.cpp @@ -49,7 +49,7 @@ StatusbarProgress::StatusbarProgress( TQWidget* parent, bool button ) box->addWidget( m_pButton ); stack = new TQWidgetStack( this ); box->addWidget( stack ); - connect( m_pButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotStop() ) ); + connect( m_pButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotStop() ) ); m_pProgressBar = new KProgress( this ); m_pProgressBar->setFrameStyle( TQFrame::Box | TQFrame::Raised ); diff --git a/tdeio/tdeio/tdefileshare.cpp b/tdeio/tdeio/tdefileshare.cpp index dc3f8c05a..d13214195 100644 --- a/tdeio/tdeio/tdefileshare.cpp +++ b/tdeio/tdeio/tdefileshare.cpp @@ -54,12 +54,12 @@ bool KFileShare::s_sharingEnabled; KFileSharePrivate::KFileSharePrivate() { KDirWatch::self()->addFile(FILESHARECONF); - connect(KDirWatch::self(), TQT_SIGNAL(dirty (const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); - connect(KDirWatch::self(), TQT_SIGNAL(created(const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); - connect(KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)),this, - TQT_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(dirty (const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(created(const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); + connect(KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)),this, + TQ_SLOT(slotFileChange(const TQString &))); } KFileSharePrivate::~KFileSharePrivate() diff --git a/tdeio/tdeioexec/main.cpp b/tdeio/tdeioexec/main.cpp index 54987e43c..071c4649c 100644 --- a/tdeio/tdeioexec/main.cpp +++ b/tdeio/tdeioexec/main.cpp @@ -125,7 +125,7 @@ KIOExec::KIOExec() TDEIO::Job *job = TDEIO::file_copy( url, dest ); jobList->append( job ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } } } @@ -133,7 +133,7 @@ KIOExec::KIOExec() if ( tempfiles ) { // #113991 - TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) ); //slotRunApp(); // does not return return; } @@ -174,7 +174,7 @@ void KIOExec::slotResult( TDEIO::Job * job ) kdDebug() << "All files downloaded, will call slotRunApp shortly" << endl; // We know we can run the app now - but let's finish the job properly first. - TQTimer::singleShot( 0, this, TQT_SLOT( slotRunApp() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotRunApp() ) ); jobList->clear(); } diff --git a/tdeio/tests/jobtest.cpp b/tdeio/tests/jobtest.cpp index 95cb96d53..15770c941 100644 --- a/tdeio/tests/jobtest.cpp +++ b/tdeio/tests/jobtest.cpp @@ -195,8 +195,8 @@ void JobTest::get() KURL u; u.setPath( filePath ); m_result = -1; TDEIO::StoredTransferJob* job = TDEIO::storedGet( u ); - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( slotGetResult( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( slotGetResult( TDEIO::Job* ) ) ); kapp->eventLoop()->enterLoop(); assert( m_result == 0 ); // no error assert( m_data.size() == 11 ); @@ -498,8 +498,8 @@ void JobTest::listRecursive() KURL u; u.setPath( src ); TDEIO::ListJob* job = TDEIO::listRecursive( u ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); m_names.sort(); @@ -565,8 +565,8 @@ void JobTest::copyFileToSystem( bool resolve_local_urls ) // copy the file with file_copy TDEIO::FileCopyJob* job = TDEIO::file_copy( u, d ); - connect( job, TQT_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), - this, TQT_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); + connect( job, TQ_SIGNAL(mimetype(TDEIO::Job*,const TQString&)), + this, TQ_SLOT(slotMimetype(TDEIO::Job*,const TQString&)) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); diff --git a/tdeio/tests/kdcopcheck.cpp b/tdeio/tests/kdcopcheck.cpp index e99de7e79..674e6a3dd 100644 --- a/tdeio/tests/kdcopcheck.cpp +++ b/tdeio/tests/kdcopcheck.cpp @@ -40,14 +40,14 @@ TestService::TestService(const TQString &exec) proc.start(); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRegistered(const TQCString&)), - this, TQT_SLOT(newApp(const TQCString&))); - connect(kapp->dcopClient(), TQT_SIGNAL( applicationRemoved(const TQCString&)), - this, TQT_SLOT(endApp(const TQCString&))); - connect(&proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(appExit())); - - TQTimer::singleShot(20*1000, this, TQT_SLOT(stop())); + connect(kapp->dcopClient(), TQ_SIGNAL( applicationRegistered(const TQCString&)), + this, TQ_SLOT(newApp(const TQCString&))); + connect(kapp->dcopClient(), TQ_SIGNAL( applicationRemoved(const TQCString&)), + this, TQ_SLOT(endApp(const TQCString&))); + connect(&proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(appExit())); + + TQTimer::singleShot(20*1000, this, TQ_SLOT(stop())); result = KService::DCOP_None; } diff --git a/tdeio/tests/kdirlistertest.cpp b/tdeio/tests/kdirlistertest.cpp index b1208f41d..54cefac87 100644 --- a/tdeio/tests/kdirlistertest.cpp +++ b/tdeio/tests/kdirlistertest.cpp @@ -49,48 +49,48 @@ KDirListerTest::KDirListerTest( TQWidget *parent, const char *name ) layout->addWidget( test ); resize( layout->sizeHint() ); - connect( startR, TQT_SIGNAL( clicked() ), TQT_SLOT( startRoot() ) ); - connect( startH, TQT_SIGNAL( clicked() ), TQT_SLOT( startHome() ) ); - connect( startT, TQT_SIGNAL( clicked() ), TQT_SLOT( startTar() ) ); - connect( test, TQT_SIGNAL( clicked() ), TQT_SLOT( test() ) ); - - connect( lister, TQT_SIGNAL( started( const KURL & ) ), - debug, TQT_SLOT( started( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( completed() ), - debug, TQT_SLOT( completed() ) ); - connect( lister, TQT_SIGNAL( completed( const KURL & ) ), - debug, TQT_SLOT( completed( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( canceled() ), - debug, TQT_SLOT( canceled() ) ); - connect( lister, TQT_SIGNAL( canceled( const KURL & ) ), - debug, TQT_SLOT( canceled( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL & ) ) ); - connect( lister, TQT_SIGNAL( redirection( const KURL &, const KURL & ) ), - debug, TQT_SLOT( redirection( const KURL &, const KURL & ) ) ); - connect( lister, TQT_SIGNAL( clear() ), - debug, TQT_SLOT( clear() ) ); - connect( lister, TQT_SIGNAL( newItems( const KFileItemList & ) ), - debug, TQT_SLOT( newItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), - debug, TQT_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( deleteItem( KFileItem * ) ), - debug, TQT_SLOT( deleteItem( KFileItem * ) ) ); - connect( lister, TQT_SIGNAL( refreshItems( const KFileItemList & ) ), - debug, TQT_SLOT( refreshItems( const KFileItemList & ) ) ); - connect( lister, TQT_SIGNAL( infoMessage( const TQString& ) ), - debug, TQT_SLOT( infoMessage( const TQString& ) ) ); - connect( lister, TQT_SIGNAL( percent( int ) ), - debug, TQT_SLOT( percent( int ) ) ); - connect( lister, TQT_SIGNAL( totalSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( totalSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - debug, TQT_SLOT( processedSize( TDEIO::filesize_t ) ) ); - connect( lister, TQT_SIGNAL( speed( int ) ), - debug, TQT_SLOT( speed( int ) ) ); - - connect( lister, TQT_SIGNAL( completed() ), - this, TQT_SLOT( completed() ) ); + connect( startR, TQ_SIGNAL( clicked() ), TQ_SLOT( startRoot() ) ); + connect( startH, TQ_SIGNAL( clicked() ), TQ_SLOT( startHome() ) ); + connect( startT, TQ_SIGNAL( clicked() ), TQ_SLOT( startTar() ) ); + connect( test, TQ_SIGNAL( clicked() ), TQ_SLOT( test() ) ); + + connect( lister, TQ_SIGNAL( started( const KURL & ) ), + debug, TQ_SLOT( started( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( completed() ), + debug, TQ_SLOT( completed() ) ); + connect( lister, TQ_SIGNAL( completed( const KURL & ) ), + debug, TQ_SLOT( completed( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( canceled() ), + debug, TQ_SLOT( canceled() ) ); + connect( lister, TQ_SIGNAL( canceled( const KURL & ) ), + debug, TQ_SLOT( canceled( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL & ) ) ); + connect( lister, TQ_SIGNAL( redirection( const KURL &, const KURL & ) ), + debug, TQ_SLOT( redirection( const KURL &, const KURL & ) ) ); + connect( lister, TQ_SIGNAL( clear() ), + debug, TQ_SLOT( clear() ) ); + connect( lister, TQ_SIGNAL( newItems( const KFileItemList & ) ), + debug, TQ_SLOT( newItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( itemsFilteredByMime( const KFileItemList & ) ), + debug, TQ_SLOT( itemsFilteredByMime( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( deleteItem( KFileItem * ) ), + debug, TQ_SLOT( deleteItem( KFileItem * ) ) ); + connect( lister, TQ_SIGNAL( refreshItems( const KFileItemList & ) ), + debug, TQ_SLOT( refreshItems( const KFileItemList & ) ) ); + connect( lister, TQ_SIGNAL( infoMessage( const TQString& ) ), + debug, TQ_SLOT( infoMessage( const TQString& ) ) ); + connect( lister, TQ_SIGNAL( percent( int ) ), + debug, TQ_SLOT( percent( int ) ) ); + connect( lister, TQ_SIGNAL( totalSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( totalSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + debug, TQ_SLOT( processedSize( TDEIO::filesize_t ) ) ); + connect( lister, TQ_SIGNAL( speed( int ) ), + debug, TQ_SLOT( speed( int ) ) ); + + connect( lister, TQ_SIGNAL( completed() ), + this, TQ_SLOT( completed() ) ); } KDirListerTest::~KDirListerTest() diff --git a/tdeio/tests/kdirwatchtest.cpp b/tdeio/tests/kdirwatchtest.cpp index 9f50c2170..eed240f2d 100644 --- a/tdeio/tests/kdirwatchtest.cpp +++ b/tdeio/tests/kdirwatchtest.cpp @@ -38,9 +38,9 @@ int main (int argc, char **argv) KDirWatch *dirwatch1 = KDirWatch::self(); KDirWatch *dirwatch2 = new KDirWatch; - testObject.connect(dirwatch1, TQT_SIGNAL( dirty( const TQString &)), TQT_SLOT( dirty( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( created( const TQString &)), TQT_SLOT( created( const TQString &)) ); - testObject.connect(dirwatch1, TQT_SIGNAL( deleted( const TQString &)), TQT_SLOT( deleted( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( dirty( const TQString &)), TQ_SLOT( dirty( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( created( const TQString &)), TQ_SLOT( created( const TQString &)) ); + testObject.connect(dirwatch1, TQ_SIGNAL( deleted( const TQString &)), TQ_SLOT( deleted( const TQString &)) ); if (args->count() >0) { for(int i = 0; i < args->count(); i++) { diff --git a/tdeio/tests/kdirwatchunittest.cpp b/tdeio/tests/kdirwatchunittest.cpp index ed59f3c19..773ce476b 100644 --- a/tdeio/tests/kdirwatchunittest.cpp +++ b/tdeio/tests/kdirwatchunittest.cpp @@ -120,9 +120,9 @@ void KDirWatchTest::allTests() TQDir* dir = new TQDir(m_workingDir); VERIFY (dir != 0); - connect(d, TQT_SIGNAL (dirty( const TQString &)), TQT_SLOT( slotDirty( const TQString &)) ); - connect(d, TQT_SIGNAL (created( const TQString &)), TQT_SLOT( slotCreated( const TQString &)) ); - connect(d, TQT_SIGNAL (deleted( const TQString &)), TQT_SLOT( slotDeleted( const TQString &)) ); + connect(d, TQ_SIGNAL (dirty( const TQString &)), TQ_SLOT( slotDirty( const TQString &)) ); + connect(d, TQ_SIGNAL (created( const TQString &)), TQ_SLOT( slotCreated( const TQString &)) ); + connect(d, TQ_SIGNAL (deleted( const TQString &)), TQ_SLOT( slotDeleted( const TQString &)) ); VERIFY (dir->mkdir (m_workingDir)); diff --git a/tdeio/tests/kruntest.cpp b/tdeio/tests/kruntest.cpp index 7562b488a..c10a36898 100644 --- a/tdeio/tests/kruntest.cpp +++ b/tdeio/tests/kruntest.cpp @@ -56,9 +56,9 @@ Receiver::Receiver() start = new TQPushButton( "Launch KRuns", this ); stop = new TQPushButton( "Stop those KRuns", this ); stop->setEnabled(false); - TQObject::connect( h, TQT_SIGNAL(clicked()), kapp, TQT_SLOT(quit()) ); - TQObject::connect( start, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStart()) ); - TQObject::connect( stop, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStop()) ); + TQObject::connect( h, TQ_SIGNAL(clicked()), kapp, TQ_SLOT(quit()) ); + TQObject::connect( start, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStart()) ); + TQObject::connect( stop, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStop()) ); adjustSize(); show(); diff --git a/tdeio/tests/previewtest.cpp b/tdeio/tests/previewtest.cpp index 3237f0180..f30e7ad10 100644 --- a/tdeio/tests/previewtest.cpp +++ b/tdeio/tests/previewtest.cpp @@ -19,7 +19,7 @@ PreviewTest::PreviewTest() m_url->setText("/home/malte/gore_bush.jpg"); layout->addWidget(m_url, 0, 0); TQPushButton *btn = new TQPushButton("Generate", this); - connect(btn, TQT_SIGNAL(clicked()), TQT_SLOT(slotGenerate())); + connect(btn, TQ_SIGNAL(clicked()), TQ_SLOT(slotGenerate())); layout->addWidget(btn, 0, 1); m_preview = new TQLabel(this); m_preview->setMinimumSize(400, 300); @@ -31,9 +31,9 @@ void PreviewTest::slotGenerate() KURL::List urls; urls.append(m_url->text()); TDEIO::PreviewJob *job = TDEIO::filePreview(urls, m_preview->width(), m_preview->height(), true, 48); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQT_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); - connect(job, TQT_SIGNAL(failed(const KFileItem *)), TQT_SLOT(slotFailed())); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(gotPreview(const KFileItem *, const TQPixmap &)), TQ_SLOT(slotPreview(const KFileItem *, const TQPixmap &))); + connect(job, TQ_SIGNAL(failed(const KFileItem *)), TQ_SLOT(slotFailed())); } void PreviewTest::slotResult(TDEIO::Job*) diff --git a/tdeio/tests/speed.cpp b/tdeio/tests/speed.cpp index 4b14a6bb6..0c517c808 100644 --- a/tdeio/tests/speed.cpp +++ b/tdeio/tests/speed.cpp @@ -32,10 +32,10 @@ SpeedTest::SpeedTest( const KURL & url ) { Job *job = listRecursive( url ); //Job *job = del( KURL("file:" + TQDir::currentDirPath()) ); DANGEROUS ! - connect(job, TQT_SIGNAL( result( TDEIO::Job*)), - TQT_SLOT( finished( TDEIO::Job* ) )); - /*connect(job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(job, TQ_SIGNAL( result( TDEIO::Job*)), + TQ_SLOT( finished( TDEIO::Job* ) )); + /*connect(job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList&))); */ } diff --git a/tdeio/tests/tdeioslavetest.cpp b/tdeio/tests/tdeioslavetest.cpp index 4d52eab2e..bd5a1f1bb 100644 --- a/tdeio/tests/tdeioslavetest.cpp +++ b/tdeio/tests/tdeioslavetest.cpp @@ -63,7 +63,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Operation groupbox & buttons opButtons = new TQButtonGroup( "Operation", main_widget ); topLayout->addWidget( opButtons, 10 ); - connect( opButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeOperation(int)) ); + connect( opButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeOperation(int)) ); TQBoxLayout *hbLayout = new TQHBoxLayout( opButtons, 15 ); @@ -117,7 +117,7 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) // Progress groupbox & buttons progressButtons = new TQButtonGroup( "Progress dialog mode", main_widget ); topLayout->addWidget( progressButtons, 10 ); - connect( progressButtons, TQT_SIGNAL(clicked(int)), TQT_SLOT(changeProgressMode(int)) ); + connect( progressButtons, TQ_SIGNAL(clicked(int)), TQ_SLOT(changeProgressMode(int)) ); hbLayout = new TQHBoxLayout( progressButtons, 15 ); @@ -145,19 +145,19 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) pbStart = new TQPushButton( "&Start", main_widget ); pbStart->setFixedSize( pbStart->sizeHint() ); - connect( pbStart, TQT_SIGNAL(clicked()), TQT_SLOT(startJob()) ); + connect( pbStart, TQ_SIGNAL(clicked()), TQ_SLOT(startJob()) ); hbLayout->addWidget( pbStart, 5 ); pbStop = new TQPushButton( "Sto&p", main_widget ); pbStop->setFixedSize( pbStop->sizeHint() ); pbStop->setEnabled( false ); - connect( pbStop, TQT_SIGNAL(clicked()), TQT_SLOT(stopJob()) ); + connect( pbStop, TQ_SIGNAL(clicked()), TQ_SLOT(stopJob()) ); hbLayout->addWidget( pbStop, 5 ); // close button close = new TQPushButton( "&Close", main_widget ); close->setFixedSize( close->sizeHint() ); - connect(close, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotQuit())); + connect(close, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotQuit())); topLayout->addWidget( close, 5 ); @@ -166,10 +166,10 @@ KioslaveTest::KioslaveTest( TQString src, TQString dest, uint op, uint pr ) slave = 0; // slave = TDEIO::Scheduler::getConnectedSlave(KURL("ftp://ftp.kde.org")); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveConnected(TDEIO::Slave*)), - this, TQT_SLOT(slotSlaveConnected())); - TDEIO::Scheduler::connect(TQT_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), - this, TQT_SLOT(slotSlaveError())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveConnected(TDEIO::Slave*)), + this, TQ_SLOT(slotSlaveConnected())); + TDEIO::Scheduler::connect(TQ_SIGNAL(slaveError(TDEIO::Slave*,int,const TQString&)), + this, TQ_SLOT(slotSlaveError())); } @@ -242,14 +242,14 @@ void KioslaveTest::startJob() { switch ( selectedOperation ) { case List: myJob = TDEIO::listDir( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case ListRecursive: myJob = TDEIO::listRecursive( src ); - connect(myJob, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); + connect(myJob, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList&)), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList&))); break; case Stat: @@ -258,15 +258,15 @@ void KioslaveTest::startJob() { case Get: myJob = TDEIO::get( src, true ); - connect(myJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), - TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); + connect(myJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray &)), + TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray &))); break; case Put: putBuffer = 0; myJob = TDEIO::put( src, -1, true, false); - connect(myJob, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), - TQT_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); + connect(myJob, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray &)), + TQ_SLOT( slotDataReq( TDEIO::Job*, TQByteArray &))); break; case Copy: @@ -300,11 +300,11 @@ void KioslaveTest::startJob() { job = myJob; } - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( canceled( TDEIO::Job * ) ), - TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( canceled( TDEIO::Job * ) ), + TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if (progressMode == ProgressStatus) { statusProgress->setJob( job ); diff --git a/tdeioslave/file/file.cpp b/tdeioslave/file/file.cpp index c6c3f74a3..a069cc5a8 100644 --- a/tdeioslave/file/file.cpp +++ b/tdeioslave/file/file.cpp @@ -1336,10 +1336,10 @@ void FileProtocol::special( const TQByteArray &data) TQString filename; stream >> filename; KShred shred( filename ); - connect( &shred, TQT_SIGNAL( processedSize( TDEIO::filesize_t ) ), - this, TQT_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); - connect( &shred, TQT_SIGNAL( infoMessage( const TQString & ) ), - this, TQT_SLOT( slotInfoMessage( const TQString & ) ) ); + connect( &shred, TQ_SIGNAL( processedSize( TDEIO::filesize_t ) ), + this, TQ_SLOT( slotProcessedSize( TDEIO::filesize_t ) ) ); + connect( &shred, TQ_SIGNAL( infoMessage( const TQString & ) ), + this, TQ_SLOT( slotInfoMessage( const TQString & ) ) ); if (!shred.shred()) error( TDEIO::ERR_CANNOT_DELETE, filename ); else diff --git a/tdeioslave/http/http.cpp b/tdeioslave/http/http.cpp index 8cd0f7a64..cd5d51a63 100644 --- a/tdeioslave/http/http.cpp +++ b/tdeioslave/http/http.cpp @@ -4444,10 +4444,10 @@ bool HTTPProtocol::readBody( bool dataInternal /* = false */ ) HTTPFilterChain chain; - TQObject::connect(&chain, TQT_SIGNAL(output(const TQByteArray &)), - this, TQT_SLOT(slotData(const TQByteArray &))); - TQObject::connect(&chain, TQT_SIGNAL(error(int, const TQString &)), - this, TQT_SLOT(error(int, const TQString &))); + TQObject::connect(&chain, TQ_SIGNAL(output(const TQByteArray &)), + this, TQ_SLOT(slotData(const TQByteArray &))); + TQObject::connect(&chain, TQ_SIGNAL(error(int, const TQString &)), + this, TQ_SLOT(error(int, const TQString &))); // decode all of the transfer encodings while (!m_qTransferEncodings.isEmpty()) diff --git a/tdeioslave/http/kcookiejar/kcookieserver.cpp b/tdeioslave/http/kcookiejar/kcookieserver.cpp index 798b06318..52a2b7967 100644 --- a/tdeioslave/http/kcookiejar/kcookieserver.cpp +++ b/tdeioslave/http/kcookiejar/kcookieserver.cpp @@ -87,7 +87,7 @@ KCookieServer::KCookieServer(const TQCString &name) mRequestList = new RequestList; mAdvicePending = false; mTimer = new TQTimer(); - connect( mTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotSave())); + connect( mTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotSave())); mConfig = new TDEConfig("kcookiejarrc"); mCookieJar->loadConfig( mConfig ); @@ -107,8 +107,8 @@ KCookieServer::KCookieServer(const TQCString &name) { mCookieJar->loadCookies( filename); } - connect(this, TQT_SIGNAL(windowUnregistered(long)), - this, TQT_SLOT(slotDeleteSessionCookies(long))); + connect(this, TQ_SIGNAL(windowUnregistered(long)), + this, TQ_SLOT(slotDeleteSessionCookies(long))); } KCookieServer::~KCookieServer() diff --git a/tdeioslave/http/kcookiejar/kcookiewin.cpp b/tdeioslave/http/kcookiejar/kcookiewin.cpp index eb304f4bc..948847b2f 100644 --- a/tdeioslave/http/kcookiejar/kcookiewin.cpp +++ b/tdeioslave/http/kcookiejar/kcookiewin.cpp @@ -182,20 +182,20 @@ KCookieWin::KCookieWin( TQWidget *parent, KHttpCookieList cookieList, TQPushButton* btn = new TQPushButton( i18n("&Accept"), bbox ); btn->setDefault( true ); btn->setFocus(); - connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); bbLay->addWidget( btn ); btn = new TQPushButton( i18n("&Reject"), bbox ); - connect( btn, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( btn, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); bbLay->addWidget( btn ); bbLay->addStretch( 1 ); #ifndef TQT_NO_ACCEL TQAccel* a = new TQAccel( this ); - a->connectItem( a->insertItem(TQt::Key_Escape), btn, TQT_SLOT(animateClick()) ); + a->connectItem( a->insertItem(TQt::Key_Escape), btn, TQ_SLOT(animateClick()) ); #endif m_button = new TQPushButton( bbox ); m_button->setText( m_showDetails ? i18n("&Details <<"):i18n("&Details >>") ); - connect( m_button, TQT_SIGNAL(clicked()), TQT_SLOT(slotCookieDetails()) ); + connect( m_button, TQ_SIGNAL(clicked()), TQ_SLOT(slotCookieDetails()) ); bbLay->addWidget( m_button ); #ifndef TQT_NO_WHATSTHIS TQWhatsThis::add( m_button, i18n("See or modify the cookie information") ); @@ -315,7 +315,7 @@ KCookieDetail::KCookieDetail( KHttpCookieList cookieList, int cookieCount, TQPushButton* btnNext = new TQPushButton( i18n("Next cookie","&Next >>"), this ); btnNext->setFixedSize( btnNext->sizeHint() ); grid->addMultiCellWidget( btnNext, 8, 8, 0, 1 ); - connect( btnNext, TQT_SIGNAL(clicked()), TQT_SLOT(slotNextCookie()) ); + connect( btnNext, TQ_SIGNAL(clicked()), TQ_SLOT(slotNextCookie()) ); #ifndef TQT_NO_TOOLTIP TQToolTip::add( btnNext, i18n("Show details of the next cookie") ); #endif diff --git a/tdemdi/tdemdi/dockcontainer.cpp b/tdemdi/tdemdi/dockcontainer.cpp index d6ae0f2f2..cdc35d208 100644 --- a/tdemdi/tdemdi/dockcontainer.cpp +++ b/tdemdi/tdemdi/dockcontainer.cpp @@ -200,7 +200,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt m_overlapButtons.insert(w,btn); btn->setOn(!isOverlapMode()); - connect(btn,TQT_SIGNAL(clicked()),this,TQT_SLOT(changeOverlapMode())); + connect(btn,TQ_SIGNAL(clicked()),this,TQ_SLOT(changeOverlapMode())); } m_tb->appendTab(pixmap.isNull()?SmallIcon("misc"):pixmap,tab,w->tabPageLabel()); @@ -209,7 +209,7 @@ void DockContainer::insertWidget (KDockWidget *dwdg, TQPixmap pixmap, const TQSt //FB m_tb->setTab(tab,true); - connect(m_tb->tab(tab),TQT_SIGNAL(clicked(int)),this,TQT_SLOT(tabClicked(int))); + connect(m_tb->tab(tab),TQ_SIGNAL(clicked(int)),this,TQ_SLOT(tabClicked(int))); kdDebug(760)<<"DockContainer::insertWidget()"<syncX();*/ m_delayedRaise=it.data(); - TQTimer::singleShot(0,this,TQT_SLOT(delayedRaise())); + TQTimer::singleShot(0,this,TQ_SLOT(delayedRaise())); kdDebug(760)<<"************** raising *******: "<name()<setGroup(grp); } diff --git a/tdemdi/tdemdi/guiclient.cpp b/tdemdi/tdemdi/guiclient.cpp index e4b29eeed..32f0c2aea 100644 --- a/tdemdi/tdemdi/guiclient.cpp +++ b/tdemdi/tdemdi/guiclient.cpp @@ -57,8 +57,8 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) { m_mdiMainFrm=mdiMainFrm; - connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -79,18 +79,18 @@ GUIClient::GUIClient (KMDI::MainWindow* mdiMainFrm,const char* name) m_toolMenu=new TDEActionMenu(i18n("Tool &Views"),actionCollection(),"tdemdi_toolview_menu"); m_gotoToolDockMenu=new TDEActionMenu(i18n("Tool &Docks"),actionCollection(),"tdemdi_tooldock_menu"); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQT_SIGNAL(toggleTop()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Top Dock"),ALT+CTRL+SHIFT+Key_T,this,TQ_SIGNAL(toggleTop()), actionCollection(),"tdemdi_activate_top")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQT_SIGNAL(toggleLeft()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Left Dock"),ALT+CTRL+SHIFT+Key_L,this,TQ_SIGNAL(toggleLeft()), actionCollection(),"tdemdi_activate_left")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQT_SIGNAL(toggleRight()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Right Dock"),ALT+CTRL+SHIFT+Key_R,this,TQ_SIGNAL(toggleRight()), actionCollection(),"tdemdi_activate_right")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQT_SIGNAL(toggleBottom()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Switch Bottom Dock"),ALT+CTRL+SHIFT+Key_B,this,TQ_SIGNAL(toggleBottom()), actionCollection(),"tdemdi_activate_bottom")); m_gotoToolDockMenu->insert(new TDEActionSeparator(actionCollection(),"tdemdi_goto_menu_separator")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQT_SLOT(prevToolViewInDock()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Previous Tool View"),ALT+CTRL+Key_Left,m_mdiMainFrm,TQ_SLOT(prevToolViewInDock()), actionCollection(),"tdemdi_prev_toolview")); - m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQT_SLOT(nextToolViewInDock()), + m_gotoToolDockMenu->insert(new TDEAction(i18n("Next Tool View"),ALT+CTRL+Key_Right,m_mdiMainFrm,TQ_SLOT(nextToolViewInDock()), actionCollection(),"tdemdi_next_toolview")); actionCollection()->readShortcutSettings( "Shortcuts", kapp->config() ); @@ -151,7 +151,7 @@ void GUIClient::addToolView(KMDI::ToolViewAccessor* mtva) ((ToggleToolViewAction*)a)->setCheckedState(TQString(i18n("Hide %1").arg(mtva->wrappedWidget()->caption()))); - connect(a,TQT_SIGNAL(destroyed(TQObject*)),this,TQT_SLOT(actionDeleted(TQObject*))); + connect(a,TQ_SIGNAL(destroyed(TQObject*)),this,TQ_SLOT(actionDeleted(TQObject*))); m_toolViewActions.append(a); m_toolMenu->insert(a); @@ -181,9 +181,9 @@ ToggleToolViewAction::ToggleToolViewAction ( const TQString& text, const TDEShor { if (m_dw) { - connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool))); - connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged())); - connect(m_dw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(slotWidgetDestroyed())); + connect(this,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotToggled(bool))); + connect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged())); + connect(m_dw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(slotWidgetDestroyed())); setChecked(m_dw->mayBeHide()); } @@ -218,8 +218,8 @@ void ToggleToolViewAction::slotToggled(bool t) void ToggleToolViewAction::slotWidgetDestroyed() { - disconnect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged())); - disconnect(this,TQT_SIGNAL(toggled(bool)),0,0); + disconnect(m_dw->dockManager(),TQ_SIGNAL(change()),this,TQ_SLOT(anDWChanged())); + disconnect(this,TQ_SIGNAL(toggled(bool)),0,0); unplugAll(); deleteLater(); diff --git a/tdemdi/tdemdi/mainwindow.cpp b/tdemdi/tdemdi/mainwindow.cpp index 24a3c0fdf..925f7619a 100644 --- a/tdemdi/tdemdi/mainwindow.cpp +++ b/tdemdi/tdemdi/mainwindow.cpp @@ -139,7 +139,7 @@ void MainWindow::setupMainDock () setMainDockWidget(dw); // connect signals to collapse sidebars - connect(m_tabWidget,TQT_SIGNAL(focusInEvent()),this,TQT_SIGNAL(collapseOverlapContainers())); + connect(m_tabWidget,TQ_SIGNAL(focusInEvent()),this,TQ_SIGNAL(collapseOverlapContainers())); } void MainWindow::setupToolViews () @@ -180,40 +180,40 @@ void MainWindow::setupToolViews () m_leftContainer->manualDock(mainDock, KDockWidget::DockLeft,20); tmpDC->init(); - connect (this,TQT_SIGNAL(toggleLeft()),tmpDC,TQT_SLOT(toggle())); - connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped())); - connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*))); + connect (this,TQ_SIGNAL(toggleLeft()),tmpDC,TQ_SLOT(toggle())); + connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped())); + connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*))); + connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*))); m_rightContainer->setWidget(tmpDC=new DockContainer(m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode)); m_rightContainer->setEnableDocking(KDockWidget::DockRight); m_rightContainer->manualDock(mainDock, KDockWidget::DockRight,80); tmpDC->init(); - connect (this,TQT_SIGNAL(toggleRight()),tmpDC,TQT_SLOT(toggle())); - connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped())); - connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*))); + connect (this,TQ_SIGNAL(toggleRight()),tmpDC,TQ_SLOT(toggle())); + connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped())); + connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*))); + connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*))); m_topContainer->setWidget(tmpDC=new DockContainer(m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode)); m_topContainer->setEnableDocking(KDockWidget::DockTop); m_topContainer->manualDock(mainDock, KDockWidget::DockTop,20); tmpDC->init(); - connect (this,TQT_SIGNAL(toggleTop()),tmpDC,TQT_SLOT(toggle())); - connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped())); - connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*))); + connect (this,TQ_SIGNAL(toggleTop()),tmpDC,TQ_SLOT(toggle())); + connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped())); + connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*))); + connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*))); m_bottomContainer->setWidget(tmpDC=new DockContainer(m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode)); m_bottomContainer->setEnableDocking(KDockWidget::DockBottom); m_bottomContainer->manualDock(mainDock, KDockWidget::DockBottom,80); tmpDC->init(); - connect (this,TQT_SIGNAL(toggleBottom()),tmpDC,TQT_SLOT(toggle())); - connect(this,TQT_SIGNAL(collapseOverlapContainers()),tmpDC,TQT_SLOT(collapseOverlapped())); - connect(tmpDC,TQT_SIGNAL(activated(DockContainer*)),this,TQT_SLOT(setActiveToolDock(DockContainer*))); - connect(tmpDC,TQT_SIGNAL(deactivated(DockContainer*)),this,TQT_SLOT(removeFromActiveDockList(DockContainer*))); + connect (this,TQ_SIGNAL(toggleBottom()),tmpDC,TQ_SLOT(toggle())); + connect(this,TQ_SIGNAL(collapseOverlapContainers()),tmpDC,TQ_SLOT(collapseOverlapped())); + connect(tmpDC,TQ_SIGNAL(activated(DockContainer*)),this,TQ_SLOT(setActiveToolDock(DockContainer*))); + connect(tmpDC,TQ_SIGNAL(deactivated(DockContainer*)),this,TQ_SLOT(removeFromActiveDockList(DockContainer*))); m_leftContainer->setDockSite( KDockWidget::DockCenter ); m_rightContainer->setDockSite( KDockWidget::DockCenter ); @@ -240,10 +240,10 @@ void MainWindow::setupGUIClient () { m_guiClient = new KMDIPrivate::GUIClient (this); - connect(m_guiClient,TQT_SIGNAL(toggleTop()),this,TQT_SIGNAL(toggleTop())); - connect(m_guiClient,TQT_SIGNAL(toggleLeft()),this,TQT_SIGNAL(toggleLeft())); - connect(m_guiClient,TQT_SIGNAL(toggleRight()),this,TQT_SIGNAL(toggleRight())); - connect(m_guiClient,TQT_SIGNAL(toggleBottom()),this,TQT_SIGNAL(toggleBottom())); + connect(m_guiClient,TQ_SIGNAL(toggleTop()),this,TQ_SIGNAL(toggleTop())); + connect(m_guiClient,TQ_SIGNAL(toggleLeft()),this,TQ_SIGNAL(toggleLeft())); + connect(m_guiClient,TQ_SIGNAL(toggleRight()),this,TQ_SIGNAL(toggleRight())); + connect(m_guiClient,TQ_SIGNAL(toggleBottom()),this,TQ_SIGNAL(toggleBottom())); } TabWidget *MainWindow::tabWidget () diff --git a/tdemdi/tdemdi/tabwidget.cpp b/tdemdi/tdemdi/tabwidget.cpp index 35ea557a5..5dff64920 100644 --- a/tdemdi/tdemdi/tabwidget.cpp +++ b/tdemdi/tdemdi/tabwidget.cpp @@ -70,7 +70,7 @@ TabWidget::TabWidget(TQWidget* parent, const char* name) setHoverCloseButton(true); - connect(this, TQT_SIGNAL(closeRequest(TQWidget*)), this, TQT_SLOT(closeTab(TQWidget*))); + connect(this, TQ_SIGNAL(closeRequest(TQWidget*)), this, TQ_SLOT(closeTab(TQWidget*))); } TabWidget::~TabWidget() @@ -122,7 +122,7 @@ bool TabWidget::eventFilter(TQObject *obj, TQEvent *e ) TQWidget* widg = (TQWidget*)o; ++it; widg->installEventFilter(this); - connect(widg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(childDestroyed())); + connect(widg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(childDestroyed())); } delete list; // delete the list, not the objects } diff --git a/tdemdi/tdemdi/toolviewaccessor.cpp b/tdemdi/tdemdi/toolviewaccessor.cpp index cc168bdff..24242b0df 100644 --- a/tdemdi/tdemdi/toolviewaccessor.cpp +++ b/tdemdi/tdemdi/toolviewaccessor.cpp @@ -82,7 +82,7 @@ ToolViewAccessor::~ToolViewAccessor() { TQWidget *ToolViewAccessor::wrapperWidget() { if (!d->widgetContainer) { d->widgetContainer=mdiMainFrm->createDockWidget( "ToolViewAccessor::null",TQPixmap()); - connect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*))); + connect(d->widgetContainer,TQ_SIGNAL(widgetSet(TQWidget*)),this,TQ_SLOT(setWidgetToWrap(TQWidget*))); } return d->widgetContainer; } @@ -96,7 +96,7 @@ void ToolViewAccessor::setWidgetToWrap(TQWidget *widgetToWrap, const TQString& t { Q_ASSERT(!(d->widget)); Q_ASSERT(!widgetToWrap->inherits("KDockWidget")); - disconnect(d->widgetContainer,TQT_SIGNAL(widgetSet(TQWidget*)),this,TQT_SLOT(setWidgetToWrap(TQWidget*))); + disconnect(d->widgetContainer,TQ_SIGNAL(widgetSet(TQWidget*)),this,TQ_SLOT(setWidgetToWrap(TQWidget*))); delete d->widget; d->widget=widgetToWrap; KDockWidget *tmp=d->widgetContainer; diff --git a/tdemdi/tdemdichildfrm.cpp b/tdemdi/tdemdichildfrm.cpp index 4bb5d2cf9..ba5048b87 100644 --- a/tdemdi/tdemdichildfrm.cpp +++ b/tdemdi/tdemdichildfrm.cpp @@ -138,10 +138,10 @@ KMdiChildFrm::KMdiChildFrm( KMdiChildArea *parent ) m_pClose = new TQToolButton( m_pCaption, "tdemdi_toolbutton_close" ); m_pUndock = new TQToolButton( m_pCaption, "tdemdi_toolbutton_undock" ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pMaximize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( maximizePressed() ) ); - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closePressed() ) ); - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), this, TQT_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pMaximize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( maximizePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), this, TQ_SLOT( undockPressed() ) ); m_pIconButtonPixmap = new TQPixmap( SmallIcon( "document-new" ) ); if ( m_pIconButtonPixmap->isNull() ) @@ -540,8 +540,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) } m_pMinimize->setPixmap( *m_pMinButtonPixmap ); m_pMaximize->setPixmap( *m_pMaxButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); setGeometry( m_restoredRect ); break; case Normal: @@ -566,8 +566,8 @@ void KMdiChildFrm::setState( MdiWindowState state, bool /*bAnimate*/ ) // reset to maximize-captionbar m_pMaximize->setPixmap( *m_pRestoreButtonPixmap ); m_pMinimize->setPixmap( *m_pMinButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); int nFrameWidth = KMDI_CHILDFRM_DOUBLE_BORDER; int nFrameHeight = KMDI_CHILDFRM_DOUBLE_BORDER + KMDI_CHILDFRM_SEPARATOR + m_pCaption->heightHint(); @@ -795,7 +795,7 @@ void KMdiChildFrm::setClient( KMdiChildView *w, bool bAutomaticResize ) linkChildren( pFocPolDict ); - TQObject::connect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); + TQObject::connect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) ); if ( m_pClient->minimumWidth() > m_pManager->m_defaultChildFrmSize.width() ) setMinimumWidth( m_pClient->minimumSize().width() + KMDI_CHILDFRM_DOUBLE_BORDER ); @@ -814,7 +814,7 @@ void KMdiChildFrm::unsetClient( TQPoint positionOffset ) if ( !m_pClient ) return ; - TQObject::disconnect( m_pClient, TQT_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQT_SIGNAL( nowMaximized( bool ) ) ); + TQObject::disconnect( m_pClient, TQ_SIGNAL( mdiParentNowMaximized( bool ) ), m_pManager, TQ_SIGNAL( nowMaximized( bool ) ) ); //reparent to desktop widget , no flags , point , show it TQDict* pFocPolDict; @@ -1234,11 +1234,11 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const if ( KMdiMainFrm::frameDecorOfAttachedViews() != KMdi::Win95Look ) { - m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) ); - m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) ); - m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) ); - m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQT_SLOT( minimizePressed() ) ); - m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQT_SLOT( maximizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Move" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "R&esize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "M&inimize" ), this, TQ_SLOT( minimizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "M&aximize" ), this, TQ_SLOT( maximizePressed() ) ); if ( state() == Normal ) m_pSystemMenu->setItemEnabled( m_pSystemMenu->idAt( 0 ), false ); else if ( state() == Maximized ) @@ -1256,20 +1256,20 @@ TQPopupMenu* KMdiChildFrm::systemMenu() const else { if ( state() != Normal ) - m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQT_SLOT( restorePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Restore" ), this, TQ_SLOT( restorePressed() ) ); if ( state() != Maximized ) - m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQT_SLOT( maximizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Maximize" ), this, TQ_SLOT( maximizePressed() ) ); if ( state() != Minimized ) - m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQT_SLOT( minimizePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Minimize" ), this, TQ_SLOT( minimizePressed() ) ); if ( state() != Maximized ) - m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQT_SLOT( slot_moveViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "M&ove" ), m_pCaption, TQ_SLOT( slot_moveViaSystemMenu() ) ); if ( state() == Normal ) - m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQT_SLOT( slot_resizeViaSystemMenu() ) ); + m_pSystemMenu->insertItem( i18n( "&Resize" ), this, TQ_SLOT( slot_resizeViaSystemMenu() ) ); } - m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQT_SLOT( undockPressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Undock" ), this, TQ_SLOT( undockPressed() ) ); m_pSystemMenu->insertSeparator(); - m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQT_SLOT( closePressed() ) ); + m_pSystemMenu->insertItem( i18n( "&Close" ), this, TQ_SLOT( closePressed() ) ); return m_pSystemMenu; } @@ -1301,8 +1301,8 @@ void KMdiChildFrm::switchToMinimizeLayout() // temporary use of minimize button for restore function m_pMinimize->setPixmap( *m_pRestoreButtonPixmap ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), this, TQT_SLOT( restorePressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), this, TQ_SLOT( restorePressed() ) ); // resizing resize( 300, minimumHeight() ); diff --git a/tdemdi/tdemdichildview.cpp b/tdemdi/tdemdichildview.cpp index 158920059..be2ea32fa 100644 --- a/tdemdi/tdemdichildview.cpp +++ b/tdemdi/tdemdichildview.cpp @@ -611,7 +611,7 @@ bool KMdiChildView::eventFilter( TQObject *obj, TQEvent *e ) TQWidget * widg = ( TQWidget* ) o; ++it; widg->installEventFilter( this ); - connect( widg, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slot_childDestroyed() ) ); + connect( widg, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slot_childDestroyed() ) ); TQWidget::FocusPolicy wfp = widg->focusPolicy(); if ( wfp == TQWidget::StrongFocus || wfp == TQWidget::TabFocus || widg->focusPolicy() == TQWidget::WheelFocus ) { diff --git a/tdemdi/tdemdichildview.h b/tdemdi/tdemdichildview.h index 4681f5fdf..4db44ed83 100644 --- a/tdemdi/tdemdichildview.h +++ b/tdemdi/tdemdichildview.h @@ -94,7 +94,7 @@ class KMdiChildViewPrivate; * flags = KMdi::Hide; * } * // set the accelerators for Toplevel MDI mode (each toplevel window needs its own accels - * connect( m_pParent, TQT_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQT_SLOT(initKeyAccel(TQWidget*)) ); + * connect( m_pParent, TQ_SIGNAL(childViewIsDetachedNow(TQWidget*)), this, TQ_SLOT(initKeyAccel(TQWidget*)) ); * * m_pParent->addWindow( pMDICover, flags); * // correct the default settings of KMdi ('cause we haven't a tab order for subwidget focuses) diff --git a/tdemdi/tdemdidockcontainer.cpp b/tdemdi/tdemdidockcontainer.cpp index 2d835522d..c5b3e10ee 100644 --- a/tdemdi/tdemdidockcontainer.cpp +++ b/tdemdi/tdemdidockcontainer.cpp @@ -223,7 +223,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const m_overlapButtons.insert( w, btn ); btn->setOn( !isOverlapMode() ); - connect( btn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( changeOverlapMode() ) ); + connect( btn, TQ_SIGNAL( clicked() ), this, TQ_SLOT( changeOverlapMode() ) ); } m_tb->appendTab( pixmap.isNull() ? SmallIcon( "misc" ) : pixmap, tab, w->tabPageLabel() ); @@ -231,7 +231,7 @@ void KMdiDockContainer::insertWidget ( KDockWidget *dwdg, TQPixmap pixmap, const kdDebug( 760 ) << k_funcinfo << "Added tab with label " << w->tabPageLabel() << " to the tabbar" << endl; - connect( m_tb->tab( tab ), TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( tabClicked( int ) ) ); + connect( m_tb->tab( tab ), TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( tabClicked( int ) ) ); mTabCnt++; m_inserted = tab; @@ -613,7 +613,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) if ( it.key() ->name() == raise ) { m_delayedRaise = it.data(); - TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) ); kdDebug( 760 ) << k_funcinfo << "raising " << it.key()->name() << endl; break; } @@ -621,7 +621,7 @@ void KMdiDockContainer::load( TQDomElement& dockEl ) } if ( m_delayedRaise == -1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); } void KMdiDockContainer::save( TDEConfig* cfg, const TQString& group_or_prefix ) @@ -744,7 +744,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) kapp->syncX();*/ m_delayedRaise = it.data(); - TQTimer::singleShot( 0, this, TQT_SLOT( delayedRaise() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( delayedRaise() ) ); kdDebug( 760 ) << k_funcinfo << "raising" << it.key() ->name() << endl; break; } @@ -752,7 +752,7 @@ void KMdiDockContainer::load( TDEConfig* cfg, const TQString& group_or_prefix ) } if ( m_delayedRaise == -1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( init() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( init() ) ); cfg->setGroup( grp ); } diff --git a/tdemdi/tdemdidocumentviewtabwidget.cpp b/tdemdi/tdemdidocumentviewtabwidget.cpp index 824aa12c4..7ef98747f 100644 --- a/tdemdi/tdemdidocumentviewtabwidget.cpp +++ b/tdemdi/tdemdidocumentviewtabwidget.cpp @@ -18,7 +18,7 @@ KMdiDocumentViewTabWidget::KMdiDocumentViewTabWidget( TQWidget* parent, const ch m_visibility = KMdi::ShowWhenMoreThanOneTab; tabBar() ->hide(); setHoverCloseButton( true ); - connect( this, TQT_SIGNAL( closeRequest( TQWidget* ) ), this, TQT_SLOT( closeTab( TQWidget* ) ) ); + connect( this, TQ_SIGNAL( closeRequest( TQWidget* ) ), this, TQ_SLOT( closeTab( TQWidget* ) ) ); } KMdiDocumentViewTabWidget::~KMdiDocumentViewTabWidget() @@ -32,28 +32,28 @@ void KMdiDocumentViewTabWidget::addTab ( TQWidget * child, const TQString & labe { KTabWidget::addTab( child, label ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); } void KMdiDocumentViewTabWidget::addTab ( TQWidget * child, const TQIconSet & iconset, const TQString & label ) { KTabWidget::addTab( child, iconset, label ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); } void KMdiDocumentViewTabWidget::addTab ( TQWidget * child, TQTab * tab ) { KTabWidget::addTab( child, tab ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); } void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQString & label, int index ) { KTabWidget::insertTab( child, label, index ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); tabBar() ->repaint(); } @@ -61,7 +61,7 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, const TQIconSet & { KTabWidget::insertTab( child, iconset, label, index ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); tabBar() ->repaint(); } @@ -69,14 +69,14 @@ void KMdiDocumentViewTabWidget::insertTab ( TQWidget * child, TQTab * tab, int i { KTabWidget::insertTab( child, tab, index ); showPage( child ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); tabBar() ->repaint(); } void KMdiDocumentViewTabWidget::removePage ( TQWidget * w ) { KTabWidget::removePage( w ); - TQTimer::singleShot(0, this, TQT_SLOT(maybeShow())); + TQTimer::singleShot(0, this, TQ_SLOT(maybeShow())); } void KMdiDocumentViewTabWidget::updateIconInView( TQWidget *w, TQPixmap icon ) diff --git a/tdemdi/tdemdifocuslist.cpp b/tdemdi/tdemdifocuslist.cpp index 68983b6f5..edabbae4d 100644 --- a/tdemdi/tdemdifocuslist.cpp +++ b/tdemdi/tdemdifocuslist.cpp @@ -33,7 +33,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) m_list.insert( w, w->focusPolicy() ); w->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding toplevel" << endl; - connect( w, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); + connect( w, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); TQObjectList *l = w->queryList( "TQWidget" ); TQObjectListIt it( *l ); TQObject *obj; @@ -43,7 +43,7 @@ void KMdiFocusList::addWidgetTree( TQWidget* w ) m_list.insert( wid, wid->focusPolicy() ); wid->setFocusPolicy( TQWidget::ClickFocus ); kdDebug( 760 ) << "KMdiFocusList::addWidgetTree: adding widget" << endl; - connect( wid, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); + connect( wid, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( objectHasBeenDestroyed( TQObject* ) ) ); ++it; } delete l; diff --git a/tdemdi/tdemdiguiclient.cpp b/tdemdi/tdemdiguiclient.cpp index 0fa6d92d4..d10ef90bb 100644 --- a/tdemdi/tdemdiguiclient.cpp +++ b/tdemdi/tdemdiguiclient.cpp @@ -63,9 +63,9 @@ ToggleToolViewAction::ToggleToolViewAction( const TQString& text, const TDEShort { if ( m_dw ) { - connect( this, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotToggled( bool ) ) ); - connect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) ); - connect( m_dw, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( this, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotToggled( bool ) ) ); + connect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) ); + connect( m_dw, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotWidgetDestroyed() ) ); setChecked( m_dw->mayBeHide() ); } } @@ -104,8 +104,8 @@ void ToggleToolViewAction::slotToggled( bool t ) void ToggleToolViewAction::slotWidgetDestroyed() { - disconnect( m_dw->dockManager(), TQT_SIGNAL( change() ), this, TQT_SLOT( anDWChanged() ) ); - disconnect( this, TQT_SIGNAL( toggled( bool ) ), 0, 0 ); + disconnect( m_dw->dockManager(), TQ_SIGNAL( change() ), this, TQ_SLOT( anDWChanged() ) ); + disconnect( this, TQ_SIGNAL( toggled( bool ) ), 0, 0 ); unplugAll(); deleteLater(); } @@ -116,8 +116,8 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c { m_mdiMode = KMdi::ChildframeMode; m_mdiMainFrm = mdiMainFrm; - connect( mdiMainFrm->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( mdiMainFrm->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -143,27 +143,27 @@ KMDIGUIClient::KMDIGUIClient( KMdiMainFrm* mdiMainFrm, bool showMDIModeAction, c TQStringList modes; modes << i18n( "&Toplevel Mode" ) << i18n( "C&hildframe Mode" ) << i18n( "Ta&b Page Mode" ) << i18n( "I&DEAl Mode" ); m_mdiModeAction->setItems( modes ); - connect( m_mdiModeAction, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( changeViewMode( int ) ) ); + connect( m_mdiModeAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( changeViewMode( int ) ) ); } else m_mdiModeAction = 0; - connect( m_mdiMainFrm, TQT_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), - this, TQT_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); + connect( m_mdiMainFrm, TQ_SIGNAL( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ), + this, TQ_SLOT( mdiModeHasBeenChangedTo( KMdi::MdiMode ) ) ); m_gotoToolDockMenu = new TDEActionMenu( i18n( "Tool &Docks" ), actionCollection(), "tdemdi_tooldock_menu" ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQT_SIGNAL( toggleTop() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Top Dock" ), ALT + CTRL + SHIFT + Key_T, this, TQ_SIGNAL( toggleTop() ), actionCollection(), "tdemdi_activate_top" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQT_SIGNAL( toggleLeft() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Left Dock" ), ALT + CTRL + SHIFT + Key_L, this, TQ_SIGNAL( toggleLeft() ), actionCollection(), "tdemdi_activate_left" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQT_SIGNAL( toggleRight() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Right Dock" ), ALT + CTRL + SHIFT + Key_R, this, TQ_SIGNAL( toggleRight() ), actionCollection(), "tdemdi_activate_right" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQT_SIGNAL( toggleBottom() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Switch Bottom Dock" ), ALT + CTRL + SHIFT + Key_B, this, TQ_SIGNAL( toggleBottom() ), actionCollection(), "tdemdi_activate_bottom" ) ); m_gotoToolDockMenu->insert( new TDEActionSeparator( actionCollection(), "tdemdi_goto_menu_separator" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQT_SLOT( prevToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Previous Tool View" ), ALT + CTRL + Key_Left, m_mdiMainFrm, TQ_SLOT( prevToolViewInDock() ), actionCollection(), "tdemdi_prev_toolview" ) ); - m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQT_SLOT( nextToolViewInDock() ), + m_gotoToolDockMenu->insert( new TDEAction( i18n( "Next Tool View" ), ALT + CTRL + Key_Right, m_mdiMainFrm, TQ_SLOT( nextToolViewInDock() ), actionCollection(), "tdemdi_next_toolview" ) ); actionCollection() ->readShortcutSettings( "Shortcuts", kapp->config() ); @@ -225,7 +225,7 @@ void KMDIGUIClient::setupActions() // m_toolBars = builder.toolBars(); // m_toolViewActions.append(new TDEAction( "TESTKMDIGUICLIENT", TQString::null, 0, - // this, TQT_SLOT(blah()),actionCollection(),"nothing")); + // this, TQ_SLOT(blah()),actionCollection(),"nothing")); TQPtrList addList; if ( m_toolViewActions.count() < 3 ) @@ -265,7 +265,7 @@ void KMDIGUIClient::addToolView( KMdiToolViewAccessor* mtva ) ( ( ToggleToolViewAction* ) a ) ->setCheckedState( TQString(i18n( "Hide %1" ).arg( mtva->wrappedWidget() ->caption() )) ); #endif - connect( a, TQT_SIGNAL( destroyed( TQObject* ) ), this, TQT_SLOT( actionDeleted( TQObject* ) ) ); + connect( a, TQ_SIGNAL( destroyed( TQObject* ) ), this, TQ_SLOT( actionDeleted( TQObject* ) ) ); m_toolViewActions.append( a ); m_toolMenu->insert( a ); mtva->d->action = a; diff --git a/tdemdi/tdemdimainfrm.cpp b/tdemdi/tdemdimainfrm.cpp index c265503ff..e1e8e8f4f 100644 --- a/tdemdi/tdemdimainfrm.cpp +++ b/tdemdi/tdemdimainfrm.cpp @@ -207,7 +207,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pWindowMenu = new TQPopupMenu( this, "window_menu" ); m_pWindowMenu->setCheckable( true ); - TQObject::connect( m_pWindowMenu, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillWindowMenu() ) ); + TQObject::connect( m_pWindowMenu, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillWindowMenu() ) ); m_pDockMenu = new TQPopupMenu( this, "dock_menu" ); m_pDockMenu->setCheckable( true ); @@ -218,7 +218,7 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod m_pPlacingMenu = new TQPopupMenu( this, "placing_menu" ); d->closeWindowAction = new TDEAction(i18n("&Close"), TDEStdAccel::close(), - this, TQT_SLOT(closeActiveView()), actionCollection(), "window_close"); + this, TQ_SLOT(closeActiveView()), actionCollection(), "window_close"); // the MDI view taskbar createTaskBar(); @@ -249,11 +249,11 @@ KMdiMainFrm::KMdiMainFrm( TQWidget* parentWidget, const char* name, KMdi::MdiMod // drag end timer m_pDragEndTimer = new TQTimer(); - connect( m_pDragEndTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( dragEndTimeOut() ) ); - connect( guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient* ) ), - this, TQT_SLOT( verifyToplevelHeight() ) ); - connect( guiFactory(), TQT_SIGNAL( clientRemoved( KXMLGUIClient* ) ), - this, TQT_SLOT( verifyToplevelHeight() ) ); + connect( m_pDragEndTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( dragEndTimeOut() ) ); + connect( guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient* ) ), + this, TQ_SLOT( verifyToplevelHeight() ) ); + connect( guiFactory(), TQ_SIGNAL( clientRemoved( KXMLGUIClient* ) ), + this, TQ_SLOT( verifyToplevelHeight() ) ); } void KMdiMainFrm::verifyToplevelHeight() @@ -271,21 +271,21 @@ void KMdiMainFrm::verifyToplevelHeight() void KMdiMainFrm::setStandardMDIMenuEnabled( bool showModeMenu ) { m_mdiGUIClient = new KMDIPrivate::KMDIGUIClient( this, showModeMenu ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleTop() ), this, TQT_SIGNAL( toggleTop() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleLeft() ), this, TQT_SIGNAL( toggleLeft() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleRight() ), this, TQT_SIGNAL( toggleRight() ) ); - connect( m_mdiGUIClient, TQT_SIGNAL( toggleBottom() ), this, TQT_SIGNAL( toggleBottom() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleTop() ), this, TQ_SIGNAL( toggleTop() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleLeft() ), this, TQ_SIGNAL( toggleLeft() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleRight() ), this, TQ_SIGNAL( toggleRight() ) ); + connect( m_mdiGUIClient, TQ_SIGNAL( toggleBottom() ), this, TQ_SIGNAL( toggleBottom() ) ); if ( m_mdiMode == KMdi::IDEAlMode ) { if ( m_topContainer ) - connect( this, TQT_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleTop() ), m_topContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_leftContainer ) - connect( this, TQT_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleLeft() ), m_leftContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_rightContainer ) - connect( this, TQT_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleRight() ), m_rightContainer->getWidget(), TQ_SLOT( toggle() ) ); if ( m_bottomContainer ) - connect( this, TQT_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQT_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( toggleBottom() ), m_bottomContainer->getWidget(), TQ_SLOT( toggle() ) ); } emit mdiModeHasBeenChangedTo( m_mdiMode ); @@ -363,16 +363,16 @@ void KMdiMainFrm::createMdiManager() kdDebug(760) << k_funcinfo << "creating MDI manager" << endl; m_pMdi = new KMdiChildArea( this ); setCentralWidget( m_pMdi ); - TQObject::connect( m_pMdi, TQT_SIGNAL( nowMaximized( bool ) ), - this, TQT_SLOT( setEnableMaximizedChildFrmMode( bool ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ), - this, TQT_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ), - this, TQT_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( popupWindowMenu( TQPoint ) ), - this, TQT_SLOT( popupWindowMenu( TQPoint ) ) ); - TQObject::connect( m_pMdi, TQT_SIGNAL( lastChildFrmClosed() ), - this, TQT_SIGNAL( lastChildFrmClosed() ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( nowMaximized( bool ) ), + this, TQ_SLOT( setEnableMaximizedChildFrmMode( bool ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( noMaximizedChildFrmLeft( KMdiChildFrm* ) ), + this, TQ_SLOT( switchOffMaximizeModeForMenu( KMdiChildFrm* ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( sysButtonConnectionsMustChange( KMdiChildFrm*, KMdiChildFrm* ) ), + this, TQ_SLOT( updateSysButtonConnections( KMdiChildFrm*, KMdiChildFrm* ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( popupWindowMenu( TQPoint ) ), + this, TQ_SLOT( popupWindowMenu( TQPoint ) ) ); + TQObject::connect( m_pMdi, TQ_SIGNAL( lastChildFrmClosed() ), + this, TQ_SIGNAL( lastChildFrmClosed() ) ); } //============ createTaskBar ==============// @@ -458,14 +458,14 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) d->closeWindowAction->setEnabled(true); // common connections used when under MDI control - TQObject::connect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( activated( KMdiChildView* ) ), this, TQT_SIGNAL( viewActivated( KMdiChildView* ) ) ); - TQObject::connect( pWnd, TQT_SIGNAL( deactivated( KMdiChildView* ) ), this, TQT_SIGNAL( viewDeactivated( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( activated( KMdiChildView* ) ), this, TQ_SIGNAL( viewActivated( KMdiChildView* ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( deactivated( KMdiChildView* ) ), this, TQ_SIGNAL( viewDeactivated( KMdiChildView* ) ) ); if ( index == -1 ) m_pDocumentViews->append( pWnd ); @@ -475,7 +475,7 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) if ( m_pTaskBar ) { KMdiTaskBarButton* but = m_pTaskBar->addWinButton( pWnd ); - TQObject::connect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) ); + TQObject::connect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) ); } // embed the view depending on the current MDI mode @@ -487,8 +487,8 @@ void KMdiMainFrm::addWindow( KMdiChildView* pWnd, int flags, int index ) m_documentTabWidget->insertTab( pWnd, pixmap, pWnd->tabCaption(), index ); - connect( pWnd, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); - connect( pWnd, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); + connect( pWnd, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); + connect( pWnd, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); } else { @@ -736,19 +736,19 @@ void KMdiMainFrm::removeWindowFromMdi( KMdiChildView *pWnd ) if ( m_pWinList->count() == 0 ) m_pCurrentWindow = 0L; - TQObject::disconnect( pWnd, TQT_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( attachWindow( KMdiChildView*, bool ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQT_SLOT( detachWindow( KMdiChildView*, bool ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQT_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInWindowMenu( int ) ), this, TQT_SLOT( windowMenuItemActivated( int ) ) ); - TQObject::disconnect( pWnd, TQT_SIGNAL( clickedInDockMenu( int ) ), this, TQT_SLOT( dockMenuItemActivated( int ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( attachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( attachWindow( KMdiChildView*, bool ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( detachWindow( KMdiChildView*, bool ) ), this, TQ_SLOT( detachWindow( KMdiChildView*, bool ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( focusInEventOccurs( KMdiChildView* ) ), this, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( childWindowCloseRequest( KMdiChildView* ) ), this, TQ_SLOT( childWindowCloseRequest( KMdiChildView* ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInWindowMenu( int ) ), this, TQ_SLOT( windowMenuItemActivated( int ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( clickedInDockMenu( int ) ), this, TQ_SLOT( dockMenuItemActivated( int ) ) ); if ( m_pTaskBar ) { KMdiTaskBarButton * but = m_pTaskBar->getButton( pWnd ); if ( but != 0L ) { - TQObject::disconnect( pWnd, TQT_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQT_SLOT( setNewText( const TQString& ) ) ); + TQObject::disconnect( pWnd, TQ_SIGNAL( tabCaptionChanged( const TQString& ) ), but, TQ_SLOT( setNewText( const TQString& ) ) ); } m_pTaskBar->removeWinButton( pWnd ); } @@ -989,19 +989,19 @@ TQPopupMenu* KMdiMainFrm::taskBarPopup( KMdiChildView *pWnd, bool /*bIncludeWind m_pTaskBarPopup->clear(); if ( pWnd->isAttached() ) { - m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQT_SLOT( detach() ) ); + m_pTaskBarPopup->insertItem( i18n( "Undock" ), pWnd, TQ_SLOT( detach() ) ); m_pTaskBarPopup->insertSeparator(); if ( pWnd->isMinimized() || pWnd->isMaximized() ) - m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQT_SLOT( restore() ) ); + m_pTaskBarPopup->insertItem( i18n( "Restore" ), pWnd, TQ_SLOT( restore() ) ); if ( !pWnd->isMaximized() ) - m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQT_SLOT( maximize() ) ); + m_pTaskBarPopup->insertItem( i18n( "Maximize" ), pWnd, TQ_SLOT( maximize() ) ); if ( !pWnd->isMinimized() ) - m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQT_SLOT( minimize() ) ); + m_pTaskBarPopup->insertItem( i18n( "Minimize" ), pWnd, TQ_SLOT( minimize() ) ); } else - m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQT_SLOT( attach() ) ); + m_pTaskBarPopup->insertItem( i18n( "Dock" ), pWnd, TQ_SLOT( attach() ) ); m_pTaskBarPopup->insertSeparator(); - m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQT_SLOT( close() ) ); + m_pTaskBarPopup->insertItem( i18n( "Close" ), pWnd, TQ_SLOT( close() ) ); // the window has a view...get the window popup m_pTaskBarPopup->insertSeparator(); m_pTaskBarPopup->insertItem( i18n( "Operations" ), windowPopup( pWnd, false ) ); //alvoid recursion @@ -1633,7 +1633,7 @@ void KMdiMainFrm::switchToTabPageMode() if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); if ( m_pDocumentViews->count() > 0 ) m_pClose->show(); } @@ -1650,7 +1650,7 @@ void KMdiMainFrm::finishTabPageMode() if ( m_mdiMode == KMdi::TabPageMode ) { m_pClose->hide(); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); TQPtrListIterator it( *m_pDocumentViews ); for ( ; it.current(); ++it ) @@ -1715,7 +1715,7 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace() #endif delete m_documentTabWidget; m_documentTabWidget = new KMdiDocumentViewTabWidget( m_pDockbaseAreaOfDocumentViews ); - connect( m_documentTabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), this, TQT_SLOT( slotDocCurrentChanged( TQWidget* ) ) ); + connect( m_documentTabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), this, TQ_SLOT( slotDocCurrentChanged( TQWidget* ) ) ); m_pDockbaseAreaOfDocumentViews->setWidget( m_documentTabWidget ); m_documentTabWidget->show(); TQPtrListIterator it4( *m_pDocumentViews ); @@ -1724,11 +1724,11 @@ void KMdiMainFrm::setupTabbedDocumentViewSpace() KMdiChildView* pView = it4.current(); m_documentTabWidget->addTab( pView, pView->icon() ? *( pView->icon() ) : TQPixmap(), pView->tabCaption() ); /* - connect(pView,TQT_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)), - m_documentTabWidget,TQT_SLOT(updateView(TQWidget*,TQPixmap,const TQString&))); + connect(pView,TQ_SIGNAL(iconOrCaptionUdpated(TQWidget*,TQPixmap,const TQString&)), + m_documentTabWidget,TQ_SLOT(updateView(TQWidget*,TQPixmap,const TQString&))); */ - connect( pView, TQT_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQT_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); - connect( pView, TQT_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQT_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); + connect( pView, TQ_SIGNAL( iconUpdated( TQWidget*, TQPixmap ) ), m_documentTabWidget, TQ_SLOT( updateIconInView( TQWidget*, TQPixmap ) ) ); + connect( pView, TQ_SIGNAL( captionUpdated( TQWidget*, const TQString& ) ), m_documentTabWidget, TQ_SLOT( updateCaptionInView( TQWidget*, const TQString& ) ) ); } } @@ -1858,7 +1858,7 @@ void KMdiMainFrm::switchToIDEAlMode() if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); if ( m_pDocumentViews->count() > 0 ) m_pClose->show(); } @@ -1956,40 +1956,40 @@ void KMdiMainFrm::setupToolViewsForIDEALMode() m_leftContainer->manualDock( mainDock, KDockWidget::DockLeft, 20 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleLeft() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleLeft() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_rightContainer->setWidget( tmpDC = new KMdiDockContainer( m_rightContainer, this, KDockWidget::DockRight, d->m_styleIDEAlMode ) ); m_rightContainer->setEnableDocking( KDockWidget::DockRight ); m_rightContainer->manualDock( mainDock, KDockWidget::DockRight, 80 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleRight() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleRight() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_topContainer->setWidget( tmpDC = new KMdiDockContainer( m_topContainer, this, KDockWidget::DockTop, d->m_styleIDEAlMode ) ); m_topContainer->setEnableDocking( KDockWidget::DockTop ); m_topContainer->manualDock( mainDock, KDockWidget::DockTop, 20 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleTop() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleTop() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_bottomContainer->setWidget( tmpDC = new KMdiDockContainer( m_bottomContainer, this, KDockWidget::DockBottom, d->m_styleIDEAlMode ) ); m_bottomContainer->setEnableDocking( KDockWidget::DockBottom ); m_bottomContainer->manualDock( mainDock, KDockWidget::DockBottom, 80 ); tmpDC->init(); if ( m_mdiGUIClient ) - connect ( this, TQT_SIGNAL( toggleBottom() ), tmpDC, TQT_SLOT( toggle() ) ); - connect( this, TQT_SIGNAL( collapseOverlapContainers() ), tmpDC, TQT_SLOT( collapseOverlapped() ) ); - connect( tmpDC, TQT_SIGNAL( activated( KMdiDockContainer* ) ), this, TQT_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); - connect( tmpDC, TQT_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQT_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); + connect ( this, TQ_SIGNAL( toggleBottom() ), tmpDC, TQ_SLOT( toggle() ) ); + connect( this, TQ_SIGNAL( collapseOverlapContainers() ), tmpDC, TQ_SLOT( collapseOverlapped() ) ); + connect( tmpDC, TQ_SIGNAL( activated( KMdiDockContainer* ) ), this, TQ_SLOT( setActiveToolDock( KMdiDockContainer* ) ) ); + connect( tmpDC, TQ_SIGNAL( deactivated( KMdiDockContainer* ) ), this, TQ_SLOT( removeFromActiveDockList( KMdiDockContainer* ) ) ); m_leftContainer->setDockSite( KDockWidget::DockCenter ); m_rightContainer->setDockSite( KDockWidget::DockCenter ); @@ -2024,7 +2024,7 @@ void KMdiMainFrm::finishIDEAlMode( bool full ) { assert( m_pClose ); m_pClose->hide(); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeViewButtonPressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeViewButtonPressed() ) ); TQStringList leftNames; @@ -2432,23 +2432,23 @@ void KMdiMainFrm::setEnableMaximizedChildFrmMode( bool enableMaxChildFrameMode ) if ( !pCurrentChild || !m_pMainMenuBar ) return ; - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( undockPressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( maximizePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( maximizePressed() ) ); m_pMinimize->show(); m_pUndock->show(); m_pRestore->show(); if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook ) { - m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQT_SLOT( closePressed() ), 0, -1, 0 ); + m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), m_pMdi->topChild(), TQ_SLOT( closePressed() ), 0, -1, 0 ); } else { m_pMainMenuBar->insertItem( *pCurrentChild->icon(), pCurrentChild->systemMenu(), -1, 0 ); if ( m_pClose ) { - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), pCurrentChild, TQT_SLOT( closePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), pCurrentChild, TQ_SLOT( closePressed() ) ); m_pClose->show(); } else @@ -2484,10 +2484,10 @@ void KMdiMainFrm::switchOffMaximizeModeForMenu( KMdiChildFrm* oldChild ) if ( oldChild ) { Q_ASSERT( m_pClose ); - TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) ); - TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) ); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) ); + TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) ); } m_pUndock->hide(); m_pMinimize->hide(); @@ -2506,7 +2506,7 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF if ( newChild ) { if ( frameDecorOfAttachedViews() == KMdi::KDELaptopLook ) - m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQT_SLOT( closePressed() ), 0, -1, 0 ); + m_pMainMenuBar->insertItem( TQPixmap( kde2laptop_closebutton_menu ), newChild, TQ_SLOT( closePressed() ), 0, -1, 0 ); else m_pMainMenuBar->insertItem( *newChild->icon(), newChild->systemMenu(), -1, 0 ); } @@ -2515,18 +2515,18 @@ void KMdiMainFrm::updateSysButtonConnections( KMdiChildFrm* oldChild, KMdiChildF { m_pMainMenuBar->removeItem( m_pMainMenuBar->idAt( 1 ) ); Q_ASSERT( m_pClose ); - TQObject::disconnect( m_pUndock, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( undockPressed() ) ); - TQObject::disconnect( m_pMinimize, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( minimizePressed() ) ); - TQObject::disconnect( m_pRestore, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( maximizePressed() ) ); - TQObject::disconnect( m_pClose, TQT_SIGNAL( clicked() ), oldChild, TQT_SLOT( closePressed() ) ); + TQObject::disconnect( m_pUndock, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( undockPressed() ) ); + TQObject::disconnect( m_pMinimize, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( minimizePressed() ) ); + TQObject::disconnect( m_pRestore, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( maximizePressed() ) ); + TQObject::disconnect( m_pClose, TQ_SIGNAL( clicked() ), oldChild, TQ_SLOT( closePressed() ) ); } if ( newChild ) { Q_ASSERT( m_pClose ); - TQObject::connect( m_pUndock, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( undockPressed() ) ); - TQObject::connect( m_pMinimize, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( minimizePressed() ) ); - TQObject::connect( m_pRestore, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( maximizePressed() ) ); - TQObject::connect( m_pClose, TQT_SIGNAL( clicked() ), newChild, TQT_SLOT( closePressed() ) ); + TQObject::connect( m_pUndock, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( undockPressed() ) ); + TQObject::connect( m_pMinimize, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( minimizePressed() ) ); + TQObject::connect( m_pRestore, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( maximizePressed() ) ); + TQObject::connect( m_pClose, TQ_SIGNAL( clicked() ), newChild, TQ_SLOT( closePressed() ) ); } } @@ -2574,7 +2574,7 @@ void KMdiMainFrm::fillWindowMenu() d->closeWindowAction->plug(m_pWindowMenu); - int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQT_SLOT( closeAllViews() ) ); + int closeAllId = m_pWindowMenu->insertItem( i18n( "Close &All" ), this, TQ_SLOT( closeAllViews() ) ); if ( noViewOpened ) { d->closeWindowAction->setEnabled(false); @@ -2583,7 +2583,7 @@ void KMdiMainFrm::fillWindowMenu() if ( !tabPageMode && !IDEAlMode ) { - int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQT_SLOT( iconifyAllViews() ) ); + int iconifyId = m_pWindowMenu->insertItem( i18n( "&Minimize All" ), this, TQ_SLOT( iconifyAllViews() ) ); if ( noViewOpened ) m_pWindowMenu->setItemEnabled( iconifyId, false ); } @@ -2591,10 +2591,10 @@ void KMdiMainFrm::fillWindowMenu() m_pWindowMenu->insertSeparator(); m_pWindowMenu->insertItem( i18n( "&MDI Mode" ), m_pMdiModeMenu ); m_pMdiModeMenu->clear(); - m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQT_SLOT( switchToToplevelMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQT_SLOT( switchToChildframeMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQT_SLOT( switchToTabPageMode() ) ); - m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQT_SLOT( switchToIDEAlMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "&Toplevel Mode" ), this, TQ_SLOT( switchToToplevelMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "C&hildframe Mode" ), this, TQ_SLOT( switchToChildframeMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "Ta&b Page Mode" ), this, TQ_SLOT( switchToTabPageMode() ) ); + m_pMdiModeMenu->insertItem( i18n( "I&DEAl Mode" ), this, TQ_SLOT( switchToIDEAlMode() ) ); switch ( m_mdiMode ) { case KMdi::ToplevelMode: @@ -2618,13 +2618,13 @@ void KMdiMainFrm::fillWindowMenu() { int placMenuId = m_pWindowMenu->insertItem( i18n( "&Tile" ), m_pPlacingMenu ); m_pPlacingMenu->clear(); - m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQT_SLOT( cascadeWindows() ) ); - m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQT_SLOT( cascadeMaximized() ) ); - m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQT_SLOT( expandVertical() ) ); - m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQT_SLOT( expandHorizontal() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQT_SLOT( tileAnodine() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQT_SLOT( tilePragma() ) ); - m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQT_SLOT( tileVertically() ) ); + m_pPlacingMenu->insertItem( i18n( "Ca&scade Windows" ), m_pMdi, TQ_SLOT( cascadeWindows() ) ); + m_pPlacingMenu->insertItem( i18n( "Cascade &Maximized" ), m_pMdi, TQ_SLOT( cascadeMaximized() ) ); + m_pPlacingMenu->insertItem( i18n( "Expand &Vertically" ), m_pMdi, TQ_SLOT( expandVertical() ) ); + m_pPlacingMenu->insertItem( i18n( "Expand &Horizontally" ), m_pMdi, TQ_SLOT( expandHorizontal() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile &Non-Overlapped" ), m_pMdi, TQ_SLOT( tileAnodine() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile Overla&pped" ), m_pMdi, TQ_SLOT( tilePragma() ) ); + m_pPlacingMenu->insertItem( i18n( "Tile V&ertically" ), m_pMdi, TQ_SLOT( tileVertically() ) ); if ( m_mdiMode == KMdi::ToplevelMode ) { m_pWindowMenu->setItemEnabled( placMenuId, false ); @@ -2686,7 +2686,7 @@ void KMdiMainFrm::fillWindowMenu() } if ( putHere ) { - m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount ); + m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, indx + entryCount ); if ( pView == m_pCurrentWindow ) { m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( indx + entryCount ), true ); @@ -2694,7 +2694,7 @@ void KMdiMainFrm::fillWindowMenu() pView->setWindowMenuID( i ); if ( !tabPageMode ) { - m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, indx ); + m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, indx ); if ( pView->isAttached() ) { m_pDockMenu->setItemChecked( m_pDockMenu->idAt( indx ), true ); @@ -2707,7 +2707,7 @@ void KMdiMainFrm::fillWindowMenu() } if ( !inserted ) { // append it - m_pWindowMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount ); + m_pWindowMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInWindowMenu() ), 0, -1, windowItemCount + entryCount ); if ( pView == m_pCurrentWindow ) { m_pWindowMenu->setItemChecked( m_pWindowMenu->idAt( windowItemCount + entryCount ), true ); @@ -2715,7 +2715,7 @@ void KMdiMainFrm::fillWindowMenu() pView->setWindowMenuID( i ); if ( !tabPageMode ) { - m_pDockMenu->insertItem( item, pView, TQT_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount ); + m_pDockMenu->insertItem( item, pView, TQ_SLOT( slot_clickedInDockMenu() ), 0, -1, windowItemCount ); if ( pView->isAttached() ) { m_pDockMenu->setItemChecked( m_pDockMenu->idAt( windowItemCount ), true ); diff --git a/tdemdi/tdemditaskbar.cpp b/tdemdi/tdemditaskbar.cpp index e10730dea..b2b2c0652 100644 --- a/tdemdi/tdemditaskbar.cpp +++ b/tdemdi/tdemditaskbar.cpp @@ -175,11 +175,11 @@ KMdiTaskBarButton * KMdiTaskBar::addWinButton( KMdiChildView *win_ptr ) } KMdiTaskBarButton *b = new KMdiTaskBarButton( this, win_ptr ); - TQObject::connect( b, TQT_SIGNAL( clicked() ), win_ptr, TQT_SLOT( setFocus() ) ); - TQObject::connect( b, TQT_SIGNAL( clicked( KMdiChildView* ) ), this, TQT_SLOT( setActiveButton( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( activateView( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQT_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) ); - TQObject::connect( b, TQT_SIGNAL( buttonTextChanged( int ) ), this, TQT_SLOT( layoutTaskBar( int ) ) ); + TQObject::connect( b, TQ_SIGNAL( clicked() ), win_ptr, TQ_SLOT( setFocus() ) ); + TQObject::connect( b, TQ_SIGNAL( clicked( KMdiChildView* ) ), this, TQ_SLOT( setActiveButton( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( leftMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( activateView( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( rightMouseButtonClicked( KMdiChildView* ) ), m_pFrm, TQ_SLOT( taskbarButtonRightClicked( KMdiChildView* ) ) ); + TQObject::connect( b, TQ_SIGNAL( buttonTextChanged( int ) ), this, TQ_SLOT( layoutTaskBar( int ) ) ); m_pButtonList->append( b ); b->setToggleButton( true ); b->setText( win_ptr->tabCaption() ); diff --git a/tdemdi/tdemditoolviewaccessor.cpp b/tdemdi/tdemditoolviewaccessor.cpp index 187e89d98..ce5886253 100644 --- a/tdemdi/tdemditoolviewaccessor.cpp +++ b/tdemdi/tdemditoolviewaccessor.cpp @@ -95,7 +95,7 @@ TQWidget *KMdiToolViewAccessor::wrapperWidget() if ( !d->widgetContainer ) { d->widgetContainer = mdiMainFrm->createDockWidget( "KMdiToolViewAccessor::null", TQPixmap() ); - connect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) ); + connect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) ); } return d->widgetContainer; } @@ -110,7 +110,7 @@ void KMdiToolViewAccessor::setWidgetToWrap( TQWidget *widgetToWrap, const TQStri { Q_ASSERT( !( d->widget ) ); Q_ASSERT( !widgetToWrap->inherits( "KDockWidget" ) ); - disconnect( d->widgetContainer, TQT_SIGNAL( widgetSet( TQWidget* ) ), this, TQT_SLOT( setWidgetToWrap( TQWidget* ) ) ); + disconnect( d->widgetContainer, TQ_SIGNAL( widgetSet( TQWidget* ) ), this, TQ_SLOT( setWidgetToWrap( TQWidget* ) ) ); delete d->widget; d->widget = widgetToWrap; KDockWidget *tmp = d->widgetContainer; diff --git a/tdemdi/test/hello.cpp b/tdemdi/test/hello.cpp index d92233ea6..0790ce491 100644 --- a/tdemdi/test/hello.cpp +++ b/tdemdi/test/hello.cpp @@ -22,7 +22,7 @@ Hello::Hello( const char *title, const char *text, TQWidget *parentWidget ) : KMdiChildView(title, parentWidget), t(text), b(0) { TQTimer *timer = new TQTimer(this); - TQObject::connect( timer, TQT_SIGNAL(timeout()), TQT_SLOT(animate()) ); + TQObject::connect( timer, TQ_SIGNAL(timeout()), TQ_SLOT(animate()) ); timer->start( 40 ); resize( 260, 130 ); diff --git a/tdemdi/test/mainwidget.cpp b/tdemdi/test/mainwidget.cpp index cf41c1647..6438ff978 100644 --- a/tdemdi/test/mainwidget.cpp +++ b/tdemdi/test/mainwidget.cpp @@ -114,7 +114,7 @@ RestartWidget::RestartWidget():TDEMainWindow() TQLabel* l = new TQLabel("This is for the testing of\nKMdiMainFrm::read/writeDockConfig().\n", this); TQCheckBox* b1 = new TQCheckBox("KMdiMainFrm close/restart", this); b1->toggle(); - TQObject::connect(b1, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(onStateChanged(int))); + TQObject::connect(b1, TQ_SIGNAL(stateChanged(int)), this, TQ_SLOT(onStateChanged(int))); bl->add(l); bl->add(b1); bl->setMargin(10); diff --git a/tdenewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp index 45e3c1ebb..9a1cb2ee2 100644 --- a/tdenewstuff/downloaddialog.cpp +++ b/tdenewstuff/downloaddialog.cpp @@ -156,12 +156,12 @@ void DownloadDialog::init(Engine *engine) box->add(d->m_loadingLabel); box->addItem(new TQSpacerItem(0, 0, TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), TQT_SLOT(slotPage(TQWidget*))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), TQ_SLOT(slotPage(TQWidget*))); if(!engine) { m_loader = new ProviderLoader(this); - connect(m_loader, TQT_SIGNAL(providersLoaded(Provider::List*)), TQT_SLOT(slotProviders(Provider::List*))); + connect(m_loader, TQ_SIGNAL(providersLoaded(Provider::List*)), TQ_SLOT(slotProviders(Provider::List*))); } m_entries.setAutoDelete(true); @@ -273,7 +273,7 @@ void DownloadDialog::addProvider(Provider *p) ctl->addTab(w_l, i18n("Latest")); m_curtab = 0; - connect(ctl, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(slotTab())); + connect(ctl, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(slotTab())); TQHBoxLayout *box = new TQHBoxLayout(frame); box->add(ctl); @@ -296,9 +296,9 @@ void DownloadDialog::addProvider(Provider *p) d->m_lvtmp_l->addColumn(i18n("Release Date")); d->m_lvtmp_l->setSorting(2, false); - connect(d->m_lvtmp_r, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected())); - connect(d->m_lvtmp_d, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected())); - connect(d->m_lvtmp_l, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected())); + connect(d->m_lvtmp_r, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected())); + connect(d->m_lvtmp_d, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected())); + connect(d->m_lvtmp_l, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected())); rt = new TQTextBrowser(frame); rt->setMinimumWidth(150); @@ -315,10 +315,10 @@ void DownloadDialog::addProvider(Provider *p) vbox->add(de); vbox->add(in); - connect(rt, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotEmail(const TQString&))); + connect(rt, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotEmail(const TQString&))); - connect(in, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstall())); - connect(de, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails())); + connect(in, TQ_SIGNAL(clicked()), TQ_SLOT(slotInstall())); + connect(de, TQ_SIGNAL(clicked()), TQ_SLOT(slotDetails())); TQVBoxLayout *box2 = new TQVBoxLayout(w_r); box2->add(d->m_lvtmp_r); @@ -340,7 +340,7 @@ void DownloadDialog::addProvider(Provider *p) if(m_engine) slotPage(frame); - TQTimer::singleShot(100, this, TQT_SLOT(slotFinish())); + TQTimer::singleShot(100, this, TQ_SLOT(slotFinish())); } void DownloadDialog::slotResult(TDEIO::Job *job) @@ -583,10 +583,10 @@ void DownloadDialog::slotInstall() // in the direct download ability for this to even be considered. if (e->payload().url().contains(OPENDESKTOP_REDIRECT_URL)) { TDEIO::TransferJob *job = TDEIO::get( KURL( e->payload() ), false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); } else { slotInstallPhase2(); @@ -616,7 +616,7 @@ void DownloadDialog::slotInstallPhase2() KURL dest = KURL(m_s->downloadDestination(e)); TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true); - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotInstalled(TDEIO::Job*))); } } @@ -944,9 +944,9 @@ void DownloadDialog::loadProvider(Provider *p) d->m_variants[variantjob] = urlvariants; m_data[variantjob] = ""; - connect(variantjob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(variantjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(variantjob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(variantjob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } if(variants.count() == 0) return; @@ -963,9 +963,9 @@ void DownloadDialog::loadProvider(Provider *p) //m_jobs[job] = p; // not used anymore due to variants m_data[job] = ""; - connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*))); - connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), - TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); + connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*))); + connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)), + TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&))); } void DownloadDialog::setType(TQString type) diff --git a/tdenewstuff/engine.cpp b/tdenewstuff/engine.cpp index 1427f7eb7..5d843afeb 100644 --- a/tdenewstuff/engine.cpp +++ b/tdenewstuff/engine.cpp @@ -84,8 +84,8 @@ void Engine::download() kdDebug() << "Engine::download()" << endl; connect( mProviderLoader, - TQT_SIGNAL( providersLoaded( Provider::List * ) ), - TQT_SLOT( getMetaInformation( Provider::List * ) ) ); + TQ_SIGNAL( providersLoaded( Provider::List * ) ), + TQ_SLOT( getMetaInformation( Provider::List * ) ) ); mProviderLoader->load( mType, mProviderList ); } @@ -106,10 +106,10 @@ void Engine::getMetaInformation( Provider::List *providers ) if ( p->downloadUrl().isEmpty() ) continue; TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl(), false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) ); mNewStuffJobData.insert( job, "" ); mProviderJobs[ job ] = p; @@ -218,8 +218,8 @@ void Engine::download( Entry *entry ) kdDebug() << " DESTINATION: " << destination.url() << endl; TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) ); } void Engine::slotDownloadJobResult( TDEIO::Job *job ) @@ -248,8 +248,8 @@ void Engine::upload(const TQString &fileName, const TQString &previewName ) mPreviewFile = previewName; connect( mProviderLoader, - TQT_SIGNAL( providersLoaded( Provider::List * ) ), - TQT_SLOT( selectUploadProvider( Provider::List * ) ) ); + TQ_SIGNAL( providersLoaded( Provider::List * ) ), + TQ_SLOT( selectUploadProvider( Provider::List * ) ) ); mProviderLoader->load( mType ); } @@ -340,8 +340,8 @@ void Engine::upload( Entry *entry ) destination.setFileName( fi.fileName() ); TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) ); } else { emit uploadFinished( false ); } @@ -402,8 +402,8 @@ void Engine::slotUploadPayloadJobResult( TDEIO::Job *job ) previewDestination.setFileName( fi.fileName() ); TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination ); - connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) ); + connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) ); } void Engine::slotUploadPreviewJobResult( TDEIO::Job *job ) @@ -421,8 +421,8 @@ void Engine::slotUploadPreviewJobResult( TDEIO::Job *job ) metaDestination.setFileName( fi.fileName() ); TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination ); - connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) ); + connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) ); } void Engine::slotUploadMetaJobResult( TDEIO::Job *job ) diff --git a/tdenewstuff/ghns.cpp b/tdenewstuff/ghns.cpp index 3217de80e..7a42ce098 100644 --- a/tdenewstuff/ghns.cpp +++ b/tdenewstuff/ghns.cpp @@ -51,7 +51,7 @@ GhnsWidget::GhnsWidget() TQPushButton *button = new TQPushButton( "Wallpapers", this ); topLayout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( downloadWallpapers() ) ); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( downloadWallpapers() ) ); topLayout->addSpacing( 5 ); @@ -61,7 +61,7 @@ GhnsWidget::GhnsWidget() TQPushButton *closeButton = new TQPushButton( "Close", this ); buttonLayout->addWidget( closeButton ); - connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) ); } GhnsWidget::~GhnsWidget() diff --git a/tdenewstuff/knewstuffbutton.cpp b/tdenewstuff/knewstuffbutton.cpp index 3baa83397..529573547 100644 --- a/tdenewstuff/knewstuffbutton.cpp +++ b/tdenewstuff/knewstuffbutton.cpp @@ -53,7 +53,7 @@ Button::Button(TQWidget* parent, const char* name) void Button::init() { setIconSet(SmallIconSet("knewstuff")); - connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog())); + connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(showDialog())); } void Button::setButtonText(const TQString& what) diff --git a/tdenewstuff/knewstuffsecure.cpp b/tdenewstuff/knewstuffsecure.cpp index 0f95c8c0c..d2c81ae35 100644 --- a/tdenewstuff/knewstuffsecure.cpp +++ b/tdenewstuff/knewstuffsecure.cpp @@ -37,7 +37,7 @@ TDENewStuffSecure::TDENewStuffSecure(const TQString &type, TQWidget *parentWidg : TDENewStuff(type, parentWidget) { m_tempDir = 0L; - connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool))); + connect(engine(), TQ_SIGNAL(uploadFinished(bool)), TQ_SLOT(slotUploadFinished(bool))); } @@ -74,7 +74,7 @@ bool TDENewStuffSecure::install(const TQString &fileName) else { m_tarName.prepend(m_tempDir->name()); - connect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int))); + connect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int))); Security::ref()->checkValidity(m_tarName); } } else @@ -154,7 +154,7 @@ void TDENewStuffSecure::slotValidated(int result) cfg->sync(); } removeTempDirectory(); - disconnect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int))); + disconnect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int))); } void TDENewStuffSecure::downloadResource() @@ -173,7 +173,7 @@ bool TDENewStuffSecure::createUploadFile(const TQString &fileName) void TDENewStuffSecure::uploadResource(const TQString& fileName) { - connect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); + connect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int))); removeTempDirectory(); m_tempDir = new KTempDir(); m_tempDir->setAutoDelete(true); @@ -194,7 +194,7 @@ void TDENewStuffSecure::slotFileSigned(int result) { if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel) { - disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); + disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int))); removeTempDirectory(); return; } @@ -217,7 +217,7 @@ void TDENewStuffSecure::slotFileSigned(int result) tar.close(); TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true); TDENewStuff::upload(m_signedFileName, TQString::null); - disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int))); + disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int))); } } diff --git a/tdenewstuff/provider.cpp b/tdenewstuff/provider.cpp index 862f31ef0..8247aa40f 100644 --- a/tdenewstuff/provider.cpp +++ b/tdenewstuff/provider.cpp @@ -213,10 +213,10 @@ void Provider::parseDomElement( const TQDomElement &element ) kdDebug() << "Provider::parseDomElement(): contentTypeUrl: " << contentTypeUrl << endl; TDEIO::TransferJob *job = TDEIO::get( KURL( contentTypeUrl ), false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); } } @@ -365,12 +365,12 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList ) kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl; TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ), false, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotJobResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ), - TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotJobResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ), + TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ) ); // job->dumpObjectInfo(); } @@ -419,7 +419,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job ) if ( p.tagName() == "provider" ) { Provider* prov = new Provider( p, mContentType, static_cast(parent()) ); mProviders.append( prov ); - connect( prov, TQT_SIGNAL( providerLoaded() ), this, TQT_SLOT( providerLoaded() ) ); + connect( prov, TQ_SIGNAL( providerLoaded() ), this, TQ_SLOT( providerLoaded() ) ); } } } diff --git a/tdenewstuff/security.cpp b/tdenewstuff/security.cpp index c6f8a4c3b..6952f1ec6 100644 --- a/tdenewstuff/security.cpp +++ b/tdenewstuff/security.cpp @@ -50,15 +50,15 @@ void Security::readKeys() { if (m_gpgRunning) { - TQTimer::singleShot(5, this, TQT_SLOT(readKeys())); + TQTimer::singleShot(5, this, TQ_SLOT(readKeys())); return; } m_runMode = List; m_keys.clear(); KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys"; - connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); + connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *))); if (!readProcess->start(TDEProcess::NotifyOnExit, true)) KMessageBox::error(0L, i18n("Cannot start gpg and retrieve the available keys. Make sure that gpg is installed, otherwise verification of downloaded resources will not be possible.")); else @@ -69,14 +69,14 @@ void Security::readSecretKeys() { if (m_gpgRunning) { - TQTimer::singleShot(5, this, TQT_SLOT(readSecretKeys())); + TQTimer::singleShot(5, this, TQ_SLOT(readSecretKeys())); return; } m_runMode = ListSecret; KProcIO *readProcess=new KProcIO(); *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys"; - connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *))); + connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *))); if (readProcess->start(TDEProcess::NotifyOnExit, true)) m_gpgRunning = true; } @@ -206,7 +206,7 @@ void Security::slotCheckValidity() { if (!m_keysRead || m_gpgRunning) { - TQTimer::singleShot(5, this, TQT_SLOT(slotCheckValidity())); + TQTimer::singleShot(5, this, TQ_SLOT(slotCheckValidity())); return; } if (m_keys.count() == 0) @@ -248,8 +248,8 @@ void Security::slotCheckValidity() //verify the signature KProcIO *verifyProcess=new KProcIO(); *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName; - connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); + connect(verifyProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(verifyProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *))); if (verifyProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; else @@ -270,7 +270,7 @@ void Security::slotSignFile() { if (!m_keysRead || m_gpgRunning) { - TQTimer::singleShot(5, this, TQT_SLOT(slotSignFile())); + TQTimer::singleShot(5, this, TQ_SLOT(slotSignFile())); return; } @@ -328,8 +328,8 @@ void Security::slotSignFile() //verify the signature KProcIO *signProcess=new KProcIO(); *signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName; - connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *))); - connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *))); + connect(signProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *))); + connect(signProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *))); m_runMode = Sign; if (signProcess->start(TDEProcess::NotifyOnExit,true)) m_gpgRunning = true; diff --git a/tdenewstuff/testnewstuff.cpp b/tdenewstuff/testnewstuff.cpp index f9fc7269f..8232e1f1e 100644 --- a/tdenewstuff/testnewstuff.cpp +++ b/tdenewstuff/testnewstuff.cpp @@ -72,17 +72,17 @@ MyWidget::MyWidget() TQPushButton *downloadButton = new TQPushButton( "Download", this ); topLayout->addWidget( downloadButton ); - connect( downloadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( download() ) ); + connect( downloadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( download() ) ); TQPushButton *uploadButton = new TQPushButton( "Upload", this ); topLayout->addWidget( uploadButton ); - connect( uploadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( upload() ) ); + connect( uploadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( upload() ) ); topLayout->addSpacing( 5 ); TQPushButton *closeButton = new TQPushButton( "Close", this ); topLayout->addWidget( closeButton ); - connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) ); + connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) ); } MyWidget::~MyWidget() diff --git a/tdeparts/browserextension.cpp b/tdeparts/browserextension.cpp index ec31eea3e..9b134819d 100644 --- a/tdeparts/browserextension.cpp +++ b/tdeparts/browserextension.cpp @@ -377,14 +377,14 @@ BrowserExtension::BrowserExtension( KParts::ReadOnlyPart *parent, d->m_actionStatus.setBit( i, slotNames.contains( it.key()+"()" ) ); } - connect( m_part, TQT_SIGNAL( completed() ), - this, TQT_SLOT( slotCompleted() ) ); - connect( this, TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); - connect( this, TQT_SIGNAL( enableAction( const char *, bool ) ), - this, TQT_SLOT( slotEnableAction( const char *, bool ) ) ); - connect( this, TQT_SIGNAL( setActionText( const char *, const TQString& ) ), - this, TQT_SLOT( slotSetActionText( const char *, const TQString& ) ) ); + connect( m_part, TQ_SIGNAL( completed() ), + this, TQ_SLOT( slotCompleted() ) ); + connect( this, TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( this, TQ_SIGNAL( enableAction( const char *, bool ) ), + this, TQ_SLOT( slotEnableAction( const char *, bool ) ) ); + connect( this, TQ_SIGNAL( setActionText( const char *, const TQString& ) ), + this, TQ_SLOT( slotSetActionText( const char *, const TQString& ) ) ); } BrowserExtension::~BrowserExtension() @@ -496,7 +496,7 @@ void BrowserExtension::slotOpenURLRequest( const KURL &url, const KParts::URLArg req.m_delayedURL = url; req.m_delayedArgs = args; d->m_requests.append( req ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotEmitOpenURLRequestDelayed() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotEmitOpenURLRequestDelayed() ) ); } void BrowserExtension::slotEmitOpenURLRequestDelayed() @@ -576,19 +576,19 @@ void BrowserExtension::createActionSlotMap() assert(!s_actionSlotMap); s_actionSlotMap = actionSlotMapsd.setObject( s_actionSlotMap, new ActionSlotMap ); - s_actionSlotMap->insert( "cut", TQT_SLOT( cut() ) ); - s_actionSlotMap->insert( "copy", TQT_SLOT( copy() ) ); - s_actionSlotMap->insert( "paste", TQT_SLOT( paste() ) ); - s_actionSlotMap->insert( "rename", TQT_SLOT( rename() ) ); - s_actionSlotMap->insert( "trash", TQT_SLOT( trash() ) ); - s_actionSlotMap->insert( "del", TQT_SLOT( del() ) ); - s_actionSlotMap->insert( "properties", TQT_SLOT( properties() ) ); - s_actionSlotMap->insert( "editMimeType", TQT_SLOT( editMimeType() ) ); - s_actionSlotMap->insert( "print", TQT_SLOT( print() ) ); + s_actionSlotMap->insert( "cut", TQ_SLOT( cut() ) ); + s_actionSlotMap->insert( "copy", TQ_SLOT( copy() ) ); + s_actionSlotMap->insert( "paste", TQ_SLOT( paste() ) ); + s_actionSlotMap->insert( "rename", TQ_SLOT( rename() ) ); + s_actionSlotMap->insert( "trash", TQ_SLOT( trash() ) ); + s_actionSlotMap->insert( "del", TQ_SLOT( del() ) ); + s_actionSlotMap->insert( "properties", TQ_SLOT( properties() ) ); + s_actionSlotMap->insert( "editMimeType", TQ_SLOT( editMimeType() ) ); + s_actionSlotMap->insert( "print", TQ_SLOT( print() ) ); // Tricky. Those aren't actions in fact, but simply methods that a browserextension // can have or not. No need to return them here. - //s_actionSlotMap->insert( "reparseConfiguration", TQT_SLOT( reparseConfiguration() ) ); - //s_actionSlotMap->insert( "refreshMimeTypes", TQT_SLOT( refreshMimeTypes() ) ); + //s_actionSlotMap->insert( "reparseConfiguration", TQ_SLOT( reparseConfiguration() ) ); + //s_actionSlotMap->insert( "refreshMimeTypes", TQ_SLOT( refreshMimeTypes() ) ); // nothing for setSaveViewPropertiesLocally either // Create the action-number map diff --git a/tdeparts/browserextension.h b/tdeparts/browserextension.h index 027bbd87f..6d1c4d144 100644 --- a/tdeparts/browserextension.h +++ b/tdeparts/browserextension.h @@ -435,7 +435,7 @@ public: typedef TQMap ActionSlotMap; /** * Returns a map containing the action names as keys and corresponding - * TQT_SLOT()'ified method names as data entries. + * TQ_SLOT()'ified method names as data entries. * * This is very useful for * the host component, when connecting the own signals with the @@ -455,7 +455,7 @@ public: * Connecting to the slot can be done like this: * * \code - * connect( yourObject, TQT_SIGNAL( yourSignal() ), + * connect( yourObject, TQ_SIGNAL( yourSignal() ), * extension, mapIterator.data() ) * \endcode * diff --git a/tdeparts/browserrun.cpp b/tdeparts/browserrun.cpp index c459e818e..95df76ece 100644 --- a/tdeparts/browserrun.cpp +++ b/tdeparts/browserrun.cpp @@ -146,10 +146,10 @@ void BrowserRun::scanFile() job->addMetaData( m_args.metaData() ); job->setWindow( m_window ); - connect( job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotBrowserScanFinished(TDEIO::Job *))); - connect( job, TQT_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), - this, TQT_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &))); + connect( job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotBrowserScanFinished(TDEIO::Job *))); + connect( job, TQ_SIGNAL( mimetype( TDEIO::Job *, const TQString &)), + this, TQ_SLOT( slotBrowserMimetype(TDEIO::Job *, const TQString &))); m_job = job; } @@ -244,8 +244,8 @@ BrowserRun::NonEmbeddableResult BrowserRun::handleNonEmbeddable( const TQString& destURL.setPath( tempFile.name() ); TDEIO::Job *job = TDEIO::file_copy( m_strURL, destURL, 0600, true /*overwrite*/, false /*no resume*/, true /*progress info*/ ); job->setWindow (m_window); - connect( job, TQT_SIGNAL( result( TDEIO::Job *)), - this, TQT_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job *)), + this, TQ_SLOT( slotCopyToTempFileResult(TDEIO::Job *)) ); return Delayed; // We'll continue after the job has finished } } diff --git a/tdeparts/dockmainwindow.cpp b/tdeparts/dockmainwindow.cpp index 7aa5d0212..e7ce785ac 100644 --- a/tdeparts/dockmainwindow.cpp +++ b/tdeparts/dockmainwindow.cpp @@ -89,10 +89,10 @@ void DockMainWindow::createGUI( Part * part ) factory->removeClient( d->m_activePart ); - disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); } if ( !d->m_bShellGUIActivated ) @@ -105,10 +105,10 @@ void DockMainWindow::createGUI( Part * part ) if ( part ) { // do this before sending the activate event - connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); factory->addClient( part ); diff --git a/tdeparts/mainwindow.cpp b/tdeparts/mainwindow.cpp index 80bfb6071..26adbd838 100644 --- a/tdeparts/mainwindow.cpp +++ b/tdeparts/mainwindow.cpp @@ -107,10 +107,10 @@ void MainWindow::createGUI( Part * part ) factory->removeClient( d->m_activePart ); - disconnect( d->m_activePart, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - disconnect( d->m_activePart, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + disconnect( d->m_activePart, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); } if ( !d->m_bShellGUIActivated ) @@ -123,10 +123,10 @@ void MainWindow::createGUI( Part * part ) if ( part ) { // do this before sending the activate event - connect( part, TQT_SIGNAL( setWindowCaption( const TQString & ) ), - this, TQT_SLOT( setCaption( const TQString & ) ) ); - connect( part, TQT_SIGNAL( setStatusBarText( const TQString & ) ), - this, TQT_SLOT( slotSetStatusBarText( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setWindowCaption( const TQString & ) ), + this, TQ_SLOT( setCaption( const TQString & ) ) ); + connect( part, TQ_SIGNAL( setStatusBarText( const TQString & ) ), + this, TQ_SLOT( slotSetStatusBarText( const TQString & ) ) ); factory->addClient( part ); diff --git a/tdeparts/part.cpp b/tdeparts/part.cpp index 286a5f93b..b65106ea7 100644 --- a/tdeparts/part.cpp +++ b/tdeparts/part.cpp @@ -146,8 +146,8 @@ Part::~Part() if ( m_widget ) { // We need to disconnect first, to avoid calling it ! - disconnect( m_widget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( m_widget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); } if ( m_manager ) @@ -195,8 +195,8 @@ void Part::setWidget( TQWidget *widget ) { assert ( !m_widget ); // otherwise we get two connects m_widget = widget; - connect( m_widget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( m_widget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); // Tell the actionCollection() which widget its // action shortcuts should be connected to. @@ -367,7 +367,7 @@ bool ReadOnlyPart::openURL( const KURL &url ) d->m_job = TDEIO::file_copy( m_url, destURL, 0600, true, false, d->m_showProgressInfo ); d->m_job->setWindow( widget() ? widget()->topLevelWidget() : 0 ); emit started( d->m_job ); - connect( d->m_job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); + connect( d->m_job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotJobFinished ( TDEIO::Job * ) ) ); return true; } } @@ -639,7 +639,7 @@ bool ReadWritePart::saveToURL() } d->m_uploadJob = TDEIO::file_move( uploadUrl, m_url, -1, true /*overwrite*/ ); d->m_uploadJob->setWindow( widget() ? widget()->topLevelWidget() : 0 ); - connect( d->m_uploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); + connect( d->m_uploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } diff --git a/tdeparts/partmanager.cpp b/tdeparts/partmanager.cpp index 8a41eb18c..1ca3f9dab 100644 --- a/tdeparts/partmanager.cpp +++ b/tdeparts/partmanager.cpp @@ -119,8 +119,8 @@ PartManager::~PartManager() { for ( TQPtrListIterator it( d->m_managedTopLevelWidgets ); it.current(); ++it ) - disconnect( it.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); + disconnect( it.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); for ( TQPtrListIterator it( d->m_parts ); it.current(); ++it ) { @@ -455,8 +455,8 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) TQApplication::sendEvent( oldActivePart, &ev ); if ( oldActiveWidget ) { - disconnect( oldActiveWidget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + disconnect( oldActiveWidget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); TQApplication::sendEvent( oldActiveWidget, &ev ); } @@ -473,8 +473,8 @@ void PartManager::setActivePart( Part *part, TQWidget *widget ) TQApplication::sendEvent( d->m_activePart, &ev ); if ( d->m_activeWidget ) { - connect( d->m_activeWidget, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotWidgetDestroyed() ) ); + connect( d->m_activeWidget, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotWidgetDestroyed() ) ); TQApplication::sendEvent( d->m_activeWidget, &ev ); } } @@ -568,8 +568,8 @@ void PartManager::addManagedTopLevelWidget( const TQWidget *topLevel ) return; d->m_managedTopLevelWidgets.append( topLevel ); - connect( topLevel, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); + connect( topLevel, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotManagedTopLevelWidgetDestroyed() ) ); } void PartManager::removeManagedTopLevelWidget( const TQWidget *topLevel ) diff --git a/tdeparts/tests/example.cpp b/tdeparts/tests/example.cpp index fedf93ee6..e44e4c2e2 100644 --- a/tdeparts/tests/example.cpp +++ b/tdeparts/tests/example.cpp @@ -21,8 +21,8 @@ Shell::Shell() m_manager = new KParts::PartManager( this ); // When the manager says the active part changes, the builder updates (recreates) the GUI - connect( m_manager, TQT_SIGNAL( activePartChanged( KParts::Part * ) ), - this, TQT_SLOT( createGUI( KParts::Part * ) ) ); + connect( m_manager, TQ_SIGNAL( activePartChanged( KParts::Part * ) ), + this, TQ_SLOT( createGUI( KParts::Part * ) ) ); // We can do this "switch active part" because we have a splitter with // two items in it. @@ -34,13 +34,13 @@ Shell::Shell() TDEActionCollection *coll = actionCollection(); - (void)new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); - (void)new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); + (void)new TDEAction( "&View local file", 0, this, TQ_SLOT( slotFileOpen() ), coll, "open_local_file" ); + (void)new TDEAction( "&View remote file", 0, this, TQ_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); - m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); - m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); + m_paEditFile = new TDEAction( "&Edit file", 0, this, TQ_SLOT( slotFileEdit() ), coll, "edit_file" ); + m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQ_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); m_paCloseEditor->setEnabled(false); - TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQ_SLOT( close() ), coll, "shell_quit" ); paQuit->setIconSet(TQIconSet(BarIcon("system-log-out"))); (void)new TDEAction( "Yet another menu item", 0, coll, "shell_yami" ); diff --git a/tdeparts/tests/ghostview.cpp b/tdeparts/tests/ghostview.cpp index 39af41a73..723343303 100644 --- a/tdeparts/tests/ghostview.cpp +++ b/tdeparts/tests/ghostview.cpp @@ -21,9 +21,9 @@ Shell::Shell() setXMLFile( "ghostviewtest_shell.rc" ); TDEAction * paOpen = new TDEAction( "&Open file" , "document-open", 0, this, - TQT_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); + TQ_SLOT( slotFileOpen() ), actionCollection(), "file_open" ); - TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQT_SLOT( close() ), actionCollection(), "file_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit" , "system-log-out", 0, this, TQ_SLOT( close() ), actionCollection(), "file_quit" ); // Try to find a postscript component first TDETrader::OfferList offers = TDETrader::self()->query("application/postscript", "('KParts/ReadOnlyPart' in ServiceTypes) or ('Browser/View' in ServiceTypes)"); diff --git a/tdeparts/tests/normalktm.cpp b/tdeparts/tests/normalktm.cpp index 3fe7f1a7a..eae4e80af 100644 --- a/tdeparts/tests/normalktm.cpp +++ b/tdeparts/tests/normalktm.cpp @@ -29,21 +29,21 @@ Shell::Shell() TQPopupMenu * pFile = new TQPopupMenu( this ); menuBar()->insertItem( "File", pFile ); TQObject * coll = this; - TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQT_SLOT( slotFileOpen() ), coll, "open_local_file" ); + TDEAction * paLocal = new TDEAction( "&View local file", 0, this, TQ_SLOT( slotFileOpen() ), coll, "open_local_file" ); // No XML : we need to plug our actions ourselves paLocal->plug( pFile ); - TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQT_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); + TDEAction * paRemote = new TDEAction( "&View remote file", 0, this, TQ_SLOT( slotFileOpenRemote() ), coll, "open_remote_file" ); paRemote->plug( pFile ); - m_paEditFile = new TDEAction( "&Edit file", 0, this, TQT_SLOT( slotFileEdit() ), coll, "edit_file" ); + m_paEditFile = new TDEAction( "&Edit file", 0, this, TQ_SLOT( slotFileEdit() ), coll, "edit_file" ); m_paEditFile->plug( pFile ); - m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQT_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); + m_paCloseEditor = new TDEAction( "&Close file editor", 0, this, TQ_SLOT( slotFileCloseEditor() ), coll, "close_editor" ); m_paCloseEditor->setEnabled(false); m_paCloseEditor->plug( pFile ); - TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQT_SLOT( close() ), coll, "shell_quit" ); + TDEAction * paQuit = new TDEAction( "&Quit", 0, this, TQ_SLOT( close() ), coll, "shell_quit" ); paQuit->setIconSet(TQIconSet(BarIcon("system-log-out"))); paQuit->plug( pFile ); diff --git a/tdeparts/tests/notepad.cpp b/tdeparts/tests/notepad.cpp index ad81b91b3..9ab7b7d69 100644 --- a/tdeparts/tests/notepad.cpp +++ b/tdeparts/tests/notepad.cpp @@ -26,7 +26,7 @@ NotepadPart::NotepadPart( TQWidget* parentWidget, const char*, m_edit = new TQMultiLineEdit( parentWidget, "NotepadPart's multiline edit" ); setWidget( m_edit ); - (void)new TDEAction( "Search and replace", 0, this, TQT_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); + (void)new TDEAction( "Search and replace", 0, this, TQ_SLOT( slotSearchReplace() ), actionCollection(), "searchreplace" ); setXMLFile( "notepadpart.rc" ); setReadWrite( true ); } @@ -39,9 +39,9 @@ void NotepadPart::setReadWrite( bool rw ) { m_edit->setReadOnly( !rw ); if (rw) - connect( m_edit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( setModified() ) ); + connect( m_edit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( setModified() ) ); else - disconnect( m_edit, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( setModified() ) ); + disconnect( m_edit, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( setModified() ) ); ReadWritePart::setReadWrite( rw ); } diff --git a/tdeparts/tests/plugin_spellcheck.cpp b/tdeparts/tests/plugin_spellcheck.cpp index ae7af326f..927bc9123 100644 --- a/tdeparts/tests/plugin_spellcheck.cpp +++ b/tdeparts/tests/plugin_spellcheck.cpp @@ -11,7 +11,7 @@ PluginSpellCheck::PluginSpellCheck( TQObject* parent, const char* name, const TQStringList& ) : Plugin( parent, name ) { - (void) new TDEAction( "&Select current line (plugin)", 0, this, TQT_SLOT(slotSpellCheck()), + (void) new TDEAction( "&Select current line (plugin)", 0, this, TQ_SLOT(slotSpellCheck()), actionCollection(), "tools-check-spelling" ); } diff --git a/tdeprint/cups/cupsaddsmb2.cpp b/tdeprint/cups/cupsaddsmb2.cpp index e9ff1256d..0e03b04a2 100644 --- a/tdeprint/cups/cupsaddsmb2.cpp +++ b/tdeprint/cups/cupsaddsmb2.cpp @@ -48,15 +48,15 @@ CupsAddSmb::CupsAddSmb(TQWidget *parent, const char *name) m_state = None; m_status = false; m_actionindex = 0; - connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceived(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceived(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); m_side = new SidePixmap(this); m_doit = new TQPushButton(i18n("&Export"), this); m_cancel = new KPushButton(KStdGuiItem::cancel(), this); - connect(m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); - connect(m_doit, TQT_SIGNAL(clicked()), TQT_SLOT(slotActionClicked())); + connect(m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); + connect(m_doit, TQ_SIGNAL(clicked()), TQ_SLOT(slotActionClicked())); m_bar = new TQProgressBar(this); m_text = new KActiveLabel(this); TQLabel *m_title = new TQLabel(i18n("Export Printer Driver to Windows Clients"), this); @@ -245,7 +245,7 @@ void CupsAddSmb::checkActionStatus() void CupsAddSmb::nextAction() { if (m_actionindex < (int)(m_actions.count())) - TQTimer::singleShot(1, this, TQT_SLOT(doNextAction())); + TQTimer::singleShot(1, this, TQ_SLOT(doNextAction())); } void CupsAddSmb::doNextAction() diff --git a/tdeprint/cups/cupsdconf2/browsedialog.cpp b/tdeprint/cups/cupsdconf2/browsedialog.cpp index a62e93ee9..e73dac19d 100644 --- a/tdeprint/cups/cupsdconf2/browsedialog.cpp +++ b/tdeprint/cups/cupsdconf2/browsedialog.cpp @@ -56,7 +56,7 @@ BrowseDialog::BrowseDialog(TQWidget *parent, const char *name) m1->addWidget(from_, 1, 1); m1->addWidget(to_, 2, 1); - connect(type_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); + connect(type_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); slotTypeChanged(type_->currentItem()); setCaption(i18n("Browse Address")); diff --git a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp index 0bd0e53ae..91ef705bf 100644 --- a/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdbrowsingpage.cpp @@ -97,29 +97,29 @@ CupsdBrowsingPage::CupsdBrowsingPage(TQWidget *parent, const char *name) m3->addWidget(hideimplicitmembers_, 1, 0); m3->addWidget(useshortnames_, 1, 1); - connect(browsing_, TQT_SIGNAL(toggled(bool)), cups_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), slp_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseport_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseinterval_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browsetimeout_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseaddresses_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), browseorder_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), useimplicitclasses_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), useanyclasses_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), hideimplicitmembers_, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), useshortnames_, TQT_SLOT(setEnabled(bool))); - - connect(browsing_, TQT_SIGNAL(toggled(bool)), l1, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l2, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l3, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l4, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l5, TQT_SLOT(setEnabled(bool))); - connect(browsing_, TQT_SIGNAL(toggled(bool)), l6, TQT_SLOT(setEnabled(bool))); - - connect(browseaddresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(browseaddresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(browseaddresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); - connect(browseinterval_, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(intervalChanged(int))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), cups_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), slp_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseport_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseinterval_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browsetimeout_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseaddresses_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), browseorder_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), useimplicitclasses_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), useanyclasses_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), hideimplicitmembers_, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), useshortnames_, TQ_SLOT(setEnabled(bool))); + + connect(browsing_, TQ_SIGNAL(toggled(bool)), l1, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l2, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l3, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l4, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l5, TQ_SLOT(setEnabled(bool))); + connect(browsing_, TQ_SIGNAL(toggled(bool)), l6, TQ_SLOT(setEnabled(bool))); + + connect(browseaddresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(browseaddresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(browseaddresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); + connect(browseinterval_, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(intervalChanged(int))); browsing_->setChecked(true); } diff --git a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp index b277006b2..1ac0c739b 100644 --- a/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdjobspage.cpp @@ -69,7 +69,7 @@ CupsdJobsPage::CupsdJobsPage(TQWidget *parent, const char *name) m1->addWidget(maxjobsperprinter_, 4, 1); m1->addWidget(maxjobsperuser_, 5, 1); - connect(keepjobhistory_, TQT_SIGNAL(toggled(bool)), TQT_SLOT(historyChanged(bool))); + connect(keepjobhistory_, TQ_SIGNAL(toggled(bool)), TQ_SLOT(historyChanged(bool))); keepjobhistory_->setChecked(true); } diff --git a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp index a9341fcf2..f040f430c 100644 --- a/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdnetworkpage.cpp @@ -88,10 +88,10 @@ CupsdNetworkPage::CupsdNetworkPage(TQWidget *parent, const char *name) m1->addWidget(clienttimeout_, 5, 1); m1->addWidget(listen_, 6, 1); - connect(listen_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(listen_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(listen_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); - connect(keepalive_, TQT_SIGNAL(toggled(bool)), keepalivetimeout_, TQT_SLOT(setEnabled(bool))); + connect(listen_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(listen_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(listen_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); + connect(keepalive_, TQ_SIGNAL(toggled(bool)), keepalivetimeout_, TQ_SLOT(setEnabled(bool))); keepalive_->setChecked(true); } diff --git a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp index c23a753dd..1a5fa9e53 100644 --- a/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdsecuritypage.cpp @@ -66,10 +66,10 @@ CupsdSecurityPage::CupsdSecurityPage(TQWidget *parent, const char *name) m1->addWidget(encryptkey_, 3, 1); m1->addWidget(locations_, 4, 1); - connect(locations_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(locations_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(locations_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); - connect(locations_, TQT_SIGNAL(deleted(int)), TQT_SLOT(slotDeleted(int))); + connect(locations_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(locations_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(locations_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); + connect(locations_, TQ_SIGNAL(deleted(int)), TQ_SLOT(slotDeleted(int))); } bool CupsdSecurityPage::loadConfig(CupsdConf *conf, TQString&) diff --git a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp index a2bb81972..ac38bb19c 100644 --- a/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp +++ b/tdeprint/cups/cupsdconf2/cupsdserverpage.cpp @@ -88,7 +88,7 @@ CupsdServerPage::CupsdServerPage(TQWidget *parent, const char *name) TQLabel *l6 = new TQLabel(i18n("Printcap file:"), this); TQLabel *l7 = new TQLabel(i18n("Printcap format:"), this); - connect(classification_, TQT_SIGNAL(activated(int)), TQT_SLOT(classChanged(int))); + connect(classification_, TQ_SIGNAL(activated(int)), TQ_SLOT(classChanged(int))); classification_->setCurrentItem(0); charset_->setCurrentItem(0); printcapformat_->setCurrentItem(0); diff --git a/tdeprint/cups/cupsdconf2/editlist.cpp b/tdeprint/cups/cupsdconf2/editlist.cpp index 2e0d523f0..fd7f6b6c6 100644 --- a/tdeprint/cups/cupsdconf2/editlist.cpp +++ b/tdeprint/cups/cupsdconf2/editlist.cpp @@ -43,11 +43,11 @@ EditList::EditList(TQWidget *parent, const char *name) m1->addWidget(delbtn_, 2, 1); m1->addWidget(defbtn_, 3, 1); - connect(addbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(add())); - connect(editbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotEdit())); - connect(delbtn_, TQT_SIGNAL(clicked()), TQT_SLOT(slotDelete())); - connect(defbtn_, TQT_SIGNAL(clicked()), TQT_SIGNAL(defaultList())); - connect(list_, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSelected(int))); + connect(addbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(add())); + connect(editbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotEdit())); + connect(delbtn_, TQ_SIGNAL(clicked()), TQ_SLOT(slotDelete())); + connect(defbtn_, TQ_SIGNAL(clicked()), TQ_SIGNAL(defaultList())); + connect(list_, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSelected(int))); slotSelected(-1); } diff --git a/tdeprint/cups/cupsdconf2/locationdialog.cpp b/tdeprint/cups/cupsdconf2/locationdialog.cpp index addd3eea4..a203f4e5e 100644 --- a/tdeprint/cups/cupsdconf2/locationdialog.cpp +++ b/tdeprint/cups/cupsdconf2/locationdialog.cpp @@ -66,8 +66,8 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) order_->insertItem(i18n("Allow, Deny")); order_->insertItem(i18n("Deny, Allow")); - connect(authclass_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotClassChanged(int))); - connect(authtype_, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); + connect(authclass_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotClassChanged(int))); + connect(authtype_, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); TQLabel *l1 = new TQLabel(i18n("Resource:"), dummy); TQLabel *l2 = new TQLabel(i18n("Authentication:"), dummy); @@ -104,9 +104,9 @@ LocationDialog::LocationDialog(TQWidget *parent, const char *name) slotClassChanged(AUTHCLASS_ANONYMOUS); encryption_->setCurrentItem(ENCRYPT_IFREQUESTED); - connect(addresses_, TQT_SIGNAL(add()), TQT_SLOT(slotAdd())); - connect(addresses_, TQT_SIGNAL(edit(int)), TQT_SLOT(slotEdit(int))); - connect(addresses_, TQT_SIGNAL(defaultList()), TQT_SLOT(slotDefaultList())); + connect(addresses_, TQ_SIGNAL(add()), TQ_SLOT(slotAdd())); + connect(addresses_, TQ_SIGNAL(edit(int)), TQ_SLOT(slotEdit(int))); + connect(addresses_, TQ_SIGNAL(defaultList()), TQ_SLOT(slotDefaultList())); } void LocationDialog::setInfos(CupsdConf *conf) diff --git a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp index c3a6d50d2..e82a6fba6 100644 --- a/tdeprint/cups/cupsdconf2/qdirlineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirlineedit.cpp @@ -31,7 +31,7 @@ QDirLineEdit::QDirLineEdit(bool file, TQWidget *parent, const char *name) edit_ = new TQLineEdit(this); button_ = new KPushButton(this); button_->setPixmap(SmallIcon("document-open")); - connect(button_,TQT_SIGNAL(clicked()),TQT_SLOT(buttonClicked())); + connect(button_,TQ_SIGNAL(clicked()),TQ_SLOT(buttonClicked())); TQHBoxLayout *main_ = new TQHBoxLayout(this, 0, 3); main_->addWidget(edit_); diff --git a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp index e6cade32e..cc1392577 100644 --- a/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp +++ b/tdeprint/cups/cupsdconf2/qdirmultilineedit.cpp @@ -34,14 +34,14 @@ QDirMultiLineEdit::QDirMultiLineEdit(TQWidget *parent, const char *name) m_view->header()->hide(); m_view->addColumn(""); m_view->setFullWidth(true); - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelected(TQListViewItem*))); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelected(TQListViewItem*))); m_add = new TQPushButton(this); m_add->setPixmap(SmallIcon("folder-new")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked())); m_remove = new TQPushButton(this); m_remove->setPixmap(SmallIcon("edit-delete")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked())); m_remove->setEnabled(false); m_view->setFixedHeight(TQMAX(m_view->fontMetrics().lineSpacing()*3+m_view->lineWidth()*2, m_add->sizeHint().height()*2)); diff --git a/tdeprint/cups/kmconfigcupsdir.cpp b/tdeprint/cups/kmconfigcupsdir.cpp index 47d2c7f32..7dd7e5abc 100644 --- a/tdeprint/cups/kmconfigcupsdir.cpp +++ b/tdeprint/cups/kmconfigcupsdir.cpp @@ -48,7 +48,7 @@ KMConfigCupsDir::KMConfigCupsDir(TQWidget *parent) lay1->addWidget(m_stddir); lay1->addWidget(m_installdir); - connect(m_stddir,TQT_SIGNAL(toggled(bool)),m_installdir,TQT_SLOT(setDisabled(bool))); + connect(m_stddir,TQ_SIGNAL(toggled(bool)),m_installdir,TQ_SLOT(setDisabled(bool))); m_stddir->setChecked(true); } diff --git a/tdeprint/cups/kmcupsconfigwidget.cpp b/tdeprint/cups/kmcupsconfigwidget.cpp index 08ec61911..9f05f3b16 100644 --- a/tdeprint/cups/kmcupsconfigwidget.cpp +++ b/tdeprint/cups/kmcupsconfigwidget.cpp @@ -103,9 +103,9 @@ KMCupsConfigWidget::KMCupsConfigWidget(TQWidget *parent, const char *name) lay3->addMultiCellWidget(m_anonymous,3,3,0,1); // connections - connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setDisabled(bool))); - connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setDisabled(bool))); - connect(m_anonymous,TQT_SIGNAL(toggled(bool)),m_savepwd,TQT_SLOT(setDisabled(bool))); + connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setDisabled(bool))); + connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setDisabled(bool))); + connect(m_anonymous,TQ_SIGNAL(toggled(bool)),m_savepwd,TQ_SLOT(setDisabled(bool))); } void KMCupsConfigWidget::load() diff --git a/tdeprint/cups/kmcupsmanager.cpp b/tdeprint/cups/kmcupsmanager.cpp index ee1c62728..3e5876451 100644 --- a/tdeprint/cups/kmcupsmanager.cpp +++ b/tdeprint/cups/kmcupsmanager.cpp @@ -292,8 +292,8 @@ bool KMCupsManager::completePrinterShort(KMPrinter *p) // Give 2 seconds to connect to the printer, or abort KExtendedSocket *kes = new KExtendedSocket(p->uri().host(), p->uri().port()); - connect(kes, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(hostPingSlot())); - connect(kes, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(hostPingFailedSlot())); + connect(kes, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(hostPingSlot())); + connect(kes, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(hostPingFailedSlot())); if (kes->startAsyncConnect() != 0) { delete kes; m_hostSuccess = false; @@ -938,9 +938,9 @@ TQStringList KMCupsManager::detectLocalPrinters() void KMCupsManager::createPluginActions(TDEActionCollection *coll) { - TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQT_SLOT(exportDriver()), coll, "plugin_export_driver"); + TDEAction *act = new TDEAction(i18n("&Export Driver..."), "tdeprint_uploadsmb", 0, this, TQ_SLOT(exportDriver()), coll, "plugin_export_driver"); act->setGroup("plugin"); - act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQT_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); + act = new TDEAction(i18n("&Printer IPP Report"), "tdeprint_report", 0, this, TQ_SLOT(printerIppReport()), coll, "plugin_printer_ipp_report"); act->setGroup("plugin"); } @@ -1020,12 +1020,12 @@ void KMCupsManager::checkUpdatePossibleInternal() delete m_socket; m_socket = new KNetwork::TDEBufferedSocket; m_socket->setTimeout( 1500 ); - connect( m_socket, TQT_SIGNAL( connected(const KResolverEntry&) ), - TQT_SLOT( slotConnectionSuccess() ) ); - connect( m_socket, TQT_SIGNAL( gotError( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( m_socket, TQ_SIGNAL( connected(const KResolverEntry&) ), + TQ_SLOT( slotConnectionSuccess() ) ); + connect( m_socket, TQ_SIGNAL( gotError( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); trials = 5; - TQTimer::singleShot( 1, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( slotAsyncConnect() ) ); } void KMCupsManager::slotConnectionSuccess() @@ -1044,7 +1044,7 @@ void KMCupsManager::slotConnectionSuccess() if ( trials > 0 ) { trials--; - TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) ); } else { @@ -1074,7 +1074,7 @@ void KMCupsManager::slotConnectionFailed( int errcode ) //m_socket->cancelAsyncConnect(); trials--; m_socket->close(); - TQTimer::singleShot( 1000, this, TQT_SLOT( slotAsyncConnect() ) ); + TQTimer::singleShot( 1000, this, TQ_SLOT( slotAsyncConnect() ) ); return; } diff --git a/tdeprint/cups/kmwippprinter.cpp b/tdeprint/cups/kmwippprinter.cpp index f7a4f0593..bbc878055 100644 --- a/tdeprint/cups/kmwippprinter.cpp +++ b/tdeprint/cups/kmwippprinter.cpp @@ -70,12 +70,12 @@ KMWIppPrinter::KMWIppPrinter(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(20); - connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) ); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); - connect(m_ippreport, TQT_SIGNAL(clicked()), TQT_SLOT(slotIppReport())); + connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*))); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) ); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) ); + connect(m_ippreport, TQ_SIGNAL(clicked()), TQ_SLOT(slotIppReport())); // layout TQHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); diff --git a/tdeprint/cups/kmwother.cpp b/tdeprint/cups/kmwother.cpp index 497fa03c3..67707b3ea 100644 --- a/tdeprint/cups/kmwother.cpp +++ b/tdeprint/cups/kmwother.cpp @@ -53,7 +53,7 @@ KMWOther::KMWOther(TQWidget *parent, const char *name) m_uriview->addColumn( "" ); m_uriview->header()->hide(); m_uriview->setSorting( -1 ); - connect( m_uriview, TQT_SIGNAL( pressed( TQListViewItem* ) ), TQT_SLOT( slotPressed( TQListViewItem* ) ) ); + connect( m_uriview, TQ_SIGNAL( pressed( TQListViewItem* ) ), TQ_SLOT( slotPressed( TQListViewItem* ) ) ); TQVBoxLayout *lay1 = new TQVBoxLayout(this, 0, 15); TQVBoxLayout *lay2 = new TQVBoxLayout(0, 0, 5); diff --git a/tdeprint/cups/kpimagepage.cpp b/tdeprint/cups/kpimagepage.cpp index 29be5bc0c..0c6eb4770 100644 --- a/tdeprint/cups/kpimagepage.cpp +++ b/tdeprint/cups/kpimagepage.cpp @@ -263,10 +263,10 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_gamma->setRange(1, 3000, 100, true); TQWhatsThis::add(m_gamma, whatsThisGammaImagePage); - connect(m_brightness, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); - connect(m_hue, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); - connect(m_saturation, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); - //connect(m_gamma, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotImageSettingsChanged())); + connect(m_brightness, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); + connect(m_hue, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); + connect(m_saturation, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); + //connect(m_gamma, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotImageSettingsChanged())); m_preview = new ImagePreview(colorbox); bool useColor = (driver ? driver->get("colordevice") == "1" : true); @@ -282,7 +282,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) TQPushButton *defbtn = new TQPushButton(i18n("&Default Settings"), colorbox); TQWhatsThis::add(defbtn, whatsThisResetButtonImagePage); - connect(defbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultClicked())); + connect(defbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefaultClicked())); slotDefaultClicked(); m_sizetype = new TQComboBox(sizebox); @@ -297,7 +297,7 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_size->setRange(1, 1200, 20, true); m_size->setValue(72); - connect(m_sizetype, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSizeTypeChanged(int))); + connect(m_sizetype, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSizeTypeChanged(int))); m_sizetype->setCurrentItem(0); slotSizeTypeChanged(0); @@ -342,8 +342,8 @@ KPImagePage::KPImagePage(DrMain *driver, TQWidget *parent, const char *name) m_horizgrp->insert(hcenter, 1); m_horizgrp->insert(right, 2); } - connect(m_vertgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged())); - connect(m_horizgrp, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPositionChanged())); + connect(m_vertgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged())); + connect(m_horizgrp, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPositionChanged())); m_vertgrp->setButton(1); m_horizgrp->setButton(1); slotPositionChanged(); diff --git a/tdeprint/cups/kpschedulepage.cpp b/tdeprint/cups/kpschedulepage.cpp index e37400679..0a3513c67 100644 --- a/tdeprint/cups/kpschedulepage.cpp +++ b/tdeprint/cups/kpschedulepage.cpp @@ -186,7 +186,7 @@ KPSchedulePage::KPSchedulePage(TQWidget *parent, const char *name) l0->addMultiCellWidget(m_priority, 4, 4, 0, 1); l0->setRowStretch(5, 1); - connect(m_time, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTimeChanged())); + connect(m_time, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTimeChanged())); } KPSchedulePage::~KPSchedulePage() diff --git a/tdeprint/cups/kptextpage.cpp b/tdeprint/cups/kptextpage.cpp index 9ad9d7cb5..4e990007e 100644 --- a/tdeprint/cups/kptextpage.cpp +++ b/tdeprint/cups/kptextpage.cpp @@ -208,7 +208,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) m_columns->setLabel(i18n("C&olumns:"), TQt::AlignLeft|TQt::AlignVCenter); m_columns->setRange(1, 10, 1, false); KSeparator *sep = new KSeparator(TQt::Horizontal, formatbox); - connect(m_columns, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotColumnsChanged(int))); + connect(m_columns, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotColumnsChanged(int))); m_prettypix = new TQLabel(prettybox); TQWhatsThis::add(m_prettypix, whatsThisPrettyprintPreviewIconTextPage); @@ -222,7 +222,7 @@ KPTextPage::KPTextPage(DrMain *driver, TQWidget *parent, const char *name) m_prettyprint->insert(off, 0); m_prettyprint->insert(on, 1); m_prettyprint->setButton(0); - connect(m_prettyprint, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotPrettyChanged(int))); + connect(m_prettyprint, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotPrettyChanged(int))); slotPrettyChanged(0); m_margin = new MarginWidget(marginbox); diff --git a/tdeprint/driverview.cpp b/tdeprint/driverview.cpp index 4b40ed190..285a0864d 100644 --- a/tdeprint/driverview.cpp +++ b/tdeprint/driverview.cpp @@ -105,8 +105,8 @@ DriverView::DriverView(TQWidget *parent, const char *name) m_optview = new DrOptionView(splitter); TQWhatsThis::add(m_optview, whatsThisOptionSettingsDriverPage); - connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(m_optview,TQT_SIGNAL(changed()),TQT_SLOT(slotChanged())); + connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),m_optview,TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(m_optview,TQ_SIGNAL(changed()),TQ_SLOT(slotChanged())); } DriverView::~DriverView() diff --git a/tdeprint/droptionview.cpp b/tdeprint/droptionview.cpp index a13900156..d58c20863 100644 --- a/tdeprint/droptionview.cpp +++ b/tdeprint/droptionview.cpp @@ -78,8 +78,8 @@ OptionNumericView::OptionNumericView(TQWidget *parent, const char *name) sub2_->addWidget(m_slider,1); sub2_->addWidget(m_maxval,0); - connect(m_slider,TQT_SIGNAL(valueChanged(int)),TQT_SLOT(slotSliderChanged(int))); - connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotEditChanged(const TQString&))); + connect(m_slider,TQ_SIGNAL(valueChanged(int)),TQ_SLOT(slotSliderChanged(int))); + connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotEditChanged(const TQString&))); } void OptionNumericView::setOption(DrBase *opt) @@ -172,7 +172,7 @@ OptionStringView::OptionStringView(TQWidget *parent, const char *name) main_->addWidget(m_edit,0); main_->addStretch(1); - connect(m_edit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SIGNAL(valueChanged(const TQString&))); + connect(m_edit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SIGNAL(valueChanged(const TQString&))); } void OptionStringView::setOption(DrBase *opt) @@ -196,7 +196,7 @@ OptionListView::OptionListView(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(m_list); - connect(m_list,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); + connect(m_list,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); } void OptionListView::setOption(DrBase *opt) @@ -246,7 +246,7 @@ OptionBooleanView::OptionBooleanView(TQWidget *parent, const char *name) TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(m_group); - connect(m_group,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotSelected(int))); + connect(m_group,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotSelected(int))); } void OptionBooleanView::setOption(DrBase *opt) @@ -283,23 +283,23 @@ DrOptionView::DrOptionView(TQWidget *parent, const char *name) m_stack = new TQWidgetStack(this); OptionBaseView *w = new OptionListView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::List); w = new OptionStringView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::String); w = new OptionNumericView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::Integer); w = new OptionBooleanView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,DrBase::Boolean); w = new OptionBaseView(m_stack); - connect(w,TQT_SIGNAL(valueChanged(const TQString&)),TQT_SLOT(slotValueChanged(const TQString&))); + connect(w,TQ_SIGNAL(valueChanged(const TQString&)),TQ_SLOT(slotValueChanged(const TQString&))); m_stack->addWidget(w,0); // empty widget m_stack->raiseWidget(w); diff --git a/tdeprint/kpcopiespage.cpp b/tdeprint/kpcopiespage.cpp index 0550a2861..f0afae75b 100644 --- a/tdeprint/kpcopiespage.cpp +++ b/tdeprint/kpcopiespage.cpp @@ -175,7 +175,7 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) TQWhatsThis::add(m_range, whatsThisPageRangeLabel); m_rangeedit = new TQLineEdit(m_pagebox); TQWhatsThis::add(m_rangeedit, whatsThisPageRangeLabel); - connect(m_range, TQT_SIGNAL(clicked()), m_rangeedit, TQT_SLOT(setFocus())); + connect(m_range, TQ_SIGNAL(clicked()), m_rangeedit, TQ_SLOT(setFocus())); TQToolTip::add(m_rangeedit, i18n("

    Enter pages or group of pages to print separated by commas (1,2-5,8).

    ")); // TQWhatsThis::add(m_rangeedit, i18n("

    Enter pages or group of pages to print separated by commas (1,2-5,8).

    ")); //TQLabel *m_rangeexpl = new TQLabel(m_pagebox); @@ -249,9 +249,9 @@ KPCopiesPage::KPCopiesPage(KPrinter *prt, TQWidget *parent, const char *name) slotCollateClicked(); // connections - connect(m_rangeedit,TQT_SIGNAL(textChanged(const TQString&)),TQT_SLOT(slotRangeEntered())); - connect(m_collate,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked())); - connect(m_order,TQT_SIGNAL(clicked()),TQT_SLOT(slotCollateClicked())); + connect(m_rangeedit,TQ_SIGNAL(textChanged(const TQString&)),TQ_SLOT(slotRangeEntered())); + connect(m_collate,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked())); + connect(m_order,TQ_SIGNAL(clicked()),TQ_SLOT(slotCollateClicked())); if (!kapp->authorize("print/copies")) { diff --git a/tdeprint/kpfilterpage.cpp b/tdeprint/kpfilterpage.cpp index 768e4b475..7ac9b146c 100644 --- a/tdeprint/kpfilterpage.cpp +++ b/tdeprint/kpfilterpage.cpp @@ -133,7 +133,7 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) m_view->setLineWidth(1); m_view->setSorting(-1); m_view->header()->hide(); - connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotItemSelected(TQListViewItem*))); + connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotItemSelected(TQListViewItem*))); m_add = new TQToolButton(this); TQWhatsThis::add(m_add, whatsThisAddFilterButton); @@ -160,12 +160,12 @@ KPFilterPage::KPFilterPage(TQWidget *parent, const char *name) m_configure->setIconSet(BarIconSet("configure")); TQToolTip::add(m_configure, i18n("Configure filter")); - connect(m_add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddClicked())); - connect(m_remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemoveClicked())); - connect(m_up,TQT_SIGNAL(clicked()),TQT_SLOT(slotUpClicked())); - connect(m_down,TQT_SIGNAL(clicked()),TQT_SLOT(slotDownClicked())); - connect(m_configure,TQT_SIGNAL(clicked()),TQT_SLOT(slotConfigureClicked())); - connect(m_view,TQT_SIGNAL(doubleClicked(TQListViewItem*)),TQT_SLOT(slotConfigureClicked())); + connect(m_add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddClicked())); + connect(m_remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemoveClicked())); + connect(m_up,TQ_SIGNAL(clicked()),TQ_SLOT(slotUpClicked())); + connect(m_down,TQ_SIGNAL(clicked()),TQ_SLOT(slotDownClicked())); + connect(m_configure,TQ_SIGNAL(clicked()),TQ_SLOT(slotConfigureClicked())); + connect(m_view,TQ_SIGNAL(doubleClicked(TQListViewItem*)),TQ_SLOT(slotConfigureClicked())); m_info = new KActiveLabel(this); TQWhatsThis::add(m_info, whatsThisFilterInfoPane); diff --git a/tdeprint/kpgeneralpage.cpp b/tdeprint/kpgeneralpage.cpp index 1145c6f53..bce57cd1f 100644 --- a/tdeprint/kpgeneralpage.cpp +++ b/tdeprint/kpgeneralpage.cpp @@ -376,9 +376,9 @@ KPGeneralPage::KPGeneralPage(KMPrinter *pr, DrMain *dr, TQWidget *parent, const lay6->setColStretch(1, 1); // connections (+ misc) - connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int))); - connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int))); - connect(m_duplexbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotDuplexChanged(int))); + connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int))); + connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int))); + connect(m_duplexbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotDuplexChanged(int))); // init initialize(); diff --git a/tdeprint/kpposterpage.cpp b/tdeprint/kpposterpage.cpp index 9c0a42501..23e11a760 100644 --- a/tdeprint/kpposterpage.cpp +++ b/tdeprint/kpposterpage.cpp @@ -199,15 +199,15 @@ KPPosterPage::KPPosterPage( TQWidget *parent, const char *name ) m_postersize->setCurrentItem( findIndex( KPrinter::A3 ) ); slotPosterSizeChanged( m_postersize->currentItem() ); - connect( m_postercheck, TQT_SIGNAL( toggled( bool ) ), dummy, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_postercheck, TQ_SIGNAL( toggled( bool ) ), dummy, TQ_SLOT( setEnabled( bool ) ) ); dummy->setEnabled( false ); - connect( m_postersize, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotPosterSizeChanged( int ) ) ); - connect( m_cutmargin, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotMarginChanged( int ) ) ); - connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), m_printsize, TQT_SLOT( setDisabled( bool ) ) ); + connect( m_postersize, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotPosterSizeChanged( int ) ) ); + connect( m_cutmargin, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotMarginChanged( int ) ) ); + connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), m_printsize, TQ_SLOT( setDisabled( bool ) ) ); m_printsize->setEnabled( false ); - connect( m_lockbtn, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotLockToggled( bool ) ) ); - connect( m_selection, TQT_SIGNAL( textChanged( const TQString& ) ), m_preview, TQT_SLOT( setSelectedPages( const TQString& ) ) ); - connect( m_preview, TQT_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQT_SLOT( setText( const TQString& ) ) ); + connect( m_lockbtn, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotLockToggled( bool ) ) ); + connect( m_selection, TQ_SIGNAL( textChanged( const TQString& ) ), m_preview, TQ_SLOT( setSelectedPages( const TQString& ) ) ); + connect( m_preview, TQ_SIGNAL( selectionChanged( const TQString& ) ), m_selection, TQ_SLOT( setText( const TQString& ) ) ); if ( KMFactory::self()->settings()->application != KPrinter::Dialog && KMFactory::self()->settings()->application >= 0 ) diff --git a/tdeprint/kpqtpage.cpp b/tdeprint/kpqtpage.cpp index be88508fd..e6088d489 100644 --- a/tdeprint/kpqtpage.cpp +++ b/tdeprint/kpqtpage.cpp @@ -218,9 +218,9 @@ void KPQtPage::init() } // connections - connect(m_orientbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotOrientationChanged(int))); - connect(m_colorbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotColorModeChanged(int))); - connect(m_nupbox,TQT_SIGNAL(clicked(int)),TQT_SLOT(slotNupChanged(int))); + connect(m_orientbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotOrientationChanged(int))); + connect(m_colorbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotColorModeChanged(int))); + connect(m_nupbox,TQ_SIGNAL(clicked(int)),TQ_SLOT(slotNupChanged(int))); } void KPQtPage::slotOrientationChanged(int ID) diff --git a/tdeprint/kprintaction.cpp b/tdeprint/kprintaction.cpp index 4a4aac597..d09997785 100644 --- a/tdeprint/kprintaction.cpp +++ b/tdeprint/kprintaction.cpp @@ -67,8 +67,8 @@ KPrintAction::~KPrintAction() void KPrintAction::initialize(PrinterType type, TQWidget *parentWidget) { - connect(popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); - connect(popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); + connect(popupMenu(), TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); + connect(popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); d->type = type; d->parentWidget = parentWidget; diff --git a/tdeprint/kprintdialog.cpp b/tdeprint/kprintdialog.cpp index d6cf3a03b..25691e673 100644 --- a/tdeprint/kprintdialog.cpp +++ b/tdeprint/kprintdialog.cpp @@ -396,19 +396,19 @@ KPrintDialog::KPrintDialog(TQWidget *parent, const char *name) l3->addMultiCellWidget(d->m_cmd,2,2,1,2); // connections - connect(d->m_ok,TQT_SIGNAL(clicked()),TQT_SLOT(accept())); - connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject())); - connect(d->m_properties,TQT_SIGNAL(clicked()),TQT_SLOT(slotProperties())); - connect(d->m_default,TQT_SIGNAL(clicked()),TQT_SLOT(slotSetDefault())); - connect(d->m_printers,TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); - connect(d->m_options,TQT_SIGNAL(clicked()),TQT_SLOT(slotOptions())); - connect(d->m_wizard,TQT_SIGNAL(clicked()),TQT_SLOT(slotWizard())); - connect(d->m_extbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotExtensionClicked())); - connect(d->m_filter, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); - connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp())); - connect(d->m_file, TQT_SIGNAL(urlSelected(const TQString&)), TQT_SLOT(slotOutputFileSelected(const TQString&))); - connect( d->m_file, TQT_SIGNAL( openFileDialog( KURLRequester* ) ), TQT_SLOT( slotOpenFileDialog() ) ); - connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect(d->m_ok,TQ_SIGNAL(clicked()),TQ_SLOT(accept())); + connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject())); + connect(d->m_properties,TQ_SIGNAL(clicked()),TQ_SLOT(slotProperties())); + connect(d->m_default,TQ_SIGNAL(clicked()),TQ_SLOT(slotSetDefault())); + connect(d->m_printers,TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int))); + connect(d->m_options,TQ_SIGNAL(clicked()),TQ_SLOT(slotOptions())); + connect(d->m_wizard,TQ_SIGNAL(clicked()),TQ_SLOT(slotWizard())); + connect(d->m_extbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotExtensionClicked())); + connect(d->m_filter, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool))); + connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp())); + connect(d->m_file, TQ_SIGNAL(urlSelected(const TQString&)), TQ_SLOT(slotOutputFileSelected(const TQString&))); + connect( d->m_file, TQ_SIGNAL( openFileDialog( KURLRequester* ) ), TQ_SLOT( slotOpenFileDialog() ) ); + connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); d->b_optionsEnabled = kapp->authorize("print/options") && kapp->authorize("print/selection"); d->b_propertiesEnabled = kapp->authorize("print/properties") && kapp->authorize("print/selection"); @@ -841,7 +841,7 @@ void KPrintDialog::reload() d->m_dummy->show(); // other initializations setFlags(KMFactory::self()->uiManager()->dialogFlags()); - connect( KMFactory::self()->manager(), TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect( KMFactory::self()->manager(), TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); init(); } diff --git a/tdeprint/kprinterpropertydialog.cpp b/tdeprint/kprinterpropertydialog.cpp index c120ba843..24479daba 100644 --- a/tdeprint/kprinterpropertydialog.cpp +++ b/tdeprint/kprinterpropertydialog.cpp @@ -40,7 +40,7 @@ KPrinterPropertyDialog::KPrinterPropertyDialog(KMPrinter *p, TQWidget *parent, c // set a margin m_tw = new TQTabWidget(this); m_tw->setMargin(10); - connect(m_tw,TQT_SIGNAL(currentChanged(TQWidget*)),TQT_SLOT(slotCurrentChanged(TQWidget*))); + connect(m_tw,TQ_SIGNAL(currentChanged(TQWidget*)),TQ_SLOT(slotCurrentChanged(TQWidget*))); setMainWidget(m_tw); if (m_printer) diff --git a/tdeprint/kprintpreview.cpp b/tdeprint/kprintpreview.cpp index 0684c3428..e2642e514 100644 --- a/tdeprint/kprintpreview.cpp +++ b/tdeprint/kprintpreview.cpp @@ -45,7 +45,7 @@ KPreviewProc::KPreviewProc() : TDEProcess() { m_bOk = false; - connect(this, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(this, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); } KPreviewProc::~KPreviewProc() @@ -154,11 +154,11 @@ KPrintPreview::KPrintPreview(TQWidget *parent, bool previewOnly) // create main view and actions setMainWidget(d->mainwidget_); if (previewOnly) - KStdAction::close(this, TQT_SLOT(reject()), d->actions_, "close_print"); + KStdAction::close(this, TQ_SLOT(reject()), d->actions_, "close_print"); else { - new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, this, TQT_SLOT(accept()), d->actions_, "continue_print"); - new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, this, TQT_SLOT(reject()), d->actions_, "stop_print"); + new TDEAction(i18n("Print"), "document-print", TQt::Key_Return, this, TQ_SLOT(accept()), d->actions_, "continue_print"); + new TDEAction(i18n("Cancel"), "process-stop", TQt::Key_Escape, this, TQ_SLOT(reject()), d->actions_, "stop_print"); } } diff --git a/tdeprint/kprintprocess.cpp b/tdeprint/kprintprocess.cpp index 2b0c0f6f6..13ed3f7ca 100644 --- a/tdeprint/kprintprocess.cpp +++ b/tdeprint/kprintprocess.cpp @@ -26,9 +26,9 @@ KPrintProcess::KPrintProcess() : KShellProcess() { // redirect everything to a single buffer - connect(this,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); - connect(this,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); - connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotExited( TDEProcess* ) ) ); + connect(this,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(this,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect( this, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotExited( TDEProcess* ) ) ); m_state = None; } diff --git a/tdeprint/lpr/editentrydialog.cpp b/tdeprint/lpr/editentrydialog.cpp index bf61919c3..e70e85907 100644 --- a/tdeprint/lpr/editentrydialog.cpp +++ b/tdeprint/lpr/editentrydialog.cpp @@ -86,12 +86,12 @@ EditEntryDialog::EditEntryDialog(PrintcapEntry *entry, TQWidget *parent, const c slotTypeChanged(0); m_block = false; - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotItemSelected(TQListViewItem*))); - connect(m_string, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_boolean, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotChanged())); - connect(m_number, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotChanged())); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); - connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotItemSelected(TQListViewItem*))); + connect(m_string, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_boolean, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotChanged())); + connect(m_number, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotChanged())); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); + connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); resize(500,400); } diff --git a/tdeprint/lpr/kmlprmanager.cpp b/tdeprint/lpr/kmlprmanager.cpp index 046f082f7..f207df9ee 100644 --- a/tdeprint/lpr/kmlprmanager.cpp +++ b/tdeprint/lpr/kmlprmanager.cpp @@ -455,7 +455,7 @@ TQString KMLprManager::printOptions(KPrinter *prt) void KMLprManager::createPluginActions(TDEActionCollection *coll) { - TDEAction *act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQT_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); + TDEAction *act = new TDEAction(i18n("&Edit printcap Entry..."), "tdeprint_report", 0, this, TQ_SLOT(slotEditPrintcap()), coll, "plugin_editprintcap"); act->setGroup("plugin"); } diff --git a/tdeprint/management/cjanuswidget.cpp b/tdeprint/management/cjanuswidget.cpp index 4d9820555..58a051370 100644 --- a/tdeprint/management/cjanuswidget.cpp +++ b/tdeprint/management/cjanuswidget.cpp @@ -143,7 +143,7 @@ CJanusWidget::CJanusWidget(TQWidget *parent, const char *name) f = m_iconlist->font(); f.setBold(true); m_iconlist->setFont(f); - connect(m_iconlist,TQT_SIGNAL(selectionChanged(TQListBoxItem*)),TQT_SLOT(slotSelected(TQListBoxItem*))); + connect(m_iconlist,TQ_SIGNAL(selectionChanged(TQListBoxItem*)),TQ_SLOT(slotSelected(TQListBoxItem*))); m_empty = new TQWidget(this, "Empty"); m_stack->addWidget(m_empty,0); diff --git a/tdeprint/management/kiconselectaction.cpp b/tdeprint/management/kiconselectaction.cpp index ea6efa753..132ca990c 100644 --- a/tdeprint/management/kiconselectaction.cpp +++ b/tdeprint/management/kiconselectaction.cpp @@ -94,7 +94,7 @@ int TDEIconSelectAction::plug(TQWidget* widget, int index) bar->getButton(id)->setPopup(d->m_menu, true); bar->setItemEnabled(id, isEnabled()); addContainer(bar, id); - connect(bar, TQT_SIGNAL(destroyed()), TQT_SLOT(slotDestroyed())); + connect(bar, TQ_SIGNAL(destroyed()), TQ_SLOT(slotDestroyed())); value = containerCount()-1; } diff --git a/tdeprint/management/kmconfigfilter.cpp b/tdeprint/management/kmconfigfilter.cpp index 1badc0ee1..18354839d 100644 --- a/tdeprint/management/kmconfigfilter.cpp +++ b/tdeprint/management/kmconfigfilter.cpp @@ -80,10 +80,10 @@ KMConfigFilter::KMConfigFilter(TQWidget *parent, const char *name) l3->addWidget(lab1, 0); l3->addWidget(m_locationre, 1); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddClicked())); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveClicked())); - connect(m_list1, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); - connect(m_list2, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddClicked())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveClicked())); + connect(m_list1, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); + connect(m_list2, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); m_add->setEnabled(false); m_remove->setEnabled(false); } diff --git a/tdeprint/management/kmconfigfonts.cpp b/tdeprint/management/kmconfigfonts.cpp index 943719534..7107bc74d 100644 --- a/tdeprint/management/kmconfigfonts.cpp +++ b/tdeprint/management/kmconfigfonts.cpp @@ -91,12 +91,12 @@ KMConfigFonts::KMConfigFonts(TQWidget *parent, const char *name) "font path is used, so adding those directories is not needed. The default " "search path should be sufficient in most cases.")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove())); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd())); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); - connect(m_fontpath, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelected())); - connect(m_addpath, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotTextChanged(const TQString&))); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown())); + connect(m_fontpath, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelected())); + connect(m_addpath, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotTextChanged(const TQString&))); m_add->setEnabled(false); m_remove->setEnabled(false); m_up->setEnabled(false); diff --git a/tdeprint/management/kmconfiggeneral.cpp b/tdeprint/management/kmconfiggeneral.cpp index bf5a74d6e..1b21dbca6 100644 --- a/tdeprint/management/kmconfiggeneral.cpp +++ b/tdeprint/management/kmconfiggeneral.cpp @@ -58,10 +58,10 @@ KMConfigGeneral::KMConfigGeneral(TQWidget *parent) m_defaulttestpage = new TQCheckBox(i18n("&Specify personal test page"), m_testpagebox, "TestPageCheck"); m_testpage = new KURLRequester(m_testpagebox,"TestPage"); m_preview = new KPushButton(KGuiItem(i18n("Preview..."), "filefind"), m_testpagebox); - connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),m_testpage,TQT_SLOT(setEnabled(bool))); - connect(m_defaulttestpage,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(setEnabledPreviewButton(bool))); - connect(m_preview,TQT_SIGNAL(clicked()),TQT_SLOT(slotTestPagePreview())); - connect(m_testpage->lineEdit(),TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(testPageChanged(const TQString & ))); + connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),m_testpage,TQ_SLOT(setEnabled(bool))); + connect(m_defaulttestpage,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(setEnabledPreviewButton(bool))); + connect(m_preview,TQ_SIGNAL(clicked()),TQ_SLOT(slotTestPagePreview())); + connect(m_testpage->lineEdit(),TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(testPageChanged(const TQString & ))); m_testpage->setDisabled(true); m_preview->setDisabled(true); m_defaulttestpage->setCursor(KCursor::handCursor()); diff --git a/tdeprint/management/kmconfigpreview.cpp b/tdeprint/management/kmconfigpreview.cpp index 556ec4652..b3c8aa39e 100644 --- a/tdeprint/management/kmconfigpreview.cpp +++ b/tdeprint/management/kmconfigpreview.cpp @@ -55,7 +55,7 @@ KMConfigPreview::KMConfigPreview(TQWidget *parent, const char *name) l1->addWidget(m_useext); l1->addWidget(m_program); - connect(m_useext, TQT_SIGNAL(toggled(bool)), m_program, TQT_SLOT(setEnabled(bool))); + connect(m_useext, TQ_SIGNAL(toggled(bool)), m_program, TQ_SLOT(setEnabled(bool))); m_program->setEnabled(false); } diff --git a/tdeprint/management/kmdbcreator.cpp b/tdeprint/management/kmdbcreator.cpp index 6154ebea2..720b213a3 100644 --- a/tdeprint/management/kmdbcreator.cpp +++ b/tdeprint/management/kmdbcreator.cpp @@ -35,9 +35,9 @@ KMDBCreator::KMDBCreator(TQObject *parent, const char *name) m_dlg = 0; m_status = true; - connect(&m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); - connect(&m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc,TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*))); } KMDBCreator::~KMDBCreator() @@ -112,7 +112,7 @@ bool KMDBCreator::createDriverDB(const TQString& dirname, const TQString& filena m_dlg = new TQProgressDialog(parent->topLevelWidget(),"progress-dialog",true); m_dlg->setLabelText(i18n("Please wait while TDE rebuilds a driver database.")); m_dlg->setCaption(i18n("Driver Database")); - connect(m_dlg,TQT_SIGNAL(canceled()),TQT_SLOT(slotCancelled())); + connect(m_dlg,TQ_SIGNAL(canceled()),TQ_SLOT(slotCancelled())); } m_dlg->setMinimumDuration(0); // always show the dialog m_dlg->setProgress(0); // to force showing diff --git a/tdeprint/management/kmdriverdb.cpp b/tdeprint/management/kmdriverdb.cpp index 5a172281b..80c44a5a8 100644 --- a/tdeprint/management/kmdriverdb.cpp +++ b/tdeprint/management/kmdriverdb.cpp @@ -47,7 +47,7 @@ KMDriverDB::KMDriverDB(TQObject *parent, const char *name) : TQObject(parent,name) { m_creator = new KMDBCreator(this,"db-creator"); - connect(m_creator,TQT_SIGNAL(dbCreated()),TQT_SLOT(slotDbCreated())); + connect(m_creator,TQ_SIGNAL(dbCreated()),TQ_SLOT(slotDbCreated())); m_entries.setAutoDelete(true); m_pnpentries.setAutoDelete(true); diff --git a/tdeprint/management/kmdriverdbwidget.cpp b/tdeprint/management/kmdriverdbwidget.cpp index a6d3a6a72..c49af544a 100644 --- a/tdeprint/management/kmdriverdbwidget.cpp +++ b/tdeprint/management/kmdriverdbwidget.cpp @@ -74,19 +74,19 @@ KMDriverDbWidget::KMDriverDbWidget(TQWidget *parent, const char *name) sub2_->addWidget(m_other,0); // build connections - connect(KMDriverDB::self(),TQT_SIGNAL(dbLoaded(bool)),TQT_SLOT(slotDbLoaded(bool))); - connect(KMDriverDB::self(), TQT_SIGNAL(error(const TQString&)), TQT_SLOT(slotError(const TQString&))); - connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),TQT_SLOT(slotManufacturerSelected(const TQString&))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool))); - connect(m_raw,TQT_SIGNAL(toggled(bool)),m_postscript,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_manu,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_model,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_other,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),m_raw,TQT_SLOT(setDisabled(bool))); - connect(m_postscript,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotPostscriptToggled(bool))); - connect(m_other,TQT_SIGNAL(clicked()),TQT_SLOT(slotOtherClicked())); + connect(KMDriverDB::self(),TQ_SIGNAL(dbLoaded(bool)),TQ_SLOT(slotDbLoaded(bool))); + connect(KMDriverDB::self(), TQ_SIGNAL(error(const TQString&)), TQ_SLOT(slotError(const TQString&))); + connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),TQ_SLOT(slotManufacturerSelected(const TQString&))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool))); + connect(m_raw,TQ_SIGNAL(toggled(bool)),m_postscript,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_manu,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_model,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_other,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),m_raw,TQ_SLOT(setDisabled(bool))); + connect(m_postscript,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotPostscriptToggled(bool))); + connect(m_other,TQ_SIGNAL(clicked()),TQ_SLOT(slotOtherClicked())); } KMDriverDbWidget::~KMDriverDbWidget() @@ -240,7 +240,7 @@ void KMDriverDbWidget::slotOtherClicked() if (driver) { m_external = filename; - disconnect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); + disconnect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&))); m_manu->clear(); m_model->clear(); TQString s = driver->get("manufacturer"); @@ -264,7 +264,7 @@ void KMDriverDbWidget::slotOtherClicked() else { m_external = TQString::null; - connect(m_manu,TQT_SIGNAL(highlighted(const TQString&)),this,TQT_SLOT(slotManufacturerSelected(const TQString&))); + connect(m_manu,TQ_SIGNAL(highlighted(const TQString&)),this,TQ_SLOT(slotManufacturerSelected(const TQString&))); m_other->setText(i18n("Other")); m_desc = TQString::null; slotDbLoaded(true); diff --git a/tdeprint/management/kmiconview.cpp b/tdeprint/management/kmiconview.cpp index 5cd37c948..bfc34570d 100644 --- a/tdeprint/management/kmiconview.cpp +++ b/tdeprint/management/kmiconview.cpp @@ -129,8 +129,8 @@ KMIconView::KMIconView(TQWidget *parent, const char *name) m_items.setAutoDelete(false); setViewMode(KMIconView::Big); - connect(this,TQT_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&))); - connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); + connect(this,TQ_SIGNAL(contextMenuRequested(TQIconViewItem*,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(TQIconViewItem*,const TQPoint&))); + connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); } KMIconView::~KMIconView() diff --git a/tdeprint/management/kminstancepage.cpp b/tdeprint/management/kminstancepage.cpp index 45030a587..411f86325 100644 --- a/tdeprint/management/kminstancepage.cpp +++ b/tdeprint/management/kminstancepage.cpp @@ -78,20 +78,20 @@ void KMInstancePage::addButton(const TQString& txt, const TQString& pixmap, cons btn->setText(txt); btn->setIconSet(BarIconSet(pixmap)); btn->setFlat(true); - connect(btn, TQT_SIGNAL(clicked()), receiver); + connect(btn, TQ_SIGNAL(clicked()), receiver); m_buttons.append(btn); } void KMInstancePage::initActions() { - addButton(i18n("New..."), "document-new", TQT_SLOT(slotNew())); - addButton(i18n("Copy..."), "edit-copy", TQT_SLOT(slotCopy())); - addButton(i18n("Remove"), "edittrash", TQT_SLOT(slotRemove())); + addButton(i18n("New..."), "document-new", TQ_SLOT(slotNew())); + addButton(i18n("Copy..."), "edit-copy", TQ_SLOT(slotCopy())); + addButton(i18n("Remove"), "edittrash", TQ_SLOT(slotRemove())); m_buttons.append(0); - addButton(i18n("Set as Default"), "application-x-executable", TQT_SLOT(slotDefault())); - addButton(i18n("Settings"), "configure", TQT_SLOT(slotSettings())); + addButton(i18n("Set as Default"), "application-x-executable", TQ_SLOT(slotDefault())); + addButton(i18n("Settings"), "configure", TQ_SLOT(slotSettings())); m_buttons.append(0); - addButton(i18n("Test..."), "document-print", TQT_SLOT(slotTest())); + addButton(i18n("Test..."), "document-print", TQ_SLOT(slotTest())); } void KMInstancePage::setPrinter(KMPrinter *p) diff --git a/tdeprint/management/kmjobviewer.cpp b/tdeprint/management/kmjobviewer.cpp index ba1e30204..c64f765a8 100644 --- a/tdeprint/management/kmjobviewer.cpp +++ b/tdeprint/management/kmjobviewer.cpp @@ -105,7 +105,7 @@ KMJobViewer::KMJobViewer(TQWidget *parent, const char *name) resize( conf->readSizeEntry( "Size", &defSize ) ); } - connect(KMFactory::self()->manager(), TQT_SIGNAL(printerListUpdated()),TQT_SLOT(slotPrinterListUpdated())); + connect(KMFactory::self()->manager(), TQ_SIGNAL(printerListUpdated()),TQ_SLOT(slotPrinterListUpdated())); } KMJobViewer::~KMJobViewer() @@ -241,7 +241,7 @@ void KMJobViewer::init() m_view->addColumn(i18n("Size (KB)")); m_view->addColumn(i18n("Page(s)")); m_view->setColumnAlignment(5,TQt::AlignRight|TQt::AlignVCenter); - connect( m_view, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQT_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); + connect( m_view, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ), TQ_SLOT( slotDropped( TQDropEvent*, TQListViewItem* ) ) ); //m_view->addColumn(i18n("Printer")); //m_view->setColumnAlignment(6,TQt::AlignRight|TQt::AlignVCenter); KMFactory::self()->uiManager()->setupJobViewer(m_view); @@ -250,8 +250,8 @@ void KMJobViewer::init() m_view->setSorting(0); m_view->setAllColumnsShowFocus(true); m_view->setSelectionMode(TQListView::Extended); - connect(m_view,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); - connect(m_view,TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int))); + connect(m_view,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); + connect(m_view,TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightClicked(TQListViewItem*,const TQPoint&,int))); setCentralWidget(m_view); } @@ -261,26 +261,26 @@ void KMJobViewer::init() void KMJobViewer::initActions() { // job actions - TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQT_SLOT(slotHold()),actionCollection(),"job_hold"); - TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQT_SLOT(slotResume()),actionCollection(),"job_resume"); - TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQT_SLOT(slotRemove()),actionCollection(),"job_remove"); - TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQT_SLOT(slotRestart()),actionCollection(),"job_restart"); + TDEAction *hact = new TDEAction(i18n("&Hold"),"process-stop",0,this,TQ_SLOT(slotHold()),actionCollection(),"job_hold"); + TDEAction *ract = new TDEAction(i18n("&Resume"),"system-run",0,this,TQ_SLOT(slotResume()),actionCollection(),"job_resume"); + TDEAction *dact = new TDEAction(i18n("Remo&ve"),"edittrash",TQt::Key_Delete,this,TQ_SLOT(slotRemove()),actionCollection(),"job_remove"); + TDEAction *sact = new TDEAction(i18n("Res&tart"),"edit-redo",0,this,TQ_SLOT(slotRestart()),actionCollection(),"job_restart"); TDEActionMenu *mact = new TDEActionMenu(i18n("&Move to Printer"),"document-print",actionCollection(),"job_move"); mact->setDelayed(false); - connect(mact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotMove(int))); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect(mact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowMoveMenu())); + connect(mact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotMove(int))); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect(mact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowMoveMenu())); TDEToggleAction *tact = new TDEToggleAction(i18n("&Toggle Completed Jobs"),"history",0,actionCollection(),"view_completed"); tact->setEnabled(m_manager->actions() & KMJob::ShowCompleted); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowCompleted(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowCompleted(bool))); TDEToggleAction *uact = new TDEToggleAction(i18n("Show Only User Jobs"), "preferences-desktop-personal", 0, actionCollection(), "view_user_jobs"); uact->setCheckedState(KGuiItem(i18n("Hide Only User Jobs"),"preferences-desktop-personal")); - connect(uact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotUserOnly(bool))); + connect(uact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotUserOnly(bool))); m_userfield = new TQLineEdit(0); m_userfield->setText(getenv("USER")); - connect(m_userfield, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotUserChanged())); - connect(uact, TQT_SIGNAL(toggled(bool)), m_userfield, TQT_SLOT(setEnabled(bool))); + connect(m_userfield, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotUserChanged())); + connect(uact, TQ_SIGNAL(toggled(bool)), m_userfield, TQ_SLOT(setEnabled(bool))); m_userfield->setEnabled(false); m_userfield->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed)); KWidgetAction *ufact = new KWidgetAction(m_userfield, i18n("User Name"), 0, 0, 0, actionCollection(), "view_username"); @@ -288,8 +288,8 @@ void KMJobViewer::initActions() if (!m_pop) { m_pop = new TQPopupMenu(this); - connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); + connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); hact->plug(m_pop); ract->plug(m_pop); m_pop->insertSeparator(); @@ -302,10 +302,10 @@ void KMJobViewer::initActions() // Filter actions TDEActionMenu *fact = new TDEActionMenu(i18n("&Select Printer"), "tdeprint_printer", actionCollection(), "filter_modify"); fact->setDelayed(false); - connect(fact->popupMenu(),TQT_SIGNAL(activated(int)),TQT_SLOT(slotPrinterSelected(int))); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect(fact->popupMenu(),TQT_SIGNAL(aboutToShow()),TQT_SLOT(slotShowPrinterMenu())); + connect(fact->popupMenu(),TQ_SIGNAL(activated(int)),TQ_SLOT(slotPrinterSelected(int))); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect(fact->popupMenu(),TQ_SIGNAL(aboutToShow()),TQ_SLOT(slotShowPrinterMenu())); if (!m_standalone) { @@ -324,12 +324,12 @@ void KMJobViewer::initActions() } else {// stand-alone application - KStdAction::quit(kapp,TQT_SLOT(quit()),actionCollection()); - KStdAction::close(this,TQT_SLOT(slotClose()),actionCollection()); - KStdAction::preferences(this, TQT_SLOT(slotConfigure()), actionCollection()); + KStdAction::quit(kapp,TQ_SLOT(quit()),actionCollection()); + KStdAction::close(this,TQ_SLOT(slotClose()),actionCollection()); + KStdAction::preferences(this, TQ_SLOT(slotConfigure()), actionCollection()); // refresh action - new TDEAction(i18n("Refresh"),"reload",0,this,TQT_SLOT(slotRefresh()),actionCollection(),"refresh"); + new TDEAction(i18n("Refresh"),"reload",0,this,TQ_SLOT(slotRefresh()),actionCollection(),"refresh"); // create status bar KStatusBar *statusbar = statusBar(); @@ -338,7 +338,7 @@ void KMJobViewer::initActions() TDEConfig *conf = KMFactory::self()->printConfig(); conf->setGroup("Jobs"); m_stickybox->setChecked(conf->readBoolEntry("KeepWindow",false)); - connect(m_stickybox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeepWindowChange(bool))); + connect(m_stickybox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeepWindowChange(bool))); statusbar->addWidget( m_stickybox, 1, false ); statusbar->insertItem(" " + i18n("Max.: %1").arg(i18n("Unlimited"))+ " ", 0, 0, true); statusbar->setItemFixed(0); @@ -617,7 +617,7 @@ void KMJobViewer::loadPluginActions() for (TQValueListIterator it=acts.begin(); it!=acts.end(); ++it) { // connect the action to this - connect((*it), TQT_SIGNAL(activated(int)), TQT_SLOT(pluginActionActivated(int))); + connect((*it), TQ_SIGNAL(activated(int)), TQ_SLOT(pluginActionActivated(int))); // should add it to the toolbar and menubar (*it)->plug(toolBar(), toolbarindex++); diff --git a/tdeprint/management/kmlistview.cpp b/tdeprint/management/kmlistview.cpp index 046112502..09c89d915 100644 --- a/tdeprint/management/kmlistview.cpp +++ b/tdeprint/management/kmlistview.cpp @@ -117,10 +117,10 @@ KMListView::KMListView(TQWidget *parent, const char *name) setLineWidth(1); setSorting(0); - connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQT_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int))); - connect(this,TQT_SIGNAL(selectionChanged()),TQT_SLOT(slotSelectionChanged())); - connect(this,TQT_SIGNAL(onItem(TQListViewItem*)),TQT_SLOT(slotOnItem(TQListViewItem*))); - connect(this,TQT_SIGNAL(onViewport()),TQT_SLOT(slotOnViewport())); + connect(this,TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),TQ_SLOT(slotRightButtonClicked(TQListViewItem*,const TQPoint&,int))); + connect(this,TQ_SIGNAL(selectionChanged()),TQ_SLOT(slotSelectionChanged())); + connect(this,TQ_SIGNAL(onItem(TQListViewItem*)),TQ_SLOT(slotOnItem(TQListViewItem*))); + connect(this,TQ_SIGNAL(onViewport()),TQ_SLOT(slotOnViewport())); m_root = new KMListViewItem(this,i18n("Print System")); m_root->setPixmap(0,SmallIcon("tdeprint_printer")); diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index c13c6930c..af03b68d7 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -111,12 +111,12 @@ KMMainView::KMMainView(TQWidget *parent, const char *name, TDEActionCollection * m_layout->addWidget(m_plugin, 0); // connections - connect(KMTimer::self(),TQT_SIGNAL(timeout()),TQT_SLOT(slotTimer())); - connect(m_printerview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); - connect(m_printerview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&))); - connect(m_pop,TQT_SIGNAL(aboutToShow()),KMTimer::self(),TQT_SLOT(hold())); - connect(m_pop,TQT_SIGNAL(aboutToHide()),KMTimer::self(),TQT_SLOT(release())); - connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect(KMTimer::self(),TQ_SIGNAL(timeout()),TQ_SLOT(slotTimer())); + connect(m_printerview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); + connect(m_printerview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SLOT(slotRightButtonClicked(const TQString&,const TQPoint&))); + connect(m_pop,TQ_SIGNAL(aboutToShow()),KMTimer::self(),TQ_SLOT(hold())); + connect(m_pop,TQ_SIGNAL(aboutToHide()),KMTimer::self(),TQ_SLOT(release())); + connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); // actions if (coll) @@ -179,57 +179,57 @@ void KMMainView::initActions() iconlst << "view_icon" << "view_detailed" << "view_tree"; vact->setItems(TQStringList::split(',',i18n("&Icons,&List,&Tree"),false), iconlst); vact->setCurrentItem(0); - connect(vact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeView(int))); + connect(vact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeView(int))); TDEActionMenu *stateAct = new TDEActionMenu(i18n("Start/Stop Printer"), "tdeprint_printstate", m_actions, "printer_state_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_start")); - stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); + stateAct->insert(new TDEAction(i18n("&Start Printer"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_start")); + stateAct->insert(new TDEAction(i18n("Sto&p Printer"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_stop")); stateAct = new TDEActionMenu(i18n("Enable/Disable Job Spooling"), "tdeprint_queuestate", m_actions, "printer_spool_change"); stateAct->setDelayed(false); - stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); - stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQT_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); - - new TDEAction(i18n("&Remove"),"edittrash",0,this,TQT_SLOT(slotRemove()),m_actions,"printer_remove"); - new TDEAction(i18n("&Configure..."),"configure",0,this,TQT_SLOT(slotConfigure()),m_actions,"printer_configure"); - new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQT_SLOT(slotAdd()),m_actions,"printer_add"); - new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQT_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); - new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQT_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); - new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQT_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); - new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQT_SLOT(slotTest()),m_actions,"printer_test"); - new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQT_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); - new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQT_SLOT(slotInit()),m_actions,"view_refresh"); + stateAct->insert(new TDEAction(i18n("&Enable Job Spooling"),"tdeprint_enableprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_enable")); + stateAct->insert(new TDEAction(i18n("&Disable Job Spooling"),"tdeprint_stopprinter",0,this,TQ_SLOT(slotChangePrinterState()),m_actions,"printer_disable")); + + new TDEAction(i18n("&Remove"),"edittrash",0,this,TQ_SLOT(slotRemove()),m_actions,"printer_remove"); + new TDEAction(i18n("&Configure..."),"configure",0,this,TQ_SLOT(slotConfigure()),m_actions,"printer_configure"); + new TDEAction(i18n("Add &Printer/Class..."),"tdeprint_addprinter",0,this,TQ_SLOT(slotAdd()),m_actions,"printer_add"); + new TDEAction(i18n("Add &Special (pseudo) Printer..."),"tdeprint_addpseudo",0,this,TQ_SLOT(slotAddSpecial()),m_actions,"printer_add_special"); + new TDEAction(i18n("Set as &Local Default"),"tdeprint_defaulthard",0,this,TQ_SLOT(slotHardDefault()),m_actions,"printer_hard_default"); + new TDEAction(i18n("Set as &User Default"),"tdeprint_defaultsoft",0,this,TQ_SLOT(slotSoftDefault()),m_actions,"printer_soft_default"); + new TDEAction(i18n("&Test Printer..."),"tdeprint_testprinter",0,this,TQ_SLOT(slotTest()),m_actions,"printer_test"); + new TDEAction(i18n("Configure &Manager..."),"tdeprint_configmgr",0,this,TQ_SLOT(slotManagerConfigure()),m_actions,"manager_configure"); + new TDEAction(i18n("Initialize Manager/&View"),"reload",0,this,TQ_SLOT(slotInit()),m_actions,"view_refresh"); TDEIconSelectAction *dact = new TDEIconSelectAction(i18n("&Orientation"),0,m_actions,"orientation_change"); iconlst.clear(); iconlst << "view_top_bottom" << "view_left_right"; dact->setItems(TQStringList::split(',',i18n("&Vertical,&Horizontal"),false), iconlst); dact->setCurrentItem(0); - connect(dact,TQT_SIGNAL(activated(int)),TQT_SLOT(slotChangeDirection(int))); + connect(dact,TQ_SIGNAL(activated(int)),TQ_SLOT(slotChangeDirection(int))); - new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQT_SLOT(slotServerRestart()),m_actions,"server_restart"); - new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigure()),m_actions,"server_configure"); - new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQT_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); + new TDEAction(i18n("R&estart Server"),"tdeprint_restartsrv",0,this,TQ_SLOT(slotServerRestart()),m_actions,"server_restart"); + new TDEAction(i18n("Configure &Server..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigure()),m_actions,"server_configure"); + new TDEAction(i18n("Configure Server Access..."),"tdeprint_configsrv",0,this,TQ_SLOT(slotServerConfigureAccess()),m_actions,"server_access_configure"); TDEToggleAction *tact = new TDEToggleAction(i18n("Show &Toolbar"),0,m_actions,"view_toolbar"); tact->setCheckedState(i18n("Hide &Toolbar")); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotToggleToolBar(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotToggleToolBar(bool))); tact = new TDEToggleAction( i18n( "Show Me&nu Toolbar" ), 0, m_actions, "view_menubar" ); tact->setCheckedState(i18n("Hide Me&nu Toolbar")); - connect( tact, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotToggleMenuBar( bool ) ) ); + connect( tact, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotToggleMenuBar( bool ) ) ); tact = new TDEToggleAction(i18n("Show Pr&inter Details"),"tdeprint_printer_infos", 0,m_actions,"view_printerinfos"); tact->setCheckedState(KGuiItem(i18n("Hide Pr&inter Details"),"tdeprint_printer_infos")); tact->setChecked(true); - connect(tact,TQT_SIGNAL(toggled(bool)),TQT_SLOT(slotShowPrinterInfos(bool))); + connect(tact,TQ_SIGNAL(toggled(bool)),TQ_SLOT(slotShowPrinterInfos(bool))); tact = new TDEToggleAction(i18n("Toggle Printer &Filtering"), "filter", 0, m_actions, "view_pfilter"); tact->setChecked(KMManager::self()->isFilterEnabled()); - connect(tact, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggleFilter(bool))); + connect(tact, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggleFilter(bool))); TDEActionMenu *mact = new TDEActionMenu(i18n("Pri&nter Tools"), "applications-utilities", m_actions, "printer_tool"); mact->setDelayed(false); - connect(mact->popupMenu(), TQT_SIGNAL(activated(int)), TQT_SLOT(slotToolSelected(int))); + connect(mact->popupMenu(), TQ_SIGNAL(activated(int)), TQ_SLOT(slotToolSelected(int))); TQStringList files = TDEGlobal::dirs()->findAllResources("data", "tdeprint/tools/*.desktop"); for (TQStringList::ConstIterator it=files.begin(); it!=files.end(); ++it) { @@ -776,7 +776,7 @@ void KMMainView::reload() loadPluginActions(); // redo the connection as the old manager object has been removed - connect( m_manager, TQT_SIGNAL( updatePossible( bool ) ), TQT_SLOT( slotUpdatePossible( bool ) ) ); + connect( m_manager, TQ_SIGNAL( updatePossible( bool ) ), TQ_SLOT( slotUpdatePossible( bool ) ) ); // We must delay the refresh such that all objects has been // correctly reloaded (otherwise, crash in KMJobViewer). diff --git a/tdeprint/management/kmprinterview.cpp b/tdeprint/management/kmprinterview.cpp index ddd0ff631..c937d3875 100644 --- a/tdeprint/management/kmprinterview.cpp +++ b/tdeprint/management/kmprinterview.cpp @@ -39,12 +39,12 @@ KMPrinterView::KMPrinterView(TQWidget *parent, const char *name) m_current = TQString(); m_listset = false; - connect(m_iconview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); - connect(m_listview,TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQT_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); - connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&))); - connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SIGNAL(printerSelected(const TQString&))); - connect(m_iconview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); - connect(m_listview,TQT_SIGNAL(printerSelected(const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&))); + connect(m_iconview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); + connect(m_listview,TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&)),TQ_SIGNAL(rightButtonClicked(const TQString&,const TQPoint&))); + connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&))); + connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SIGNAL(printerSelected(const TQString&))); + connect(m_iconview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); + connect(m_listview,TQ_SIGNAL(printerSelected(const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&))); setViewType(m_type); setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) ); diff --git a/tdeprint/management/kmpropcontainer.cpp b/tdeprint/management/kmpropcontainer.cpp index c94838098..b1a993893 100644 --- a/tdeprint/management/kmpropcontainer.cpp +++ b/tdeprint/management/kmpropcontainer.cpp @@ -53,9 +53,9 @@ void KMPropContainer::setWidget(KMPropWidget *w) { m_widget = w; m_widget->reparent(this,TQPoint(0,0)); - connect(m_button,TQT_SIGNAL(clicked()),m_widget,TQT_SLOT(slotChange())); - connect(m_widget,TQT_SIGNAL(enable(bool)),TQT_SIGNAL(enable(bool))); - connect(m_widget,TQT_SIGNAL(enableChange(bool)),TQT_SLOT(slotEnableChange(bool))); + connect(m_button,TQ_SIGNAL(clicked()),m_widget,TQ_SLOT(slotChange())); + connect(m_widget,TQ_SIGNAL(enable(bool)),TQ_SIGNAL(enable(bool))); + connect(m_widget,TQ_SIGNAL(enableChange(bool)),TQ_SLOT(slotEnableChange(bool))); TQVBoxLayout *lay = dynamic_cast(layout()); if (lay) { diff --git a/tdeprint/management/kmpropertypage.cpp b/tdeprint/management/kmpropertypage.cpp index c38b399c6..eefa38372 100644 --- a/tdeprint/management/kmpropertypage.cpp +++ b/tdeprint/management/kmpropertypage.cpp @@ -55,7 +55,7 @@ void KMPropertyPage::addPropPage(KMPropWidget *w) m_widgets.append(w); KMPropContainer *ctn = new KMPropContainer(this,"Container"); ctn->setWidget(w); - connect(ctn,TQT_SIGNAL(enable(bool)),TQT_SLOT(slotEnable(bool))); + connect(ctn,TQ_SIGNAL(enable(bool)),TQ_SLOT(slotEnable(bool))); TQPixmap icon = TDEGlobal::instance()->iconLoader()->loadIcon( w->pixmap(), diff --git a/tdeprint/management/kmpropwidget.cpp b/tdeprint/management/kmpropwidget.cpp index 50c1a75e8..c38b4c186 100644 --- a/tdeprint/management/kmpropwidget.cpp +++ b/tdeprint/management/kmpropwidget.cpp @@ -34,7 +34,7 @@ KMPropWidget::KMPropWidget(TQWidget *parent, const char *name) m_printer = 0; m_canchange = ((KMFactory::self()->manager()->printerOperationMask() & KMManager::PrinterCreation) && KMFactory::self()->manager()->hasManagement()); - connect(this,TQT_SIGNAL(enable(bool)),this,TQT_SIGNAL(enableChange(bool))); + connect(this,TQ_SIGNAL(enable(bool)),this,TQ_SIGNAL(enableChange(bool))); } KMPropWidget::~KMPropWidget() diff --git a/tdeprint/management/kmspecialprinterdlg.cpp b/tdeprint/management/kmspecialprinterdlg.cpp index 2a9e3b313..3f2a22a75 100644 --- a/tdeprint/management/kmspecialprinterdlg.cpp +++ b/tdeprint/management/kmspecialprinterdlg.cpp @@ -50,7 +50,7 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) // widget creation m_name = new TQLineEdit(dummy); - connect(m_name, TQT_SIGNAL(textChanged ( const TQString & )),this,TQT_SLOT(slotTextChanged(const TQString & ))); + connect(m_name, TQ_SIGNAL(textChanged ( const TQString & )),this,TQ_SLOT(slotTextChanged(const TQString & ))); m_description = new TQLineEdit(dummy); m_location = new TQLineEdit(dummy); TQLabel *m_namelabel = new TQLabel(i18n("&Name:"), dummy); @@ -92,10 +92,10 @@ KMSpecialPrinterDlg::KMSpecialPrinterDlg(TQWidget *parent, const char *name) m_icon->setIcon("document-print"); m_icon->setFixedSize(TQSize(48,48)); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetype, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extension, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQT_SLOT( setEnabled( bool ) ) ); - connect( m_usefile, TQT_SIGNAL( toggled( bool ) ), m_extensionlabel, TQT_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetype, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extension, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_mimetypelabel, TQ_SLOT( setEnabled( bool ) ) ); + connect( m_usefile, TQ_SIGNAL( toggled( bool ) ), m_extensionlabel, TQ_SLOT( setEnabled( bool ) ) ); m_mimetypelabel->setEnabled( false ); m_mimetype->setEnabled( false ); m_extensionlabel->setEnabled( false ); diff --git a/tdeprint/management/kmtimer.cpp b/tdeprint/management/kmtimer.cpp index a0b1aa78d..a8ef55ee0 100644 --- a/tdeprint/management/kmtimer.cpp +++ b/tdeprint/management/kmtimer.cpp @@ -37,7 +37,7 @@ KMTimer* KMTimer::self() KMTimer::KMTimer(TQObject *parent, const char *name) : TQTimer(parent, name), m_count(0) { - connect(this, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); + connect(this, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout())); } KMTimer::~KMTimer() diff --git a/tdeprint/management/kmwclass.cpp b/tdeprint/management/kmwclass.cpp index e04467632..e7ff0faff 100644 --- a/tdeprint/management/kmwclass.cpp +++ b/tdeprint/management/kmwclass.cpp @@ -46,8 +46,8 @@ KMWClass::KMWClass(TQWidget *parent, const char *name) TQToolButton *remove = new TQToolButton(this); add->setIconSet(BarIcon("forward")); remove->setIconSet(BarIcon("back")); - connect(add,TQT_SIGNAL(clicked()),TQT_SLOT(slotAdd())); - connect(remove,TQT_SIGNAL(clicked()),TQT_SLOT(slotRemove())); + connect(add,TQ_SIGNAL(clicked()),TQ_SLOT(slotAdd())); + connect(remove,TQ_SIGNAL(clicked()),TQ_SLOT(slotRemove())); TQLabel *l1 = new TQLabel(i18n("Available printers:"), this); TQLabel *l2 = new TQLabel(i18n("Class printers:"), this); diff --git a/tdeprint/management/kmwdriverselect.cpp b/tdeprint/management/kmwdriverselect.cpp index cc52f1015..8d4e1e802 100644 --- a/tdeprint/management/kmwdriverselect.cpp +++ b/tdeprint/management/kmwdriverselect.cpp @@ -44,7 +44,7 @@ KMWDriverSelect::KMWDriverSelect(TQWidget *parent, const char *name) "you want to use. You will have the opportunity to test it as well as to " "change it if necessary.

    ")); m_drivercomment = new KPushButton(i18n("Driver Information"), this); - connect(m_drivercomment, TQT_SIGNAL(clicked()), TQT_SLOT(slotDriverComment())); + connect(m_drivercomment, TQ_SIGNAL(clicked()), TQ_SLOT(slotDriverComment())); TQVBoxLayout *main_ = new TQVBoxLayout(this, 0, 10); main_->addWidget(l1,0); diff --git a/tdeprint/management/kmwdrivertest.cpp b/tdeprint/management/kmwdrivertest.cpp index b43d2f11d..dcc83d661 100644 --- a/tdeprint/management/kmwdrivertest.cpp +++ b/tdeprint/management/kmwdrivertest.cpp @@ -80,8 +80,8 @@ KMWDriverTest::KMWDriverTest(TQWidget *parent, const char *name) lay3->addWidget(m_settings,0); lay3->addStretch(1); - connect(m_test,TQT_SIGNAL(clicked()),TQT_SLOT(slotTest())); - connect(m_settings,TQT_SIGNAL(clicked()),TQT_SLOT(slotSettings())); + connect(m_test,TQ_SIGNAL(clicked()),TQ_SLOT(slotTest())); + connect(m_settings,TQ_SIGNAL(clicked()),TQ_SLOT(slotSettings())); } KMWDriverTest::~KMWDriverTest() diff --git a/tdeprint/management/kmwizard.cpp b/tdeprint/management/kmwizard.cpp index bc894c478..87f2e21f2 100644 --- a/tdeprint/management/kmwizard.cpp +++ b/tdeprint/management/kmwizard.cpp @@ -74,10 +74,10 @@ KMWizard::KMWizard(TQWidget *parent, const char *name) KSeparator* sep2 = new KSeparator( KSeparator::HLine, this); TQPushButton *m_help = new KPushButton(KStdGuiItem::help(), this); - connect(m_cancel,TQT_SIGNAL(clicked()),TQT_SLOT(reject())); - connect(m_next,TQT_SIGNAL(clicked()),TQT_SLOT(slotNext())); - connect(m_prev,TQT_SIGNAL(clicked()),TQT_SLOT(slotPrev())); - connect(m_help, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp())); + connect(m_cancel,TQ_SIGNAL(clicked()),TQ_SLOT(reject())); + connect(m_next,TQ_SIGNAL(clicked()),TQ_SLOT(slotNext())); + connect(m_prev,TQ_SIGNAL(clicked()),TQ_SLOT(slotPrev())); + connect(m_help, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp())); m_side = new SidePixmap(this); if (!m_side->isValid()) diff --git a/tdeprint/management/kmwlocal.cpp b/tdeprint/management/kmwlocal.cpp index a3180000f..dce5fef41 100644 --- a/tdeprint/management/kmwlocal.cpp +++ b/tdeprint/management/kmwlocal.cpp @@ -50,10 +50,10 @@ KMWLocal::KMWLocal(TQWidget *parent, const char *name) TQListViewItem *root = new TQListViewItem(m_ports, i18n("Local System")); root->setPixmap(0, SmallIcon("tdeprint_computer")); root->setOpen(true); - connect(m_ports, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotPortSelected(TQListViewItem*))); + connect(m_ports, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotPortSelected(TQListViewItem*))); TQLabel *l1 = new TQLabel(i18n("URI:"), this); m_localuri = new TQLineEdit(this); - connect( m_localuri, TQT_SIGNAL( textChanged( const TQString& ) ), TQT_SLOT( slotTextChanged( const TQString& ) ) ); + connect( m_localuri, TQ_SIGNAL( textChanged( const TQString& ) ), TQ_SLOT( slotTextChanged( const TQString& ) ) ); m_parents[0] = new TQListViewItem(root, i18n("Parallel")); m_parents[1] = new TQListViewItem(root, m_parents[0], i18n("Serial")); m_parents[2] = new TQListViewItem(root, m_parents[1], i18n("USB")); diff --git a/tdeprint/management/kmwpassword.cpp b/tdeprint/management/kmwpassword.cpp index 928d78173..f7340b71b 100644 --- a/tdeprint/management/kmwpassword.cpp +++ b/tdeprint/management/kmwpassword.cpp @@ -63,8 +63,8 @@ KMWPassword::KMWPassword(TQWidget *parent, const char *name) m_login->setEnabled(false); m_password->setEnabled(false); - connect(btn3,TQT_SIGNAL(toggled(bool)),m_login,TQT_SLOT(setEnabled(bool))); - connect(btn3,TQT_SIGNAL(toggled(bool)),m_password,TQT_SLOT(setEnabled(bool))); + connect(btn3,TQ_SIGNAL(toggled(bool)),m_login,TQ_SLOT(setEnabled(bool))); + connect(btn3,TQ_SIGNAL(toggled(bool)),m_password,TQ_SLOT(setEnabled(bool))); // layout TQVBoxLayout *main_ = new TQVBoxLayout( this, 0, 0 ); diff --git a/tdeprint/management/kmwsmb.cpp b/tdeprint/management/kmwsmb.cpp index bff726cc4..94bffc2b8 100644 --- a/tdeprint/management/kmwsmb.cpp +++ b/tdeprint/management/kmwsmb.cpp @@ -67,10 +67,10 @@ KMWSmb::KMWSmb(TQWidget *parent, const char *name) lay3->addWidget(m_scan); lay3->addWidget(m_abort); - connect(m_scan,TQT_SIGNAL(clicked()),TQT_SLOT(slotScan())); - connect(m_abort,TQT_SIGNAL(clicked()),TQT_SLOT(slotAbort())); - connect(m_view,TQT_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQT_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&))); - connect(m_view,TQT_SIGNAL(running(bool)),m_abort,TQT_SLOT(setEnabled(bool))); + connect(m_scan,TQ_SIGNAL(clicked()),TQ_SLOT(slotScan())); + connect(m_abort,TQ_SIGNAL(clicked()),TQ_SLOT(slotAbort())); + connect(m_view,TQ_SIGNAL(printerSelected(const TQString&,const TQString&,const TQString&)),TQ_SLOT(slotPrinterSelected(const TQString&,const TQString&,const TQString&))); + connect(m_view,TQ_SIGNAL(running(bool)),m_abort,TQ_SLOT(setEnabled(bool))); } bool KMWSmb::isValid(TQString& msg) diff --git a/tdeprint/management/kmwsocket.cpp b/tdeprint/management/kmwsocket.cpp index a3fb71b3d..6692d8785 100644 --- a/tdeprint/management/kmwsocket.cpp +++ b/tdeprint/management/kmwsocket.cpp @@ -60,11 +60,11 @@ KMWSocket::KMWSocket(TQWidget *parent, const char *name) KSeparator* sep = new KSeparator( KSeparator::HLine, this); sep->setFixedHeight(40); - connect(m_list,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), TQT_SLOT( slotScanStarted() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), TQT_SLOT( slotScanFinished() ) ); - connect( m_scanner, TQT_SIGNAL( scanStarted() ), parent, TQT_SLOT( disableWizard() ) ); - connect( m_scanner, TQT_SIGNAL( scanFinished() ), parent, TQT_SLOT( enableWizard() ) ); + connect(m_list,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*))); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), TQ_SLOT( slotScanStarted() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), TQ_SLOT( slotScanFinished() ) ); + connect( m_scanner, TQ_SIGNAL( scanStarted() ), parent, TQ_SLOT( disableWizard() ) ); + connect( m_scanner, TQ_SIGNAL( scanFinished() ), parent, TQ_SLOT( enableWizard() ) ); // layout TQHBoxLayout *lay3 = new TQHBoxLayout(this, 0, 10); diff --git a/tdeprint/management/kxmlcommanddlg.cpp b/tdeprint/management/kxmlcommanddlg.cpp index 45983558c..1b0ecb183 100644 --- a/tdeprint/management/kxmlcommanddlg.cpp +++ b/tdeprint/management/kxmlcommanddlg.cpp @@ -252,29 +252,29 @@ KXmlCommandAdvancedDlg::KXmlCommandAdvancedDlg(TQWidget *parent, const char *nam l12->addWidget( m_commentlab ); l12->addWidget( m_comment ); - connect(m_view, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotSelectionChanged(TQListViewItem*))); - connect(m_values, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotValueSelected(TQListViewItem*))); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged(int))); - connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddValue())); - connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveValue())); - connect(m_apply, TQT_SIGNAL(clicked()), TQT_SLOT(slotApplyChanges())); - connect(m_addgrp, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddGroup())); - connect(m_addopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddOption())); - connect(m_delopt, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveItem())); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveUp())); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotMoveDown())); - connect(m_command, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotCommandChanged(const TQString&))); - connect(m_view, TQT_SIGNAL(itemRenamed(TQListViewItem*,int)), TQT_SLOT(slotOptionRenamed(TQListViewItem*,int))); - connect(m_desc, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_name, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_format, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_default, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_edit1, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_edit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotChanged())); - connect(m_type, TQT_SIGNAL(activated(int)), TQT_SLOT(slotChanged())); - connect(m_addval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect(m_delval, TQT_SIGNAL(clicked()), TQT_SLOT(slotChanged())); - connect( m_persistent, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotChanged() ) ); + connect(m_view, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_values, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotValueSelected(TQListViewItem*))); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged(int))); + connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddValue())); + connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveValue())); + connect(m_apply, TQ_SIGNAL(clicked()), TQ_SLOT(slotApplyChanges())); + connect(m_addgrp, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddGroup())); + connect(m_addopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddOption())); + connect(m_delopt, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveItem())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveUp())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotMoveDown())); + connect(m_command, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotCommandChanged(const TQString&))); + connect(m_view, TQ_SIGNAL(itemRenamed(TQListViewItem*,int)), TQ_SLOT(slotOptionRenamed(TQListViewItem*,int))); + connect(m_desc, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_name, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_format, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_default, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_edit1, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_edit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotChanged())); + connect(m_type, TQ_SIGNAL(activated(int)), TQ_SLOT(slotChanged())); + connect(m_addval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect(m_delval, TQ_SIGNAL(clicked()), TQ_SLOT(slotChanged())); + connect( m_persistent, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotChanged() ) ); m_dummy->setEnabled(false); viewItem(0); @@ -910,14 +910,14 @@ KXmlCommandDlg::KXmlCommandDlg(TQWidget *parent, const char *name) l8->addWidget(m_removereq); l8->addStretch(1); - connect(m_addmime, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddMime())); - connect(m_removemime, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveMime())); - connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); - connect(m_requirements, TQT_SIGNAL(selectionChanged(TQListViewItem*)), TQT_SLOT(slotReqSelected(TQListViewItem*))); - connect(m_availablemime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotAvailableSelected(TQListBoxItem*))); - connect(m_selectedmime, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), TQT_SLOT(slotSelectedSelected(TQListBoxItem*))); - connect(m_addreq, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddReq())); - connect(m_removereq, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveReq())); + connect(m_addmime, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddMime())); + connect(m_removemime, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveMime())); + connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand())); + connect(m_requirements, TQ_SIGNAL(selectionChanged(TQListViewItem*)), TQ_SLOT(slotReqSelected(TQListViewItem*))); + connect(m_availablemime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotAvailableSelected(TQListBoxItem*))); + connect(m_selectedmime, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), TQ_SLOT(slotSelectedSelected(TQListBoxItem*))); + connect(m_addreq, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddReq())); + connect(m_removereq, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveReq())); KMimeType::List list = KMimeType::allMimeTypes(); for (TQValueList::ConstIterator it=list.begin(); it!=list.end(); ++it) diff --git a/tdeprint/management/kxmlcommandselector.cpp b/tdeprint/management/kxmlcommandselector.cpp index f94b51437..71ae148c3 100644 --- a/tdeprint/management/kxmlcommandselector.cpp +++ b/tdeprint/management/kxmlcommandselector.cpp @@ -44,19 +44,19 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const : TQWidget(parent, name) { m_cmd = new TQComboBox(this); - connect(m_cmd, TQT_SIGNAL(activated(int)), TQT_SLOT(slotCommandSelected(int))); + connect(m_cmd, TQ_SIGNAL(activated(int)), TQ_SLOT(slotCommandSelected(int))); TQPushButton *m_add = new KPushButton(this); TQPushButton *m_edit = new KPushButton(this); m_add->setPixmap(SmallIcon("document-new")); m_edit->setPixmap(SmallIcon("configure")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddCommand())); - connect(m_edit, TQT_SIGNAL(clicked()), TQT_SLOT(slotEditCommand())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddCommand())); + connect(m_edit, TQ_SIGNAL(clicked()), TQ_SLOT(slotEditCommand())); TQToolTip::add(m_add, i18n("New command")); TQToolTip::add(m_edit, i18n("Edit command")); m_shortinfo = new TQLabel(this); m_helpbtn = new KPushButton( this ); m_helpbtn->setIconSet( SmallIconSet( "help" ) ); - connect( m_helpbtn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHelpCommand() ) ); + connect( m_helpbtn, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHelpCommand() ) ); TQToolTip::add( m_helpbtn, i18n( "Information" ) ); m_helpbtn->setEnabled( false ); @@ -71,14 +71,14 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const m_line = new TQLineEdit(this); m_browse = new KPushButton(KGuiItem(i18n("&Browse..."), "document-open"), this); m_usefilter = new TQCheckBox(i18n("Use co&mmand:"), this); - connect(m_browse, TQT_SIGNAL(clicked()), TQT_SLOT(slotBrowse())); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_line, TQT_SLOT(setDisabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_browse, TQT_SLOT(setDisabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_cmd, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_add, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_edit, TQT_SLOT(setEnabled(bool))); - connect(m_usefilter, TQT_SIGNAL(toggled(bool)), m_shortinfo, TQT_SLOT(setEnabled(bool))); - connect( m_usefilter, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotXmlCommandToggled( bool ) ) ); + connect(m_browse, TQ_SIGNAL(clicked()), TQ_SLOT(slotBrowse())); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_line, TQ_SLOT(setDisabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_browse, TQ_SLOT(setDisabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_cmd, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_add, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_edit, TQ_SLOT(setEnabled(bool))); + connect(m_usefilter, TQ_SIGNAL(toggled(bool)), m_shortinfo, TQ_SLOT(setEnabled(bool))); + connect( m_usefilter, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotXmlCommandToggled( bool ) ) ); m_usefilter->setChecked(true); m_usefilter->setChecked(false); //setFocusProxy(m_line); @@ -115,7 +115,7 @@ KXmlCommandSelector::KXmlCommandSelector(bool canBeNull, TQWidget *parent, const l3->addWidget(m_edit); if ( dlg ) - connect( this, TQT_SIGNAL( commandValid( bool ) ), dlg, TQT_SLOT( enableButtonOK( bool ) ) ); + connect( this, TQ_SIGNAL( commandValid( bool ) ), dlg, TQ_SLOT( enableButtonOK( bool ) ) ); loadCommands(); } diff --git a/tdeprint/management/networkscanner.cpp b/tdeprint/management/networkscanner.cpp index d97f66646..f9d7e585f 100644 --- a/tdeprint/management/networkscanner.cpp +++ b/tdeprint/management/networkscanner.cpp @@ -118,15 +118,15 @@ NetworkScanner::NetworkScanner( int port, TQWidget *parent, const char *name ) l0->addWidget( d->settings, 3, 0 ); l0->addWidget( d->scan, 3, 1 ); - connect( d->timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) ); - connect( d->settings, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSettingsClicked() ) ); - connect( d->scan, TQT_SIGNAL( clicked() ), TQT_SLOT( slotScanClicked() ) ); + connect( d->timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) ); + connect( d->settings, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSettingsClicked() ) ); + connect( d->scan, TQ_SIGNAL( clicked() ), TQ_SLOT( slotScanClicked() ) ); #ifdef USE_QSOCKET - connect( d->socket, TQT_SIGNAL( connected() ), TQT_SLOT( slotConnectionSuccess() ) ); - connect( d->socket, TQT_SIGNAL( error( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQ_SIGNAL( connected() ), TQ_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQ_SIGNAL( error( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); #else - connect( d->socket, TQT_SIGNAL( connectionSuccess() ), TQT_SLOT( slotConnectionSuccess() ) ); - connect( d->socket, TQT_SIGNAL( connectionFailed( int ) ), TQT_SLOT( slotConnectionFailed( int ) ) ); + connect( d->socket, TQ_SIGNAL( connectionSuccess() ), TQ_SLOT( slotConnectionSuccess() ) ); + connect( d->socket, TQ_SIGNAL( connectionFailed( int ) ), TQ_SLOT( slotConnectionFailed( int ) ) ); #endif } @@ -219,7 +219,7 @@ void NetworkScanner::next() else { d->bar->setProgress( d->currentaddress ); - TQTimer::singleShot( 0, this, TQT_SLOT( slotNext() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotNext() ) ); } } diff --git a/tdeprint/management/pluginaction.cpp b/tdeprint/management/pluginaction.cpp index 377a28217..3a19b6262 100644 --- a/tdeprint/management/pluginaction.cpp +++ b/tdeprint/management/pluginaction.cpp @@ -23,7 +23,7 @@ PluginAction::PluginAction(int ID, const TQString& txt, const TQString& icon, int accel, TQObject *parent, const char *name) : TDEAction(txt, icon, accel, parent, name), m_id(ID) { - connect(this, TQT_SIGNAL(activated()), TQT_SLOT(slotActivated())); + connect(this, TQ_SIGNAL(activated()), TQ_SLOT(slotActivated())); } void PluginAction::slotActivated() diff --git a/tdeprint/management/smbview.cpp b/tdeprint/management/smbview.cpp index f5977bfb0..0363c6338 100644 --- a/tdeprint/management/smbview.cpp +++ b/tdeprint/management/smbview.cpp @@ -52,9 +52,9 @@ SmbView::SmbView(TQWidget *parent, const char *name) m_proc = new TDEProcess(); m_proc->setUseShell(true); m_passwdFile = 0; - connect(m_proc,TQT_SIGNAL(processExited(TDEProcess*)),TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(m_proc,TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(this,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotSelectionChanged(TQListViewItem*))); + connect(m_proc,TQ_SIGNAL(processExited(TDEProcess*)),TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(m_proc,TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)),TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(this,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotSelectionChanged(TQListViewItem*))); } SmbView::~SmbView() diff --git a/tdeprint/marginvaluewidget.cpp b/tdeprint/marginvaluewidget.cpp index e4f1365c6..fc43b8bef 100644 --- a/tdeprint/marginvaluewidget.cpp +++ b/tdeprint/marginvaluewidget.cpp @@ -31,7 +31,7 @@ MarginValueWidget::MarginValueWidget(KNumInput *below, double value, TQWidget *p m_margin = ( float )value; setMode(m_mode); setRange(0, 999, 1, false); - connect(this, TQT_SIGNAL(valueChanged(double)), TQT_SLOT(slotValueChanged(double))); + connect(this, TQ_SIGNAL(valueChanged(double)), TQ_SLOT(slotValueChanged(double))); } float MarginValueWidget::margin() diff --git a/tdeprint/marginwidget.cpp b/tdeprint/marginwidget.cpp index f00b37b10..d46cd8e2f 100644 --- a/tdeprint/marginwidget.cpp +++ b/tdeprint/marginwidget.cpp @@ -169,25 +169,25 @@ MarginWidget::MarginWidget(TQWidget *parent, const char* name, bool allowMetricU m_units->insertItem( i18n( "Millimeters (mm)" ) ); } m_units->setCurrentItem(0); - connect(m_units, TQT_SIGNAL(activated(int)), m_top, TQT_SLOT(setMode(int))); - connect(m_units, TQT_SIGNAL(activated(int)), m_bottom, TQT_SLOT(setMode(int))); - connect(m_units, TQT_SIGNAL(activated(int)), m_left, TQT_SLOT(setMode(int))); - connect(m_units, TQT_SIGNAL(activated(int)), m_right, TQT_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_top, TQ_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_bottom, TQ_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_left, TQ_SLOT(setMode(int))); + connect(m_units, TQ_SIGNAL(activated(int)), m_right, TQ_SLOT(setMode(int))); m_preview = new MarginPreview(this); TQWhatsThis::add(m_preview, whatsThisDragAndPreviewMarginWidget); m_preview->setMinimumSize(60, 80); m_preview->setPageSize(m_pagesize[ 0 ], m_pagesize[ 1 ]); - connect(m_preview, TQT_SIGNAL(marginChanged(int,float)), TQT_SLOT(slotMarginPreviewChanged(int,float))); - connect(m_top, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); - connect(m_bottom, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); - connect(m_left, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); - connect(m_right, TQT_SIGNAL(marginChanged(float)), TQT_SLOT(slotMarginValueChanged())); + connect(m_preview, TQ_SIGNAL(marginChanged(int,float)), TQ_SLOT(slotMarginPreviewChanged(int,float))); + connect(m_top, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); + connect(m_bottom, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); + connect(m_left, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); + connect(m_right, TQ_SIGNAL(marginChanged(float)), TQ_SLOT(slotMarginValueChanged())); slotMarginValueChanged(); - connect(m_custom, TQT_SIGNAL(toggled(bool)), m_top, TQT_SLOT(setEnabled(bool))); - connect(m_custom, TQT_SIGNAL(toggled(bool)), m_left, TQT_SLOT(setEnabled(bool))); - //connect(m_custom, TQT_SIGNAL(toggled(bool)), m_units, TQT_SLOT(setEnabled(bool))); - connect(m_custom, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCustomMarginsToggled(bool))); - connect(m_custom, TQT_SIGNAL(toggled(bool)), m_preview, TQT_SLOT(enableRubberBand(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), m_top, TQ_SLOT(setEnabled(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), m_left, TQ_SLOT(setEnabled(bool))); + //connect(m_custom, TQ_SIGNAL(toggled(bool)), m_units, TQ_SLOT(setEnabled(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCustomMarginsToggled(bool))); + connect(m_custom, TQ_SIGNAL(toggled(bool)), m_preview, TQ_SLOT(enableRubberBand(bool))); m_top->setEnabled(false); m_bottom->setEnabled(false); m_left->setEnabled(false); @@ -237,8 +237,8 @@ void MarginWidget::setSymetricMargins(bool on) m_right->setEnabled(on && m_custom->isChecked()); if (on) { - connect(m_top, TQT_SIGNAL(marginChanged(float)), m_bottom, TQT_SLOT(setMargin(float))); - connect(m_left, TQT_SIGNAL(marginChanged(float)), m_right, TQT_SLOT(setMargin(float))); + connect(m_top, TQ_SIGNAL(marginChanged(float)), m_bottom, TQ_SLOT(setMargin(float))); + connect(m_left, TQ_SIGNAL(marginChanged(float)), m_right, TQ_SLOT(setMargin(float))); m_bottom->setMargin(m_top->margin()); m_right->setMargin(m_left->margin()); } diff --git a/tdeprint/messagewindow.cpp b/tdeprint/messagewindow.cpp index 7f642896e..ba3d69c8b 100644 --- a/tdeprint/messagewindow.cpp +++ b/tdeprint/messagewindow.cpp @@ -50,7 +50,7 @@ MessageWindow::MessageWindow( const TQString& txt, int delay, TQWidget *parent, if ( delay == 0 ) slotTimer(); else - TQTimer::singleShot( delay, this, TQT_SLOT( slotTimer() ) ); + TQTimer::singleShot( delay, this, TQ_SLOT( slotTimer() ) ); } MessageWindow::~MessageWindow() diff --git a/tdeprint/plugincombobox.cpp b/tdeprint/plugincombobox.cpp index b2a686f6e..22383ff98 100644 --- a/tdeprint/plugincombobox.cpp +++ b/tdeprint/plugincombobox.cpp @@ -63,7 +63,7 @@ PluginComboBox::PluginComboBox(TQWidget *parent, const char *name) m_pluginlist.append((*it).name); } - connect(m_combo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); + connect(m_combo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); configChanged(); } diff --git a/tdeprint/posterpreview.cpp b/tdeprint/posterpreview.cpp index 99f2e6a2b..2f7109477 100644 --- a/tdeprint/posterpreview.cpp +++ b/tdeprint/posterpreview.cpp @@ -54,8 +54,8 @@ PosterPreview::~PosterPreview() void PosterPreview::init() { m_process = new TDEProcess; - connect( m_process, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQT_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); - connect( m_process, TQT_SIGNAL( processExited( TDEProcess* ) ), TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( m_process, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), TQ_SLOT( slotProcessStderr( TDEProcess*, char*, int ) ) ); + connect( m_process, TQ_SIGNAL( processExited( TDEProcess* ) ), TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); m_cols = m_rows = m_pw = m_ph = m_mw = m_mh = 0; m_dirty = false; @@ -83,7 +83,7 @@ void PosterPreview::setDirty() if ( !m_dirty ) { m_dirty = true; - TQTimer::singleShot( 1, this, TQT_SLOT( updatePoster() ) ); + TQTimer::singleShot( 1, this, TQ_SLOT( updatePoster() ) ); } } diff --git a/tdeprint/rlpr/kmproxywidget.cpp b/tdeprint/rlpr/kmproxywidget.cpp index 1ca19fecd..38f914faf 100644 --- a/tdeprint/rlpr/kmproxywidget.cpp +++ b/tdeprint/rlpr/kmproxywidget.cpp @@ -41,8 +41,8 @@ KMProxyWidget::KMProxyWidget(TQWidget *parent, const char *name) m_hostlabel->setBuddy(m_proxyhost); m_portlabel->setBuddy(m_proxyport); - connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyhost,TQT_SLOT(setEnabled(bool))); - connect(m_useproxy,TQT_SIGNAL(toggled(bool)),m_proxyport,TQT_SLOT(setEnabled(bool))); + connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyhost,TQ_SLOT(setEnabled(bool))); + connect(m_useproxy,TQ_SIGNAL(toggled(bool)),m_proxyport,TQ_SLOT(setEnabled(bool))); m_proxyhost->setEnabled(false); m_proxyport->setEnabled(false); diff --git a/tdeprint/rlpr/kmwrlpr.cpp b/tdeprint/rlpr/kmwrlpr.cpp index 056cba1f0..1cb156342 100644 --- a/tdeprint/rlpr/kmwrlpr.cpp +++ b/tdeprint/rlpr/kmwrlpr.cpp @@ -63,7 +63,7 @@ KMWRlpr::KMWRlpr(TQWidget *parent, const char *name) TQLabel *m_queuelabel = new TQLabel(i18n("Queue:"), this); m_hostlabel->setBuddy(m_host); m_queuelabel->setBuddy(m_queue); - connect(m_view,TQT_SIGNAL(selectionChanged(TQListViewItem*)),TQT_SLOT(slotPrinterSelected(TQListViewItem*))); + connect(m_view,TQ_SIGNAL(selectionChanged(TQListViewItem*)),TQ_SLOT(slotPrinterSelected(TQListViewItem*))); TQHBoxLayout *lay0 = new TQHBoxLayout(this, 0, 10); TQVBoxLayout *lay1 = new TQVBoxLayout(0, 0, 5); diff --git a/tdeprint/tdefilelist.cpp b/tdeprint/tdefilelist.cpp index 311950e02..602329f33 100644 --- a/tdeprint/tdefilelist.cpp +++ b/tdeprint/tdefilelist.cpp @@ -107,38 +107,38 @@ KFileList::KFileList(TQWidget *parent, const char *name) m_files->setSelectionMode(TQListView::Extended); m_files->header()->setStretchEnabled(true, 2); TQWhatsThis::add(m_files, whatsThisFileSelectionListview); - connect(m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotSelectionChanged())); + connect(m_files, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotSelectionChanged())); m_add = new TQToolButton(this); m_add->setIconSet(SmallIconSet("document-open")); - connect(m_add, TQT_SIGNAL(clicked()), TQT_SLOT(slotAddFile())); + connect(m_add, TQ_SIGNAL(clicked()), TQ_SLOT(slotAddFile())); TQToolTip::add(m_add, i18n("Add file")); TQWhatsThis::add(m_add, whatsThisAddFileButton); m_remove = new TQToolButton(this); m_remove->setIconSet(SmallIconSet("remove")); - connect(m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveFile())); + connect(m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveFile())); TQToolTip::add(m_remove, i18n("Remove file")); TQWhatsThis::add(m_remove, whatsThisRemoveFileButton); m_remove->setEnabled(false); m_open = new TQToolButton(this); m_open->setIconSet(SmallIconSet("filefind")); - connect(m_open, TQT_SIGNAL(clicked()), TQT_SLOT(slotOpenFile())); + connect(m_open, TQ_SIGNAL(clicked()), TQ_SLOT(slotOpenFile())); TQToolTip::add(m_open, i18n("Open file")); TQWhatsThis::add(m_open, whatsThisOpenFileButton); m_open->setEnabled(false); m_up = new TQToolButton(this); m_up->setIconSet(SmallIconSet("go-up")); - connect(m_up, TQT_SIGNAL(clicked()), TQT_SLOT(slotUp())); + connect(m_up, TQ_SIGNAL(clicked()), TQ_SLOT(slotUp())); TQToolTip::add(m_up, i18n("Move up")); TQWhatsThis::add(m_up, whatsThisMoveFileUpButton); m_up->setEnabled(false); m_down = new TQToolButton(this); m_down->setIconSet(SmallIconSet("go-down")); - connect(m_down, TQT_SIGNAL(clicked()), TQT_SLOT(slotDown())); + connect(m_down, TQ_SIGNAL(clicked()), TQ_SLOT(slotDown())); TQToolTip::add(m_down, i18n("Move down")); TQWhatsThis::add(m_down, whatsThisMoveFileDownButton); m_down->setEnabled(false); diff --git a/tdeprint/tdeprintd.cpp b/tdeprint/tdeprintd.cpp index 754f67c3c..c3e1e474c 100644 --- a/tdeprint/tdeprintd.cpp +++ b/tdeprint/tdeprintd.cpp @@ -78,7 +78,7 @@ StatusWindow::StatusWindow(int pid) l0->addMultiCellWidget(m_label, 0, 0, 1, 2); l0->addWidget(m_button, 1, 2); l0->addMultiCellWidget(m_icon, 0, 1, 0, 0); - connect(m_button, TQT_SIGNAL(clicked()), TQT_SLOT(hide())); + connect(m_button, TQ_SIGNAL(clicked()), TQ_SLOT(hide())); resize(200, 50); } @@ -115,8 +115,8 @@ int KDEPrintd::print(const TQString& cmd, const TQStringList& files, bool remfla TQString command(cmd); TQRegExp re( "\\$out\\{([^}]*)\\}" ); - connect(proc,TQT_SIGNAL(printTerminated(KPrintProcess*)),TQT_SLOT(slotPrintTerminated(KPrintProcess*))); - connect(proc,TQT_SIGNAL(printError(KPrintProcess*,const TQString&)),TQT_SLOT(slotPrintError(KPrintProcess*,const TQString&))); + connect(proc,TQ_SIGNAL(printTerminated(KPrintProcess*)),TQ_SLOT(slotPrintTerminated(KPrintProcess*))); + connect(proc,TQ_SIGNAL(printError(KPrintProcess*,const TQString&)),TQ_SLOT(slotPrintError(KPrintProcess*,const TQString&))); proc->setCommand( command ); if ( re.search( command ) != -1 ) { @@ -200,7 +200,7 @@ void KDEPrintd::statusMessage(const TQString& msg, int pid, const TQString& appN w->setCaption(i18n("Printing Status - %1").arg("(pid="+TQString::number(pid)+")")); else w->setCaption(i18n("Printing Status - %1").arg(appName)); - connect(w, TQT_SIGNAL(destroyed()), TQT_SLOT(slotClosed())); + connect(w, TQ_SIGNAL(destroyed()), TQ_SLOT(slotClosed())); w->show(); m_windows.insert(pid, w); } @@ -242,7 +242,7 @@ TQString KDEPrintd::requestPassword( const TQString& user, const TQString& host, req->transaction = callingDcopClient()->beginTransaction(); m_requestsPending.append( req ); if ( m_requestsPending.count() == 1 ) - TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) ); return "::"; } @@ -291,7 +291,7 @@ void KDEPrintd::processRequest() m_requestsPending.remove( ( unsigned int )0 ); if ( m_requestsPending.count() > 0 ) - TQTimer::singleShot( 0, this, TQT_SLOT( processRequest() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( processRequest() ) ); } void KDEPrintd::initPassword( const TQString& user, const TQString& passwd, const TQString& host, int port ) diff --git a/tdeprint/tests/drawdemo.cpp b/tdeprint/tests/drawdemo.cpp index 3dce8cacc..8c44543d9 100644 --- a/tdeprint/tests/drawdemo.cpp +++ b/tdeprint/tests/drawdemo.cpp @@ -133,7 +133,7 @@ DrawView::DrawView() // Create a button group to contain all buttons bgroup = new TQButtonGroup( this ); bgroup->resize( 200, 200 ); - connect( bgroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(updateIt(int)) ); + connect( bgroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(updateIt(int)) ); // Calculate the size for the radio buttons int maxwidth = 80; @@ -164,7 +164,7 @@ DrawView::DrawView() print = new TQPushButton( "Print...", bgroup ); print->resize( 80, 30 ); print->move( maxwidth/2 - print->width()/2, maxindex*30+20 ); - connect( print, TQT_SIGNAL(clicked()), TQT_SLOT(printIt()) ); + connect( print, TQ_SIGNAL(clicked()), TQ_SLOT(printIt()) ); bgroup->resize( maxwidth, print->y()+print->height()+10 ); diff --git a/tdeprint/tests/helpwindow.cpp b/tdeprint/tests/helpwindow.cpp index 2f172acc0..c9188c25f 100644 --- a/tdeprint/tests/helpwindow.cpp +++ b/tdeprint/tests/helpwindow.cpp @@ -48,26 +48,26 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, browser = new TQTextBrowser( this ); browser->mimeSourceFactory()->setFilePath( _path ); browser->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - connect( browser, TQT_SIGNAL( textChanged() ), - this, TQT_SLOT( textChanged() ) ); + connect( browser, TQ_SIGNAL( textChanged() ), + this, TQ_SLOT( textChanged() ) ); setCentralWidget( browser ); if ( !home_.isEmpty() ) browser->setSource( home_ ); - connect( browser, TQT_SIGNAL( highlighted( const TQString&) ), - statusBar(), TQT_SLOT( message( const TQString&)) ); + connect( browser, TQ_SIGNAL( highlighted( const TQString&) ), + statusBar(), TQ_SLOT( message( const TQString&)) ); resize( 640,700 ); TQPopupMenu* file = new TQPopupMenu( this ); - file->insertItem( "&New Window", this, TQT_SLOT( newWindow() ), ALT | Key_N ); - file->insertItem( "&Open File", this, TQT_SLOT( openFile() ), ALT | Key_O ); - file->insertItem( "&Print", this, TQT_SLOT( print() ), ALT | Key_P ); + file->insertItem( "&New Window", this, TQ_SLOT( newWindow() ), ALT | Key_N ); + file->insertItem( "&Open File", this, TQ_SLOT( openFile() ), ALT | Key_O ); + file->insertItem( "&Print", this, TQ_SLOT( print() ), ALT | Key_P ); file->insertSeparator(); - file->insertItem( "&Close", this, TQT_SLOT( close() ), ALT | Key_Q ); - file->insertItem( "E&xit", tqApp, TQT_SLOT( closeAllWindows() ), ALT | Key_X ); + file->insertItem( "&Close", this, TQ_SLOT( close() ), ALT | Key_Q ); + file->insertItem( "E&xit", tqApp, TQ_SLOT( closeAllWindows() ), ALT | Key_X ); // The same three icons are used twice each. TQIconSet icon_back( TQPixmap("back.xpm") ); @@ -76,33 +76,33 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, TQPopupMenu* go = new TQPopupMenu( this ); backwardId = go->insertItem( icon_back, - "&Backward", browser, TQT_SLOT( backward() ), + "&Backward", browser, TQ_SLOT( backward() ), ALT | Key_Left ); forwardId = go->insertItem( icon_forward, - "&Forward", browser, TQT_SLOT( forward() ), + "&Forward", browser, TQ_SLOT( forward() ), ALT | Key_Right ); - go->insertItem( icon_home, "&Home", browser, TQT_SLOT( home() ) ); + go->insertItem( icon_home, "&Home", browser, TQ_SLOT( home() ) ); TQPopupMenu* help = new TQPopupMenu( this ); - help->insertItem( "&About ...", this, TQT_SLOT( about() ) ); - help->insertItem( "About &Qt ...", this, TQT_SLOT( aboutQt() ) ); + help->insertItem( "&About ...", this, TQ_SLOT( about() ) ); + help->insertItem( "About &Qt ...", this, TQ_SLOT( aboutQt() ) ); hist = new TQPopupMenu( this ); TQStringList::Iterator it = history.begin(); for ( ; it != history.end(); ++it ) mHistory[ hist->insertItem( *it ) ] = *it; - connect( hist, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( histChosen( int ) ) ); + connect( hist, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( histChosen( int ) ) ); bookm = new TQPopupMenu( this ); - bookm->insertItem( tr( "Add Bookmark" ), this, TQT_SLOT( addBookmark() ) ); + bookm->insertItem( tr( "Add Bookmark" ), this, TQ_SLOT( addBookmark() ) ); bookm->insertSeparator(); TQStringList::Iterator it2 = bookmarks.begin(); for ( ; it2 != bookmarks.end(); ++it2 ) mBookmarks[ bookm->insertItem( *it2 ) ] = *it2; - connect( bookm, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( bookmChosen( int ) ) ); + connect( bookm, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( bookmChosen( int ) ) ); menuBar()->insertItem( tr("&File"), file ); menuBar()->insertItem( tr("&Go"), go ); @@ -113,29 +113,29 @@ HelpWindow::HelpWindow( const TQString& home_, const TQString& _path, menuBar()->setItemEnabled( forwardId, false); menuBar()->setItemEnabled( backwardId, false); - connect( browser, TQT_SIGNAL( backwardAvailable( bool ) ), - this, TQT_SLOT( setBackwardAvailable( bool ) ) ); - connect( browser, TQT_SIGNAL( forwardAvailable( bool ) ), - this, TQT_SLOT( setForwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( backwardAvailable( bool ) ), + this, TQ_SLOT( setBackwardAvailable( bool ) ) ); + connect( browser, TQ_SIGNAL( forwardAvailable( bool ) ), + this, TQ_SLOT( setForwardAvailable( bool ) ) ); TQToolBar* toolbar = new TQToolBar( this ); addToolBar( toolbar, "Toolbar"); TQToolButton* button; - button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQT_SLOT(backward()), toolbar ); - connect( browser, TQT_SIGNAL( backwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_back, tr("Backward"), "", browser, TQ_SLOT(backward()), toolbar ); + connect( browser, TQ_SIGNAL( backwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( false ); - button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQT_SLOT(forward()), toolbar ); - connect( browser, TQT_SIGNAL( forwardAvailable(bool) ), button, TQT_SLOT( setEnabled(bool) ) ); + button = new TQToolButton( icon_forward, tr("Forward"), "", browser, TQ_SLOT(forward()), toolbar ); + connect( browser, TQ_SIGNAL( forwardAvailable(bool) ), button, TQ_SLOT( setEnabled(bool) ) ); button->setEnabled( false ); - button = new TQToolButton( icon_home, tr("Home"), "", browser, TQT_SLOT(home()), toolbar ); + button = new TQToolButton( icon_home, tr("Home"), "", browser, TQ_SLOT(home()), toolbar ); toolbar->addSeparator(); pathCombo = new TQComboBox( true, toolbar ); - connect( pathCombo, TQT_SIGNAL( activated( const TQString & ) ), - this, TQT_SLOT( pathSelected( const TQString & ) ) ); + connect( pathCombo, TQ_SIGNAL( activated( const TQString & ) ), + this, TQ_SLOT( pathSelected( const TQString & ) ) ); toolbar->setStretchableWidget( pathCombo ); setRightJustification( true ); setDockEnabled( DockLeft, false ); diff --git a/tdeprint/tests/main.cpp b/tdeprint/tests/main.cpp index c91cd23a7..0405fafe3 100644 --- a/tdeprint/tests/main.cpp +++ b/tdeprint/tests/main.cpp @@ -34,8 +34,8 @@ int main( int argc, char ** argv ) else help->showMaximized(); - TQObject::connect( &a, TQT_SIGNAL(lastWindowClosed()), - &a, TQT_SLOT(quit()) ); + TQObject::connect( &a, TQ_SIGNAL(lastWindowClosed()), + &a, TQ_SLOT(quit()) ); return a.exec(); } diff --git a/tdeprint/tools/escputil/escpwidget.cpp b/tdeprint/tools/escputil/escpwidget.cpp index f1584bbe3..8ba04447a 100644 --- a/tdeprint/tools/escputil/escpwidget.cpp +++ b/tdeprint/tools/escputil/escpwidget.cpp @@ -67,9 +67,9 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) { m_hasoutput = false; - connect(&m_proc, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(&m_proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); - connect(&m_proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQT_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(&m_proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStdout(TDEProcess*,char*,int))); + connect(&m_proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), TQ_SLOT(slotReceivedStderr(TDEProcess*,char*,int))); TQPushButton *cleanbtn = new TQPushButton(this, "-c"); cleanbtn->setPixmap(DesktopIcon("application-x-executable")); @@ -90,11 +90,11 @@ EscpWidget::EscpWidget(TQWidget *parent, const char *name) m_device->setFont(f); m_useraw = new TQCheckBox(i18n("&Use direct connection (might need root permissions)"), this); - connect(cleanbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(nozzlebtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(alignbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(inkbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); - connect(identbtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotButtonClicked())); + connect(cleanbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(nozzlebtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(alignbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(inkbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); + connect(identbtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotButtonClicked())); TQLabel *printerlab = new TQLabel(i18n("Printer:"), this); printerlab->setAlignment(AlignRight|AlignVCenter); diff --git a/tderandr/ktimerdialog.cpp b/tderandr/ktimerdialog.cpp index ed59dac97..766d4ae50 100644 --- a/tderandr/ktimerdialog.cpp +++ b/tderandr/ktimerdialog.cpp @@ -56,8 +56,8 @@ KTimerDialog::KTimerDialog( int msec, TimerStyle style, TQWidget *parent, if ( buttonMask & Cancel ) buttonOnTimeout = Cancel; - connect( totalTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotInternalTimeout() ) ); - connect( updateTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotUpdateTime() ) ); + connect( totalTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotInternalTimeout() ) ); + connect( updateTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotUpdateTime() ) ); // create the widgets mainWidget = new TQVBox( this, "mainWidget" ); diff --git a/tderandr/randr.cpp b/tderandr/randr.cpp index d00641154..412e4d195 100644 --- a/tderandr/randr.cpp +++ b/tderandr/randr.cpp @@ -274,8 +274,8 @@ KDE_EXPORT bool RandRScreen::confirm() KDialog::centerOnScreen(&acceptDialog, m_screen); m_shownDialog = &acceptDialog; - connect( m_shownDialog, TQT_SIGNAL( destroyed()), this, TQT_SLOT( shownDialogDestroyed())); - connect( kapp->desktop(), TQT_SIGNAL( resized(int)), this, TQT_SLOT( desktopResized())); + connect( m_shownDialog, TQ_SIGNAL( destroyed()), this, TQ_SLOT( shownDialogDestroyed())); + connect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized())); return acceptDialog.exec(); } @@ -283,7 +283,7 @@ KDE_EXPORT bool RandRScreen::confirm() KDE_EXPORT void RandRScreen::shownDialogDestroyed() { m_shownDialog = NULL; - disconnect( kapp->desktop(), TQT_SIGNAL( resized(int)), this, TQT_SLOT( desktopResized())); + disconnect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized())); } KDE_EXPORT void RandRScreen::desktopResized() @@ -866,8 +866,8 @@ KDE_EXPORT bool RandRScreen::showTestConfigurationDialog() KDialog::centerOnScreen(&acceptDialog, 0); m_shownDialog = &acceptDialog; - connect( m_shownDialog, TQT_SIGNAL( destroyed()), this, TQT_SLOT( shownDialogDestroyed())); - connect( kapp->desktop(), TQT_SIGNAL( resized(int)), this, TQT_SLOT( desktopResized())); + connect( m_shownDialog, TQ_SIGNAL( destroyed()), this, TQ_SLOT( shownDialogDestroyed())); + connect( kapp->desktop(), TQ_SIGNAL( resized(int)), this, TQ_SLOT( desktopResized())); return acceptDialog.exec(); } diff --git a/tderesources/configdialog.cpp b/tderesources/configdialog.cpp index 932996e65..a2520380b 100644 --- a/tderesources/configdialog.cpp +++ b/tderesources/configdialog.cpp @@ -74,12 +74,12 @@ ConfigDialog::ConfigDialog( TQWidget *parent, const TQString& resourceFamily, mConfigWidget->setInEditMode( false ); mConfigWidget->loadSettings( mResource ); mConfigWidget->show(); - connect( mConfigWidget, TQT_SIGNAL( setReadOnly( bool ) ), - TQT_SLOT( setReadOnly( bool ) ) ); + connect( mConfigWidget, TQ_SIGNAL( setReadOnly( bool ) ), + TQ_SLOT( setReadOnly( bool ) ) ); } - connect( mName, TQT_SIGNAL( textChanged(const TQString &)), - TQT_SLOT( slotNameChanged(const TQString &))); + connect( mName, TQ_SIGNAL( textChanged(const TQString &)), + TQ_SLOT( slotNameChanged(const TQString &))); slotNameChanged( mName->text() ); setMinimumSize( sizeHint() ); diff --git a/tderesources/configpage.cpp b/tderesources/configpage.cpp index 50173beae..8b1443168 100644 --- a/tderesources/configpage.cpp +++ b/tderesources/configpage.cpp @@ -121,14 +121,14 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) mListView->addColumn( i18n( "Standard" ) ); groupBoxLayout->addWidget( mListView, 1, 0 ); - connect( mListView, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( slotEdit() ) ); + connect( mListView, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int ) ), this, TQ_SLOT( slotEdit() ) ); KButtonBox *buttonBox = new KButtonBox( groupBox, TQt::Vertical ); - mAddButton = buttonBox->addButton( i18n( "&Add..." ), this, TQT_SLOT(slotAdd()) ); - mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQT_SLOT(slotRemove()) ); + mAddButton = buttonBox->addButton( i18n( "&Add..." ), this, TQ_SLOT(slotAdd()) ); + mRemoveButton = buttonBox->addButton( i18n( "&Remove" ), this, TQ_SLOT(slotRemove()) ); mRemoveButton->setEnabled( false ); - mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQT_SLOT(slotEdit()) ); + mEditButton = buttonBox->addButton( i18n( "&Edit..." ), this, TQ_SLOT(slotEdit()) ); mEditButton->setEnabled( false ); - mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, TQT_SLOT(slotStandard()) ); + mStandardButton = buttonBox->addButton( i18n( "&Use as Standard" ), this, TQ_SLOT(slotStandard()) ); mStandardButton->setEnabled( false ); buttonBox->layout(); @@ -136,12 +136,12 @@ ConfigPage::ConfigPage( TQWidget *parent, const char *name ) mainLayout->addWidget( groupBox ); - connect( mFamilyCombo, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotFamilyChanged( int ) ) ); - connect( mListView, TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( slotSelectionChanged() ) ); - connect( mListView, TQT_SIGNAL( clicked( TQListViewItem * ) ), - TQT_SLOT( slotItemClicked( TQListViewItem * ) ) ); + connect( mFamilyCombo, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotFamilyChanged( int ) ) ); + connect( mListView, TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( slotSelectionChanged() ) ); + connect( mListView, TQ_SIGNAL( clicked( TQListViewItem * ) ), + TQ_SLOT( slotItemClicked( TQListViewItem * ) ) ); mLastItem = 0; diff --git a/tderesources/kcmtderesources.cpp b/tderesources/kcmtderesources.cpp index 60eda28b2..a5c8cdc2e 100644 --- a/tderesources/kcmtderesources.cpp +++ b/tderesources/kcmtderesources.cpp @@ -38,7 +38,7 @@ KCMTDEResources::KCMTDEResources( TQWidget *parent, const char *name, const TQSt TQVBoxLayout *layout = new TQVBoxLayout( this ); mConfigPage = new KRES::ConfigPage( this ); layout->addWidget( mConfigPage ); - connect( mConfigPage, TQT_SIGNAL( changed( bool ) ), TQT_SIGNAL( changed( bool ) ) ); + connect( mConfigPage, TQ_SIGNAL( changed( bool ) ), TQ_SIGNAL( changed( bool ) ) ); setButtons( Help | Apply ); TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmtderesources" ), diff --git a/tderesources/selectdialog.cpp b/tderesources/selectdialog.cpp index 55adffcb1..baba01039 100644 --- a/tderesources/selectdialog.cpp +++ b/tderesources/selectdialog.cpp @@ -57,8 +57,8 @@ SelectDialog::SelectDialog( TQPtrList list, TQWidget *parent, KButtonBox *buttonBox = new KButtonBox( this ); buttonBox->addStretch(); - buttonBox->addButton( KStdGuiItem::ok(), this, TQT_SLOT( accept() ) ); - buttonBox->addButton( KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) ); + buttonBox->addButton( KStdGuiItem::ok(), this, TQ_SLOT( accept() ) ); + buttonBox->addButton( KStdGuiItem::cancel(), this, TQ_SLOT( reject() ) ); buttonBox->layout(); mainLayout->addWidget( buttonBox ); @@ -75,10 +75,10 @@ SelectDialog::SelectDialog( TQPtrList list, TQWidget *parent, } mResourceId->setCurrentItem( 0 ); - connect( mResourceId, TQT_SIGNAL(returnPressed(TQListBoxItem*)), - TQT_SLOT(accept()) ); - connect( mResourceId, TQT_SIGNAL( executed( TQListBoxItem* ) ), - TQT_SLOT( accept() ) ); + connect( mResourceId, TQ_SIGNAL(returnPressed(TQListBoxItem*)), + TQ_SLOT(accept()) ); + connect( mResourceId, TQ_SIGNAL( executed( TQListBoxItem* ) ), + TQ_SLOT( accept() ) ); } Resource *SelectDialog::resource() diff --git a/tdersync/tdersync.cpp b/tdersync/tdersync.cpp index 7ffa150d0..828b4ce71 100644 --- a/tdersync/tdersync.cpp +++ b/tdersync/tdersync.cpp @@ -479,7 +479,7 @@ KDE_EXPORT int KRsync::establishConnectionRsync(char *buffer, TDEIO::fileoffset_ m_progressDialog->setAutoClose(true); m_progressDialog->progressBar()->setTotalSteps(2); m_progressDialog->progressBar()->setValue(1); - connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotRsyncCancelled())); + connect (m_progressDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotRsyncCancelled())); if (m_bInSpecialSync) m_progressDialog->move(0,0); m_progressDialog->show(); m_progressDialogExists = true; @@ -602,7 +602,7 @@ KDE_EXPORT int KRsync::establishConnectionUnison(char *buffer, TDEIO::fileoffset m_progressDialog->progressBar()->setFormat("%v / %m"); m_progressDialog->progressBar()->setTotalSteps(0); m_progressDialog->setAutoClose(true); - connect (m_progressDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotUnisonCancelled())); + connect (m_progressDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotUnisonCancelled())); if (m_bInSpecialSync) m_progressDialog->move(0,0); m_progressDialog->show(); m_progressDialogExists = true; @@ -977,8 +977,8 @@ KDE_EXPORT void KRsync::slotSetup() m_configDialog->show(); - connect (m_configDialog, TQT_SIGNAL(okClicked()), TQT_SLOT(slotSetupOK())); - connect (m_configDialog, TQT_SIGNAL(cancelClicked()), TQT_SLOT(slotSetupCancelled())); + connect (m_configDialog, TQ_SIGNAL(okClicked()), TQ_SLOT(slotSetupOK())); + connect (m_configDialog, TQ_SIGNAL(cancelClicked()), TQ_SLOT(slotSetupCancelled())); } KDE_EXPORT void KRsync::slotSetupOK() diff --git a/tdespell2/backgroundchecker.cpp b/tdespell2/backgroundchecker.cpp index 799edf120..954ad8f64 100644 --- a/tdespell2/backgroundchecker.cpp +++ b/tdespell2/backgroundchecker.cpp @@ -46,10 +46,10 @@ BackgroundChecker::BackgroundChecker( const Broker::Ptr& broker, TQObject* paren //d->thread.setBroker( broker ); d->engine = new BackgroundEngine( this ); d->engine->setBroker( broker ); - connect( d->engine, TQT_SIGNAL(misspelling( const TQString&, int )), - TQT_SIGNAL(misspelling( const TQString&, int )) ); - connect( d->engine, TQT_SIGNAL(done()), - TQT_SLOT(slotEngineDone()) ); + connect( d->engine, TQ_SIGNAL(misspelling( const TQString&, int )), + TQ_SIGNAL(misspelling( const TQString&, int )) ); + connect( d->engine, TQ_SIGNAL(done()), + TQ_SLOT(slotEngineDone()) ); } BackgroundChecker::~BackgroundChecker() diff --git a/tdespell2/backgroundengine.cpp b/tdespell2/backgroundengine.cpp index 9eafe1b2e..21ab03478 100644 --- a/tdespell2/backgroundengine.cpp +++ b/tdespell2/backgroundengine.cpp @@ -87,7 +87,7 @@ void BackgroundEngine::setFilter( Filter *filter ) void BackgroundEngine::start() { - TQTimer::singleShot( 0, this, TQT_SLOT(checkNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(checkNext()) ); } void BackgroundEngine::stop() @@ -96,7 +96,7 @@ void BackgroundEngine::stop() void BackgroundEngine::continueChecking() { - TQTimer::singleShot( 0, this, TQT_SLOT(checkNext()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(checkNext()) ); } void BackgroundEngine::checkNext() diff --git a/tdespell2/defaultdictionary.cpp b/tdespell2/defaultdictionary.cpp index 39b80e7cf..d501012fd 100644 --- a/tdespell2/defaultdictionary.cpp +++ b/tdespell2/defaultdictionary.cpp @@ -39,8 +39,8 @@ DefaultDictionary::DefaultDictionary( const TQString& lang, Broker *broker ) d = new Private; d->dict = broker->dictionary(); d->broker = broker; - connect( broker, TQT_SIGNAL(configurationChanged()), - TQT_SLOT(defaultConfigurationChanged()) ); + connect( broker, TQ_SIGNAL(configurationChanged()), + TQ_SLOT(defaultConfigurationChanged()) ); } DefaultDictionary::~DefaultDictionary() diff --git a/tdespell2/tests/backgroundtest.cpp b/tdespell2/tests/backgroundtest.cpp index 92c7e7792..79ba20331 100644 --- a/tdespell2/tests/backgroundtest.cpp +++ b/tdespell2/tests/backgroundtest.cpp @@ -134,10 +134,10 @@ BackgroundTest::BackgroundTest() : TQObject( 0 ) { m_checker = new BackgroundChecker( Broker::openBroker(), this ); - connect( m_checker, TQT_SIGNAL(done()), - TQT_SLOT(slotDone()) ); - connect( m_checker, TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SLOT(slotMisspelling(const TQString&, int)) ); + connect( m_checker, TQ_SIGNAL(done()), + TQ_SLOT(slotDone()) ); + connect( m_checker, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SLOT(slotMisspelling(const TQString&, int)) ); m_len = strlen( text ); m_checker->checkText( text ); m_timer.start(); diff --git a/tdespell2/tests/test_dialog.cpp b/tdespell2/tests/test_dialog.cpp index d6441bde6..a84aeaf30 100644 --- a/tdespell2/tests/test_dialog.cpp +++ b/tdespell2/tests/test_dialog.cpp @@ -40,8 +40,8 @@ void TestDialog::check( const TQString& buffer ) KSpell2::Dialog *dlg = new KSpell2::Dialog( new BackgroundChecker( Broker::openBroker(), this, "checker" ), 0, "my dialog" ); - connect( dlg, TQT_SIGNAL(done(const TQString&)), - TQT_SLOT(doneChecking(const TQString&)) ); + connect( dlg, TQ_SIGNAL(done(const TQString&)), + TQ_SLOT(doneChecking(const TQString&)) ); dlg->setBuffer( buffer ); dlg->show(); } diff --git a/tdespell2/ui/configwidget.cpp b/tdespell2/ui/configwidget.cpp index 2317f7307..8efaddb04 100644 --- a/tdespell2/ui/configwidget.cpp +++ b/tdespell2/ui/configwidget.cpp @@ -71,7 +71,7 @@ void ConfigWidget::init( Broker *broker ) d->ui->m_ignoreListBox->insertStringList( ignoreList ); d->ui->m_bgSpellCB->setChecked( d->broker->settings()->backgroundCheckerEnabled() ); d->ui->m_bgSpellCB->hide();//hidden by default - connect( d->ui->m_ignoreListBox, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) ); + connect( d->ui->m_ignoreListBox, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) ); layout->addWidget( d->ui ); } diff --git a/tdespell2/ui/dialog.cpp b/tdespell2/ui/dialog.cpp index a47c7664b..9eb592a5c 100644 --- a/tdespell2/ui/dialog.cpp +++ b/tdespell2/ui/dialog.cpp @@ -79,35 +79,35 @@ Dialog::~Dialog() void Dialog::initConnections() { - connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAddWord()) ); - connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()), - TQT_SLOT(slotReplaceWord()) ); - connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()), - TQT_SLOT(slotReplaceAll()) ); - connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSkip()) ); - connect( d->ui->m_skipAllBtn, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSkipAll()) ); - connect( d->ui->m_suggestBtn, TQT_SIGNAL(clicked()), - TQT_SLOT(slotSuggest()) ); - connect( d->ui->m_language, TQT_SIGNAL(activated(const TQString&)), - TQT_SLOT(slotChangeLanguage(const TQString&)) ); - connect( d->ui->m_suggestions, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( d->checker, TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SIGNAL(misspelling(const TQString&, int)) ); - connect( d->checker, TQT_SIGNAL(misspelling(const TQString&, int)), - TQT_SLOT(slotMisspelling(const TQString&, int)) ); - connect( d->checker, TQT_SIGNAL(done()), - TQT_SLOT(slotDone()) ); - connect( d->ui->m_suggestions, TQT_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), - TQT_SLOT( slotReplaceWord() ) ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotFinished()) ); - connect( this, TQT_SIGNAL(cancelClicked()),this, TQT_SLOT(slotCancel()) ); - connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()), this, TQT_SLOT(slotReplaceWord()) ); - connect( d->ui->m_autoCorrect, TQT_SIGNAL(clicked()), - TQT_SLOT(slotAutocorrect()) ); + connect( d->ui->m_addBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAddWord()) ); + connect( d->ui->m_replaceBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotReplaceWord()) ); + connect( d->ui->m_replaceAllBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotReplaceAll()) ); + connect( d->ui->m_skipBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSkip()) ); + connect( d->ui->m_skipAllBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSkipAll()) ); + connect( d->ui->m_suggestBtn, TQ_SIGNAL(clicked()), + TQ_SLOT(slotSuggest()) ); + connect( d->ui->m_language, TQ_SIGNAL(activated(const TQString&)), + TQ_SLOT(slotChangeLanguage(const TQString&)) ); + connect( d->ui->m_suggestions, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->checker, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SIGNAL(misspelling(const TQString&, int)) ); + connect( d->checker, TQ_SIGNAL(misspelling(const TQString&, int)), + TQ_SLOT(slotMisspelling(const TQString&, int)) ); + connect( d->checker, TQ_SIGNAL(done()), + TQ_SLOT(slotDone()) ); + connect( d->ui->m_suggestions, TQ_SIGNAL(doubleClicked(TQListViewItem*, const TQPoint&, int)), + TQ_SLOT( slotReplaceWord() ) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotFinished()) ); + connect( this, TQ_SIGNAL(cancelClicked()),this, TQ_SLOT(slotCancel()) ); + connect( d->ui->m_replacement, TQ_SIGNAL(returnPressed()), this, TQ_SLOT(slotReplaceWord()) ); + connect( d->ui->m_autoCorrect, TQ_SIGNAL(clicked()), + TQ_SLOT(slotAutocorrect()) ); // button use by kword/kpresenter // hide by default d->ui->m_autoCorrect->hide(); diff --git a/tdespell2/ui/highlighter.cpp b/tdespell2/ui/highlighter.cpp index 9af6a6725..080737dae 100644 --- a/tdespell2/ui/highlighter.cpp +++ b/tdespell2/ui/highlighter.cpp @@ -87,7 +87,7 @@ int Highlighter::highlightParagraph( const TQString& text, w = d->filter->nextWord(); } } - //TQTimer::singleShot( 0, this, TQT_SLOT(checkWords()) ); + //TQTimer::singleShot( 0, this, TQ_SLOT(checkWords()) ); return 0; } diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp index ab6123fb4..768bceb05 100644 --- a/tdestyles/asteroid/asteroid.cpp +++ b/tdestyles/asteroid/asteroid.cpp @@ -83,7 +83,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin); AsteroidStyle::AsteroidStyle() : TDEStyle(AllowMenuTransparency) { if (tqApp->inherits("TDEApplication")) { - connect(tqApp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(tqApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); } backwards = TQApplication::reverseLayout(); diff --git a/tdestyles/highcontrast/config/highcontrastconfig.cpp b/tdestyles/highcontrast/config/highcontrastconfig.cpp index 8d8df0e79..a570a6eab 100644 --- a/tdestyles/highcontrast/config/highcontrastconfig.cpp +++ b/tdestyles/highcontrast/config/highcontrastconfig.cpp @@ -57,7 +57,7 @@ HighContrastStyleConfig::HighContrastStyleConfig( "/highcontraststyle/Settings/wideLines", false); wideLinesBox->setChecked(originalWideLinesState); - connect(wideLinesBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateChanged())); + connect(wideLinesBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateChanged())); } HighContrastStyleConfig::~HighContrastStyleConfig() diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index 5de219b4b..787f71385 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -290,7 +290,7 @@ KeramikStyle::KeramikStyle() if (animateProgressBar) { animationTimer = new TQTimer( this ); - connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) ); + connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) ); } firstComboPopupRelease = false; @@ -373,7 +373,7 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen { installObjectEventHandler(ceData, elementFlags, ptr, this); progAnimWidgets[static_cast(widget)] = 0; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*))); if (!animationTimer->isActive()) animationTimer->start( 50, false ); } diff --git a/tdestyles/kthemestyle/kthemebase.cpp b/tdestyles/kthemestyle/kthemebase.cpp index 5f5e7f9a6..d9539c096 100644 --- a/tdestyles/kthemestyle/kthemebase.cpp +++ b/tdestyles/kthemestyle/kthemebase.cpp @@ -1738,7 +1738,7 @@ KThemeCache::KThemeCache( int maxSize, TQObject *parent, const char *name ) cache.setMaxCost( maxSize * 1024 ); cache.setAutoDelete( true ); flushTimer.start( 300000 ); // 5 minutes - connect( &flushTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( flushTimeout() ) ); + connect( &flushTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( flushTimeout() ) ); } void KThemeCache::flushTimeout() diff --git a/tdestyles/plastik/config/plastikconf.cpp b/tdestyles/plastik/config/plastikconf.cpp index 4900f708e..35dd2a1b2 100644 --- a/tdestyles/plastik/config/plastikconf.cpp +++ b/tdestyles/plastik/config/plastikconf.cpp @@ -118,19 +118,19 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent) origCheckMarkColor = s.readEntry("/plastikstyle/Settings/checkMarkColor", "black"); checkMarkColor->setColor(origCheckMarkColor); -// connect(scrollBarLines, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(drawToolBarSeparator, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(drawToolBarItemSeparator, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); -// connect(drawFocusRect, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(drawTriangularExpander, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(inputFocusHighlight, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(customOverHighlightColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(overHighlightColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) ); - connect(customFocusHighlightColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(focusHighlightColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) ); - connect(customCheckMarkColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(checkMarkColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) ); +// connect(scrollBarLines, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(drawToolBarSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(drawToolBarItemSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); +// connect(drawFocusRect, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(drawTriangularExpander, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(inputFocusHighlight, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(customOverHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(overHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) ); + connect(customFocusHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(focusHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) ); + connect(customCheckMarkColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(checkMarkColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) ); if ( customOverHighlightColor->isChecked() ) overHighlightColor->setEnabled(true); else diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index 29e724418..5ff3b8619 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -184,7 +184,7 @@ PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrol if ( _animateProgressBar ) { animationTimer = new TQTimer( this ); - connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) ); + connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) ); } } @@ -242,7 +242,7 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? tdehtmlWidgets[widget] = true; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(tdehtmlWidgetDestroyed(TQObject*))); } // use tqt_cast where possible to check if the widget inheits one of the classes. might improve @@ -269,7 +269,7 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen { installObjectEventHandler(ceData, elementFlags, ptr, this); progAnimWidgets[widget] = 0; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*))); if (!animationTimer->isActive()) animationTimer->start( 50, false ); } diff --git a/tdeui/kactivelabel.cpp b/tdeui/kactivelabel.cpp index 92355b1ba..429962878 100644 --- a/tdeui/kactivelabel.cpp +++ b/tdeui/kactivelabel.cpp @@ -47,12 +47,12 @@ void KActiveLabel::init() setFocusPolicy( TQWidget::TabFocus ); paletteChanged(); - connect(this, TQT_SIGNAL(linkClicked(const TQString &)), - this, TQT_SLOT(openLink(const TQString &))); + connect(this, TQ_SIGNAL(linkClicked(const TQString &)), + this, TQ_SLOT(openLink(const TQString &))); if (kapp) { - connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), - this, TQT_SLOT(paletteChanged())); + connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), + this, TQ_SLOT(paletteChanged())); } } diff --git a/tdeui/kanimwidget.cpp b/tdeui/kanimwidget.cpp index a730f179e..25a0b6847 100644 --- a/tdeui/kanimwidget.cpp +++ b/tdeui/kanimwidget.cpp @@ -43,10 +43,10 @@ KAnimWidget::KAnimWidget( const TQString& icons, int size, TQWidget *parent, : TQFrame( parent, name ), d( new KAnimWidgetPrivate ) { - connect( &d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimerUpdate())); + connect( &d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimerUpdate())); if (parent && parent->inherits( "TDEToolBar" )) - connect(parent, TQT_SIGNAL(modechange()), this, TQT_SLOT(updateIcons())); + connect(parent, TQ_SIGNAL(modechange()), this, TQ_SLOT(updateIcons())); d->loadingCompleted = false; d->size = size; diff --git a/tdeui/kbugreport.cpp b/tdeui/kbugreport.cpp index 874aee4d4..dca2efc46 100644 --- a/tdeui/kbugreport.cpp +++ b/tdeui/kbugreport.cpp @@ -120,8 +120,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou // Configure email button m_configureEmail = new TQPushButton( i18n("Configure Email..."), parent ); - connect( m_configureEmail, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotConfigureEmail() ) ); + connect( m_configureEmail, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotConfigureEmail() ) ); glay->addMultiCellWidget( m_configureEmail, 0, 2, 2, 2, TQt::AlignTop|TQt::AlignRight ); // To @@ -152,7 +152,7 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou d->appcombo = new KComboBox( false, parent, "app"); TQWhatsThis::add( d->appcombo, qwtstr ); d->appcombo->insertStrList((const char**)packages); - connect(d->appcombo, TQT_SIGNAL(activated(int)), TQT_SLOT(appChanged(int))); + connect(d->appcombo, TQ_SIGNAL(activated(int)), TQ_SLOT(appChanged(int))); d->appname = TQString::fromLatin1( m_aboutData ? m_aboutData->productName() : tqApp->name() ); @@ -272,8 +272,8 @@ KBugReport::KBugReport( TQWidget * parentw, bool modal, const TDEAboutData *abou lay->addWidget( d->submitBugButton ); lay->addSpacing(10); - connect( d->submitBugButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotOk())); + connect( d->submitBugButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotOk())); } } @@ -321,7 +321,7 @@ void KBugReport::slotConfigureEmail() if (m_process) return; m_process = new TDEProcess; *m_process << TQString::fromLatin1("tdecmshell") << TQString::fromLatin1("kcm_useraccount"); - connect(m_process, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(slotSetFrom())); + connect(m_process, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(slotSetFrom())); if (!m_process->start()) { kdDebug() << "Couldn't start tdecmshell.." << endl; diff --git a/tdeui/kbuttonbox.cpp b/tdeui/kbuttonbox.cpp index a1f107996..54329412e 100644 --- a/tdeui/kbuttonbox.cpp +++ b/tdeui/kbuttonbox.cpp @@ -130,7 +130,7 @@ KButtonBox::addButton( TQPushButton * pb = addButton(text, noexpand); if ((0 != receiver) && (0 != slot)) - TQObject::connect(pb, TQT_SIGNAL(clicked()), receiver, slot); + TQObject::connect(pb, TQ_SIGNAL(clicked()), receiver, slot); return pb; } @@ -146,7 +146,7 @@ KButtonBox::addButton( TQPushButton * pb = addButton(guiitem, noexpand); if ((0 != receiver) && (0 != slot)) - TQObject::connect(pb, TQT_SIGNAL(clicked()), receiver, slot); + TQObject::connect(pb, TQ_SIGNAL(clicked()), receiver, slot); return pb; } diff --git a/tdeui/kcharselect.cpp b/tdeui/kcharselect.cpp index 485c5e06e..064e905d2 100644 --- a/tdeui/kcharselect.cpp +++ b/tdeui/kcharselect.cpp @@ -389,7 +389,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f fillFontCombo(); fontCombo->resize( fontCombo->sizeHint() ); - connect( fontCombo, TQT_SIGNAL( activated( const TQString & ) ), this, TQT_SLOT( fontSelected( const TQString & ) ) ); + connect( fontCombo, TQ_SIGNAL( activated( const TQString & ) ), this, TQ_SLOT( fontSelected( const TQString & ) ) ); TQLabel* const lTable = new TQLabel( i18n( "Table:" ), bar ); lTable->resize( lTable->sizeHint() ); @@ -399,7 +399,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f tableSpinBox = new TQSpinBox( 0, 255, 1, bar ); tableSpinBox->resize( tableSpinBox->sizeHint() ); - connect( tableSpinBox, TQT_SIGNAL( valueChanged( int ) ), this, TQT_SLOT( tableChanged( int ) ) ); + connect( tableSpinBox, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( tableChanged( int ) ) ); TQLabel* const lUnicode = new TQLabel( i18n( "&Unicode code point:" ), bar ); lUnicode->resize( lUnicode->sizeHint() ); @@ -415,7 +415,7 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f d->unicodeLine->resize( d->unicodeLine->sizeHint() ); slotUpdateUnicode(_chr); - connect( d->unicodeLine, TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( slotUnicodeEntered() ) ); + connect( d->unicodeLine, TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( slotUnicodeEntered() ) ); charTable = new KCharSelectTable( this, name, _font.isEmpty() ? TQString(TQVBox::font().family()) : _font, _chr, _tableNum ); const TQSize sz( charTable->contentsWidth() + 4 , @@ -429,18 +429,18 @@ KCharSelect::KCharSelect( TQWidget *parent, const char *name, const TQString &_f setFont( _font.isEmpty() ? TQString(TQVBox::font().family()) : _font ); setTableNum( _tableNum ); - connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( slotUpdateUnicode( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( highlighted( const TQChar & ) ), this, TQT_SLOT( charHighlighted( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( highlighted() ), this, TQT_SLOT( charHighlighted() ) ); - connect( charTable, TQT_SIGNAL( activated( const TQChar & ) ), this, TQT_SLOT( charActivated( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( activated() ), this, TQT_SLOT( charActivated() ) ); - connect( charTable, TQT_SIGNAL( focusItemChanged( const TQChar & ) ), - this, TQT_SLOT( charFocusItemChanged( const TQChar & ) ) ); - connect( charTable, TQT_SIGNAL( focusItemChanged() ), this, TQT_SLOT( charFocusItemChanged() ) ); - connect( charTable, TQT_SIGNAL( tableUp() ), this, TQT_SLOT( charTableUp() ) ); - connect( charTable, TQT_SIGNAL( tableDown() ), this, TQT_SLOT( charTableDown() ) ); - - connect( charTable, TQT_SIGNAL(doubleClicked()),this,TQT_SLOT(slotDoubleClicked())); + connect( charTable, TQ_SIGNAL( highlighted( const TQChar & ) ), this, TQ_SLOT( slotUpdateUnicode( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( highlighted( const TQChar & ) ), this, TQ_SLOT( charHighlighted( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( highlighted() ), this, TQ_SLOT( charHighlighted() ) ); + connect( charTable, TQ_SIGNAL( activated( const TQChar & ) ), this, TQ_SLOT( charActivated( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( activated() ), this, TQ_SLOT( charActivated() ) ); + connect( charTable, TQ_SIGNAL( focusItemChanged( const TQChar & ) ), + this, TQ_SLOT( charFocusItemChanged( const TQChar & ) ) ); + connect( charTable, TQ_SIGNAL( focusItemChanged() ), this, TQ_SLOT( charFocusItemChanged() ) ); + connect( charTable, TQ_SIGNAL( tableUp() ), this, TQ_SLOT( charTableUp() ) ); + connect( charTable, TQ_SIGNAL( tableDown() ), this, TQ_SLOT( charTableDown() ) ); + + connect( charTable, TQ_SIGNAL(doubleClicked()),this,TQ_SLOT(slotDoubleClicked())); setFocusPolicy( TQWidget::StrongFocus ); setFocusProxy( charTable ); diff --git a/tdeui/kcmenumngr.cpp b/tdeui/kcmenumngr.cpp index 996623551..90cf47e2a 100644 --- a/tdeui/kcmenumngr.cpp +++ b/tdeui/kcmenumngr.cpp @@ -59,7 +59,7 @@ void KContextMenuManager::insert( TQWidget* widget, TQPopupMenu* popup ) if ( !manager ) manager = new KContextMenuManager; - manager->connect( widget, TQT_SIGNAL( destroyed() ), manager, TQT_SLOT( widgetDestroyed() ) ); + manager->connect( widget, TQ_SIGNAL( destroyed() ), manager, TQ_SLOT( widgetDestroyed() ) ); manager->menus.insert( widget, popup ); widget->installEventFilter( manager ); } diff --git a/tdeui/kcolorbutton.cpp b/tdeui/kcolorbutton.cpp index bebedf6c9..8f34024d8 100644 --- a/tdeui/kcolorbutton.cpp +++ b/tdeui/kcolorbutton.cpp @@ -47,7 +47,7 @@ KColorButton::KColorButton( TQWidget *parent, const char *name ) setAcceptDrops( true); // 2000-10-15 (putzer): fixes broken keyboard usage - connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor())); + connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor())); } KColorButton::KColorButton( const TQColor &c, TQWidget *parent, @@ -60,7 +60,7 @@ KColorButton::KColorButton( const TQColor &c, TQWidget *parent, setAcceptDrops( true); // 2000-10-15 (putzer): fixes broken keyboard usage - connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor())); + connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor())); } KColorButton::KColorButton( const TQColor &c, const TQColor &defaultColor, TQWidget *parent, @@ -73,7 +73,7 @@ KColorButton::KColorButton( const TQColor &c, const TQColor &defaultColor, TQWid setAcceptDrops( true); // 2000-10-15 (putzer): fixes broken keyboard usage - connect (this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseColor())); + connect (this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseColor())); } KColorButton::~KColorButton() diff --git a/tdeui/kcolorcombo.cpp b/tdeui/kcolorcombo.cpp index 676774b2f..fd43ddcff 100644 --- a/tdeui/kcolorcombo.cpp +++ b/tdeui/kcolorcombo.cpp @@ -121,8 +121,8 @@ KColorCombo::KColorCombo( TQWidget *parent, const char *name ) addColors(); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotActivated(int) ) ); - connect( this, TQT_SIGNAL( highlighted(int) ), TQT_SLOT( slotHighlighted(int) ) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotActivated(int) ) ); + connect( this, TQ_SIGNAL( highlighted(int) ), TQ_SLOT( slotHighlighted(int) ) ); } diff --git a/tdeui/kcolordialog.cpp b/tdeui/kcolordialog.cpp index 8bfcd8084..4c05522eb 100644 --- a/tdeui/kcolordialog.cpp +++ b/tdeui/kcolordialog.cpp @@ -597,12 +597,12 @@ KPaletteTable::KPaletteTable( TQWidget *parent, int minWidth, int cols) mNamedColorList->setFixedSize(minSize); mNamedColorList->hide(); layout->addWidget(mNamedColorList); - connect( mNamedColorList, TQT_SIGNAL(highlighted( const TQString & )), - this, TQT_SLOT( slotColorTextSelected( const TQString & )) ); + connect( mNamedColorList, TQ_SIGNAL(highlighted( const TQString & )), + this, TQ_SLOT( slotColorTextSelected( const TQString & )) ); setFixedSize( sizeHint()); - connect( combo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(slotSetPalette( const TQString &))); + connect( combo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(slotSetPalette( const TQString &))); } KPaletteTable::~KPaletteTable() @@ -704,7 +704,7 @@ KPaletteTable::readNamedColor( void ) // preventing the real dialog to become visible until the // error dialog box is removed (== bad UI). // - TQTimer::singleShot( 10, this, TQT_SLOT(slotShowNamedColorReadError()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotShowNamedColorReadError()) ); } } @@ -831,10 +831,10 @@ KPaletteTable::setPalette( const TQString &_paletteName ) { cells->setColor( i, mPalette->color(i) ); } - connect( cells, TQT_SIGNAL( colorSelected( int ) ), - TQT_SLOT( slotColorCellSelected( int ) ) ); - connect( cells, TQT_SIGNAL( colorDoubleClicked( int ) ), - TQT_SLOT( slotColorCellDoubleClicked( int ) ) ); + connect( cells, TQ_SIGNAL( colorSelected( int ) ), + TQ_SLOT( slotColorCellSelected( int ) ) ); + connect( cells, TQ_SIGNAL( colorDoubleClicked( int ) ), + TQ_SLOT( slotColorCellDoubleClicked( int ) ) ); sv->addChild( cells ); cells->show(); sv->updateScrollBars(); @@ -948,8 +948,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->oldfilter = 0; #endif d->cbDefaultColor = 0L; - connect( this, TQT_SIGNAL(okClicked(void)),this,TQT_SLOT(slotWriteSettings(void))); - connect( this, TQT_SIGNAL(closeClicked(void)),this,TQT_SLOT(slotWriteSettings(void))); + connect( this, TQ_SIGNAL(okClicked(void)),this,TQ_SLOT(slotWriteSettings(void))); + connect( this, TQ_SIGNAL(closeClicked(void)),this,TQ_SLOT(slotWriteSettings(void))); TQLabel *label; @@ -989,14 +989,14 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->hsSelector = new KHSSelector( page ); d->hsSelector->setMinimumSize(140, 70); l_ltop->addWidget(d->hsSelector, 8); - connect( d->hsSelector, TQT_SIGNAL( valueChanged( int, int ) ), - TQT_SLOT( slotHSChanged( int, int ) ) ); + connect( d->hsSelector, TQ_SIGNAL( valueChanged( int, int ) ), + TQ_SLOT( slotHSChanged( int, int ) ) ); d->valuePal = new KValueSelector( page ); d->valuePal->setMinimumSize(26, 70); l_ltop->addWidget(d->valuePal, 1); - connect( d->valuePal, TQT_SIGNAL( valueChanged( int ) ), - TQT_SLOT( slotVChanged( int ) ) ); + connect( d->valuePal, TQ_SIGNAL( valueChanged( int ) ), + TQ_SLOT( slotVChanged( int ) ) ); // @@ -1008,8 +1008,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->hedit = new KColorSpinBox( 0, 359, 1, page ); d->hedit->setValidator( new TQIntValidator( d->hedit ) ); l_lbot->addWidget(d->hedit, 0, 3); - connect( d->hedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotHSVChanged() ) ); + connect( d->hedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("S:"), page ); label->setAlignment(AlignRight | AlignVCenter); @@ -1017,8 +1017,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->sedit = new KColorSpinBox( 0, 255, 1, page ); d->sedit->setValidator( new TQIntValidator( d->sedit ) ); l_lbot->addWidget(d->sedit, 1, 3); - connect( d->sedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotHSVChanged() ) ); + connect( d->sedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotHSVChanged() ) ); label = new TQLabel( i18n("V:"), page ); label->setAlignment(AlignRight | AlignVCenter); @@ -1026,8 +1026,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->vedit = new KColorSpinBox( 0, 255, 1, page ); d->vedit->setValidator( new TQIntValidator( d->vedit ) ); l_lbot->addWidget(d->vedit, 2, 3); - connect( d->vedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotHSVChanged() ) ); + connect( d->vedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotHSVChanged() ) ); // // add the RGB fields @@ -1038,8 +1038,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->redit = new KColorSpinBox( 0, 255, 1, page ); d->redit->setValidator( new TQIntValidator( d->redit ) ); l_lbot->addWidget(d->redit, 0, 5); - connect( d->redit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRGBChanged() ) ); + connect( d->redit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("G:"), page ); label->setAlignment(AlignRight | AlignVCenter); @@ -1047,8 +1047,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->gedit = new KColorSpinBox( 0, 255,1, page ); d->gedit->setValidator( new TQIntValidator( d->gedit ) ); l_lbot->addWidget(d->gedit, 1, 5); - connect( d->gedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRGBChanged() ) ); + connect( d->gedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRGBChanged() ) ); label = new TQLabel( i18n("B:"), page ); label->setAlignment(AlignRight | AlignVCenter); @@ -1056,8 +1056,8 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->bedit = new KColorSpinBox( 0, 255, 1, page ); d->bedit->setValidator( new TQIntValidator( d->bedit ) ); l_lbot->addWidget(d->bedit, 2, 5); - connect( d->bedit, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRGBChanged() ) ); + connect( d->bedit, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRGBChanged() ) ); // // the entry fields should be wide enough to hold 8888888 @@ -1083,13 +1083,13 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->table = new KPaletteTable( page ); d->l_right->addWidget(d->table, 10); - connect( d->table, TQT_SIGNAL( colorSelected( const TQColor &, const TQString & ) ), - TQT_SLOT( slotColorSelected( const TQColor &, const TQString & ) ) ); + connect( d->table, TQ_SIGNAL( colorSelected( const TQColor &, const TQString & ) ), + TQ_SLOT( slotColorSelected( const TQColor &, const TQString & ) ) ); connect( d->table, - TQT_SIGNAL( colorDoubleClicked( const TQColor &, const TQString & ) ), - TQT_SLOT( slotColorDoubleClicked( const TQColor &, const TQString & ) ) + TQ_SIGNAL( colorDoubleClicked( const TQColor &, const TQString & ) ), + TQ_SLOT( slotColorDoubleClicked( const TQColor &, const TQString & ) ) ); // Store the default value for saving time. d->originalPalette = d->table->palette(); @@ -1107,7 +1107,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) TQPushButton *button = new TQPushButton( page ); button->setText(i18n("&Add to Custom Colors")); l_hbox->addWidget(button, 0, AlignLeft); - connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( slotAddToCustomColors())); + connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( slotAddToCustomColors())); // // The color picker button @@ -1115,7 +1115,7 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) button = new TQPushButton( page ); button->setPixmap( BarIcon("colorpicker")); l_hbox->addWidget(button, 0, AlignHCenter ); - connect( button, TQT_SIGNAL( clicked()), TQT_SLOT( slotColorPicker())); + connect( button, TQ_SIGNAL( clicked()), TQ_SLOT( slotColorPicker())); // // a little space between @@ -1147,14 +1147,14 @@ KColorDialog::KColorDialog( TQWidget *parent, const char *name, bool modal ) d->htmlName->setFixedWidth(w); l_grid->addWidget(d->htmlName, 1, 2, TQt::AlignLeft); - connect( d->htmlName, TQT_SIGNAL( textChanged(const TQString &) ), - TQT_SLOT( slotHtmlChanged() ) ); + connect( d->htmlName, TQ_SIGNAL( textChanged(const TQString &) ), + TQ_SLOT( slotHtmlChanged() ) ); d->patch = new KColorPatch( page ); d->patch->setFixedSize(48, 48); l_grid->addMultiCellWidget(d->patch, 0, 1, 0, 0, TQt::AlignHCenter | TQt::AlignVCenter); - connect( d->patch, TQT_SIGNAL( colorChanged( const TQColor&)), - TQT_SLOT( setColor( const TQColor&))); + connect( d->patch, TQ_SIGNAL( colorChanged( const TQColor&)), + TQ_SLOT( setColor( const TQColor&))); tl_layout->activate(); page->setMinimumSize( page->sizeHint() ); @@ -1226,7 +1226,7 @@ KColorDialog::setDefaultColor( const TQColor& col ) mainWidget()->setMinimumSize( mainWidget()->sizeHint() ); disableResize(); - connect( d->cbDefaultColor, TQT_SIGNAL( clicked() ), TQT_SLOT( slotDefaultColorClicked() ) ); + connect( d->cbDefaultColor, TQ_SIGNAL( clicked() ), TQ_SLOT( slotDefaultColorClicked() ) ); } d->defaultColor = col; diff --git a/tdeui/kcombobox.cpp b/tdeui/kcombobox.cpp index 466015adc..bcde35467 100644 --- a/tdeui/kcombobox.cpp +++ b/tdeui/kcombobox.cpp @@ -266,7 +266,7 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) // Connect the returnPressed signal for both Q[K]LineEdits' if (edit) - connect( edit, TQT_SIGNAL( returnPressed() ), TQT_SIGNAL( returnPressed() )); + connect( edit, TQ_SIGNAL( returnPressed() ), TQ_SIGNAL( returnPressed() )); if ( d->klineEdit ) { @@ -274,32 +274,32 @@ void KComboBox::setLineEdit( TQLineEdit *edit ) // lineedit without us noticing. And TDECompletionBase::delegate would // be a dangling pointer then, so prevent that. Note: only do this // when it is a KLineEdit! - connect( edit, TQT_SIGNAL( destroyed() ), TQT_SLOT( lineEditDeleted() )); + connect( edit, TQ_SIGNAL( destroyed() ), TQ_SLOT( lineEditDeleted() )); - connect( d->klineEdit, TQT_SIGNAL( returnPressed( const TQString& )), - TQT_SIGNAL( returnPressed( const TQString& ) )); + connect( d->klineEdit, TQ_SIGNAL( returnPressed( const TQString& )), + TQ_SIGNAL( returnPressed( const TQString& ) )); - connect( d->klineEdit, TQT_SIGNAL( completion( const TQString& )), - TQT_SIGNAL( completion( const TQString& )) ); + connect( d->klineEdit, TQ_SIGNAL( completion( const TQString& )), + TQ_SIGNAL( completion( const TQString& )) ); - connect( d->klineEdit, TQT_SIGNAL( substringCompletion( const TQString& )), - TQT_SIGNAL( substringCompletion( const TQString& )) ); + connect( d->klineEdit, TQ_SIGNAL( substringCompletion( const TQString& )), + TQ_SIGNAL( substringCompletion( const TQString& )) ); connect( d->klineEdit, - TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )), - TQT_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) ); + TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )), + TQ_SIGNAL( textRotation( TDECompletionBase::KeyBindingType )) ); connect( d->klineEdit, - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )), - TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion))); + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion )), + TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion))); connect( d->klineEdit, - TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )), - TQT_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )) ); + TQ_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )), + TQ_SIGNAL( aboutToShowContextMenu( TQPopupMenu * )) ); connect( d->klineEdit, - TQT_SIGNAL( completionBoxActivated( const TQString& )), - TQT_SIGNAL( activated( const TQString& )) ); + TQ_SIGNAL( completionBoxActivated( const TQString& )), + TQ_SIGNAL( activated( const TQString& )) ); } } @@ -390,10 +390,10 @@ void KHistoryCombo::init( bool useCompletion ) if ( histControl == "ignoredups" || histControl == "ignoreboth" ) setDuplicatesEnabled( false ); - connect( this, TQT_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), - TQT_SLOT(addContextMenuItems(TQPopupMenu*)) ); - connect( this, TQT_SIGNAL( activated(int) ), TQT_SLOT( slotReset() )); - connect( this, TQT_SIGNAL( returnPressed(const TQString&) ), TQT_SLOT(slotReset())); + connect( this, TQ_SIGNAL(aboutToShowContextMenu(TQPopupMenu*)), + TQ_SLOT(addContextMenuItems(TQPopupMenu*)) ); + connect( this, TQ_SIGNAL( activated(int) ), TQ_SLOT( slotReset() )); + connect( this, TQ_SIGNAL( returnPressed(const TQString&) ), TQ_SLOT(slotReset())); } KHistoryCombo::~KHistoryCombo() @@ -455,10 +455,10 @@ void KHistoryCombo::addContextMenuItems( TQPopupMenu* menu ) { menu->insertSeparator(); if (d->bHistoryEditorEnabled) { - int idedit = menu->insertItem( SmallIconSet("edit"), i18n("&Edit History..."), this, TQT_SLOT( slotEdit()) ); + int idedit = menu->insertItem( SmallIconSet("edit"), i18n("&Edit History..."), this, TQ_SLOT( slotEdit()) ); menu->setItemEnabled(idedit, count()); } - int id = menu->insertItem( SmallIconSet("history_clear"), i18n("Clear &History"), this, TQT_SLOT( slotClear())); + int id = menu->insertItem( SmallIconSet("history_clear"), i18n("Clear &History"), this, TQ_SLOT( slotClear())); if (!count()) menu->setItemEnabled(id, false); } @@ -697,7 +697,7 @@ void KHistoryCombo::slotClear() void KHistoryCombo::slotEdit() { KHistoryComboEditor dlg( historyItems(), this ); - connect( &dlg, TQT_SIGNAL( removeFromHistory(const TQString&) ), TQT_SLOT( slotRemoveFromHistory(const TQString&)) ); + connect( &dlg, TQ_SIGNAL( removeFromHistory(const TQString&) ), TQ_SLOT( slotRemoveFromHistory(const TQString&)) ); dlg.exec(); } @@ -747,7 +747,7 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget TQLabel* slbl = new TQLabel(i18n("&Search:"), searchbox); TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(searchbox); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); // Add ListView m_pListView = new TDEListView( box ); @@ -766,8 +766,8 @@ KHistoryComboEditor::KHistoryComboEditor( const TQStringList& entries, TQWidget m_pListView->setMinimumSize( m_pListView->sizeHint() ); - connect( m_pListView, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); + connect( m_pListView, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( slotSelectionChanged( TQListViewItem * ) ) ); enableButton( KDialogBase::User1, false ); diff --git a/tdeui/kcombobox.h b/tdeui/kcombobox.h index 2c3cbf335..8e6afbbe4 100644 --- a/tdeui/kcombobox.h +++ b/tdeui/kcombobox.h @@ -114,7 +114,7 @@ class KURL; * KComboBox *combo = new KComboBox( true, this, "mywidget" ); * TDECompletion *comp = combo->completionObject(); * // Connect to the return pressed signal - optional - * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(combo,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * * // Provide the to be completed strings. Note that those are separate from the combo's * // contents. @@ -128,7 +128,7 @@ class KURL; * KURLCompletion *comp = new KURLCompletion(); * combo->setCompletionObject( comp ); * // Connect to the return pressed signal - optional - * connect(combo,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(combo,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * \endcode * * Note that you have to either delete the allocated completion object @@ -553,8 +553,8 @@ public: * use * * \code - * connect( combo, TQT_SIGNAL( activated( const TQString& )), - * combo, TQT_SLOT( addToHistory( const TQString& ))); + * connect( combo, TQ_SIGNAL( activated( const TQString& )), + * combo, TQ_SLOT( addToHistory( const TQString& ))); * \endcode * * Use TQComboBox::setMaxCount() to limit the history. diff --git a/tdeui/kcommand.cpp b/tdeui/kcommand.cpp index 5357e557a..cd30b861b 100644 --- a/tdeui/kcommand.cpp +++ b/tdeui/kcommand.cpp @@ -84,25 +84,25 @@ KCommandHistory::KCommandHistory(TDEActionCollection * actionCollection, bool wi if (withMenus) { TDEToolBarPopupAction * undo = new TDEToolBarPopupAction( i18n("&Undo"), "edit-undo", - TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQT_SLOT( undo() ), + TDEStdAccel::shortcut(TDEStdAccel::Undo), this, TQ_SLOT( undo() ), actionCollection, KStdAction::stdName( KStdAction::Undo ) ); - connect( undo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotUndoAboutToShow() ) ); - connect( undo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotUndoActivated( int ) ) ); + connect( undo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotUndoAboutToShow() ) ); + connect( undo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotUndoActivated( int ) ) ); m_undo = undo; m_undoPopup = undo->popupMenu(); TDEToolBarPopupAction * redo = new TDEToolBarPopupAction( i18n("&Redo"), "edit-redo", - TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQT_SLOT( redo() ), + TDEStdAccel::shortcut(TDEStdAccel::Redo), this, TQ_SLOT( redo() ), actionCollection, KStdAction::stdName( KStdAction::Redo ) ); - connect( redo->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotRedoAboutToShow() ) ); - connect( redo->popupMenu(), TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( slotRedoActivated( int ) ) ); + connect( redo->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotRedoAboutToShow() ) ); + connect( redo->popupMenu(), TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotRedoActivated( int ) ) ); m_redo = redo; m_redoPopup = redo->popupMenu(); } else { - m_undo = KStdAction::undo( this, TQT_SLOT( undo() ), actionCollection ); - m_redo = KStdAction::redo( this, TQT_SLOT( redo() ), actionCollection ); + m_undo = KStdAction::undo( this, TQ_SLOT( undo() ), actionCollection ); + m_redo = KStdAction::redo( this, TQ_SLOT( redo() ), actionCollection ); m_undoPopup = 0L; m_redoPopup = 0L; } diff --git a/tdeui/kcursor.cpp b/tdeui/kcursor.cpp index 8b004e339..a04786da7 100644 --- a/tdeui/kcursor.cpp +++ b/tdeui/kcursor.cpp @@ -250,8 +250,8 @@ KCursorPrivateAutoHideEventFilter::KCursorPrivateAutoHideEventFilter( TQWidget* , m_isOwnCursor( false ) { m_widget->setMouseTracking( true ); - connect( &m_autoHideTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( hideCursor() ) ); + connect( &m_autoHideTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( hideCursor() ) ); } KCursorPrivateAutoHideEventFilter::~KCursorPrivateAutoHideEventFilter() @@ -392,8 +392,8 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve m_eventFilters.insert( w, filter ); if ( !customEventFilter ) w->installEventFilter( filter ); - connect( w, TQT_SIGNAL( destroyed(TQObject*) ), - this, TQT_SLOT( slotWidgetDestroyed(TQObject*) ) ); + connect( w, TQ_SIGNAL( destroyed(TQObject*) ), + this, TQ_SLOT( slotWidgetDestroyed(TQObject*) ) ); } else { @@ -402,8 +402,8 @@ void KCursorPrivate::setAutoHideCursor( TQWidget *w, bool enable, bool customEve return; w->removeEventFilter( filter ); delete filter; - disconnect( w, TQT_SIGNAL( destroyed(TQObject*) ), - this, TQT_SLOT( slotWidgetDestroyed(TQObject*) ) ); + disconnect( w, TQ_SIGNAL( destroyed(TQObject*) ), + this, TQ_SLOT( slotWidgetDestroyed(TQObject*) ) ); } } diff --git a/tdeui/kdatepicker.cpp b/tdeui/kdatepicker.cpp index 3d57d5a3f..0622cbc1a 100644 --- a/tdeui/kdatepicker.cpp +++ b/tdeui/kdatepicker.cpp @@ -187,17 +187,17 @@ void KDatePicker::init( const TQDate &dt ) monthForward->setIconSet(BarIconSet(TQString::fromLatin1("1rightarrow"))); monthBackward->setIconSet(BarIconSet(TQString::fromLatin1("1leftarrow"))); } - connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); - connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); - connect(monthForward, TQT_SIGNAL(clicked()), TQT_SLOT(monthForwardClicked())); - connect(monthBackward, TQT_SIGNAL(clicked()), TQT_SLOT(monthBackwardClicked())); - connect(yearForward, TQT_SIGNAL(clicked()), TQT_SLOT(yearForwardClicked())); - connect(yearBackward, TQT_SIGNAL(clicked()), TQT_SLOT(yearBackwardClicked())); - connect(d->selectWeek, TQT_SIGNAL(activated(int)), TQT_SLOT(weekSelected(int))); - connect(d->todayButton, TQT_SIGNAL(clicked()), TQT_SLOT(todayButtonClicked())); - connect(selectMonth, TQT_SIGNAL(clicked()), TQT_SLOT(selectMonthClicked())); - connect(selectYear, TQT_SIGNAL(toggled(bool)), TQT_SLOT(selectYearClicked())); - connect(line, TQT_SIGNAL(returnPressed()), TQT_SLOT(lineEnterPressed())); + connect(table, TQ_SIGNAL(dateChanged(TQDate)), TQ_SLOT(dateChangedSlot(TQDate))); + connect(table, TQ_SIGNAL(tableClicked()), TQ_SLOT(tableClickedSlot())); + connect(monthForward, TQ_SIGNAL(clicked()), TQ_SLOT(monthForwardClicked())); + connect(monthBackward, TQ_SIGNAL(clicked()), TQ_SLOT(monthBackwardClicked())); + connect(yearForward, TQ_SIGNAL(clicked()), TQ_SLOT(yearForwardClicked())); + connect(yearBackward, TQ_SIGNAL(clicked()), TQ_SLOT(yearBackwardClicked())); + connect(d->selectWeek, TQ_SIGNAL(activated(int)), TQ_SLOT(weekSelected(int))); + connect(d->todayButton, TQ_SIGNAL(clicked()), TQ_SLOT(todayButtonClicked())); + connect(selectMonth, TQ_SIGNAL(clicked()), TQ_SLOT(selectMonthClicked())); + connect(selectYear, TQ_SIGNAL(toggled(bool)), TQ_SLOT(selectYearClicked())); + connect(line, TQ_SIGNAL(returnPressed()), TQ_SLOT(lineEnterPressed())); table->setFocus(); @@ -394,7 +394,7 @@ KDatePicker::selectYearClicked() picker->setYear( table->getDate().year() ); picker->selectAll(); popup->setMainWidget(picker); - connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); + connect(picker, TQ_SIGNAL(closeMe(int)), popup, TQ_SLOT(close(int))); picker->setFocus(); if(popup->exec(selectYear->mapToGlobal(TQPoint(0, selectMonth->height())))) { @@ -416,7 +416,7 @@ KDatePicker::selectYearClicked() } delete popup; - TQTimer::singleShot(0, this, TQT_SLOT(ensureSelectYearIsUp())); + TQTimer::singleShot(0, this, TQ_SLOT(ensureSelectYearIsUp())); } void @@ -528,8 +528,8 @@ KDatePicker::setCloseButton( bool enable ) d->navigationLayout->addWidget(d->closeButton); TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); - connect( d->closeButton, TQT_SIGNAL( clicked() ), - topLevelWidget(), TQT_SLOT( close() ) ); + connect( d->closeButton, TQ_SIGNAL( clicked() ), + topLevelWidget(), TQ_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/tdeui/kdatetbl.cpp b/tdeui/kdatetbl.cpp index b0d55f246..7d76c3fc1 100644 --- a/tdeui/kdatetbl.cpp +++ b/tdeui/kdatetbl.cpp @@ -158,12 +158,12 @@ KDateTable::~KDateTable() void KDateTable::initAccels() { TDEAccel* accel = new TDEAccel(this, "date table accel"); - accel->insert(TDEStdAccel::Next, this, TQT_SLOT(nextMonth())); - accel->insert(TDEStdAccel::Prior, this, TQT_SLOT(previousMonth())); - accel->insert(TDEStdAccel::Home, this, TQT_SLOT(beginningOfMonth())); - accel->insert(TDEStdAccel::End, this, TQT_SLOT(endOfMonth())); - accel->insert(TDEStdAccel::BeginningOfLine, this, TQT_SLOT(beginningOfWeek())); - accel->insert(TDEStdAccel::EndOfLine, this, TQT_SLOT(endOfWeek())); + accel->insert(TDEStdAccel::Next, this, TQ_SLOT(nextMonth())); + accel->insert(TDEStdAccel::Prior, this, TQ_SLOT(previousMonth())); + accel->insert(TDEStdAccel::Home, this, TQ_SLOT(beginningOfMonth())); + accel->insert(TDEStdAccel::End, this, TQ_SLOT(endOfMonth())); + accel->insert(TDEStdAccel::BeginningOfLine, this, TQ_SLOT(beginningOfWeek())); + accel->insert(TDEStdAccel::EndOfLine, this, TQ_SLOT(endOfWeek())); accel->readSettings(); } @@ -618,7 +618,7 @@ KDateInternalWeekSelector::KDateInternalWeekSelector setFont(font); setFrameStyle(TQFrame::NoFrame); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(weekEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(weekEnteredSlot())); } void @@ -861,7 +861,7 @@ KDateInternalYearSelector::KDateInternalYearSelector // we have to respect the limits of TQDate here, I fear: val->setRange(0, 8000); setValidator(val); - connect(this, TQT_SIGNAL(returnPressed()), TQT_SLOT(yearEnteredSlot())); + connect(this, TQ_SIGNAL(returnPressed()), TQ_SLOT(yearEnteredSlot())); } void diff --git a/tdeui/kdatetimewidget.cpp b/tdeui/kdatetimewidget.cpp index 76d92edd2..1aa9332be 100644 --- a/tdeui/kdatetimewidget.cpp +++ b/tdeui/kdatetimewidget.cpp @@ -44,10 +44,10 @@ void KDateTimeWidget::init() d->dateWidget = new KDateWidget(this); d->timeWidget = new KTimeWidget(this); - connect(d->dateWidget, TQT_SIGNAL(changed(TQDate)), - TQT_SLOT(slotValueChanged())); - connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)), - TQT_SLOT(slotValueChanged())); + connect(d->dateWidget, TQ_SIGNAL(changed(TQDate)), + TQ_SLOT(slotValueChanged())); + connect(d->timeWidget, TQ_SIGNAL(valueChanged(const TQTime &)), + TQ_SLOT(slotValueChanged())); } void KDateTimeWidget::setDateTime(const TQDateTime & datetime) diff --git a/tdeui/kdatewidget.cpp b/tdeui/kdatewidget.cpp index 2fc9dda0a..8a7206d4a 100644 --- a/tdeui/kdatewidget.cpp +++ b/tdeui/kdatewidget.cpp @@ -88,9 +88,9 @@ void KDateWidget::init() d->m_year = new KDateWidgetSpinBox(locale->calendar()->minValidYear(), locale->calendar()->maxValidYear(), this); - connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); + connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); } void KDateWidget::init(const TQDate& date) @@ -112,9 +112,9 @@ void KDateWidget::init(const TQDate& date) d->m_year = new KDateWidgetSpinBox(locale->calendar()->minValidYear(), locale->calendar()->maxValidYear(), this); - connect(d->m_day, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_month, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDateChanged())); - connect(d->m_year, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotDateChanged())); + connect(d->m_day, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_month, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDateChanged())); + connect(d->m_year, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotDateChanged())); } KDateWidget::~KDateWidget() diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp index a2fb96425..5a90b5af9 100644 --- a/tdeui/kdetrayproxy/kdetrayproxy.cpp +++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp @@ -32,8 +32,8 @@ KDETrayProxy::KDETrayProxy() : selection( makeSelectionAtom()) { - connect( &selection, TQT_SIGNAL( newOwner( Window )), TQT_SLOT( newOwner( Window ))); - connect( &module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId ))); + connect( &selection, TQ_SIGNAL( newOwner( Window )), TQ_SLOT( newOwner( Window ))); + connect( &module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId ))); selection.owner(); for( TQValueList< WId >::ConstIterator it = module.windows().begin(); it != module.windows().end(); diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 3f8a89311..a88640efe 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -295,7 +295,7 @@ void KDialogQueue::queueDialog(TQDialog *dialog) { KDialogQueue *_this = self(); _this->d->queue.append(dialog); - TQTimer::singleShot(0, _this, TQT_SLOT(slotShowQueuedDialog())); + TQTimer::singleShot(0, _this, TQ_SLOT(slotShowQueuedDialog())); } void KDialogQueue::slotShowQueuedDialog() @@ -317,7 +317,7 @@ void KDialogQueue::slotShowQueuedDialog() delete dialog; if (!d->queue.isEmpty()) - TQTimer::singleShot(20, this, TQT_SLOT(slotShowQueuedDialog())); + TQTimer::singleShot(20, this, TQ_SLOT(slotShowQueuedDialog())); else ksdkdq.destructObject(); // Suicide. } @@ -461,7 +461,7 @@ void KSMModalDialog::keepMeOnTop() { if (!m_keepOnTopTimer) { m_keepOnTopTimer = new TQTimer(); - connect(m_keepOnTopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(keepMeOnTop())); + connect(m_keepOnTopTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(keepMeOnTop())); m_keepOnTopTimer->start(100, FALSE); } setActiveWindow(); diff --git a/tdeui/kdialogbase.cpp b/tdeui/kdialogbase.cpp index 92226f954..d1cec7389 100644 --- a/tdeui/kdialogbase.cpp +++ b/tdeui/kdialogbase.cpp @@ -109,7 +109,7 @@ KDialogBase::KDialogBase( TQWidget *parent, const char *name, bool modal, setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); enableButtonSeparator( separator ); makeButtonBox( buttonMask, defaultButton, user1, user2, user3 ); @@ -131,11 +131,11 @@ KDialogBase::KDialogBase( int dialogFace, const TQString &caption, setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); mJanus = new KJanusWidget( this, "janus", dialogFace ); - connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)), - this, TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mJanus, TQ_SIGNAL(aboutToShowPage(TQWidget *)), + this, TQ_SIGNAL(aboutToShowPage(TQWidget *))); if( !mJanus || !mJanus->isValid() ) { return; } @@ -160,11 +160,11 @@ KDialogBase::KDialogBase( KDialogBase::DialogType dialogFace, WFlags f, TQWidge setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); mJanus = new KJanusWidget( this, "janus", dialogFace ); - connect(mJanus, TQT_SIGNAL(aboutToShowPage(TQWidget *)), - this, TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mJanus, TQ_SIGNAL(aboutToShowPage(TQWidget *)), + this, TQ_SIGNAL(aboutToShowPage(TQWidget *))); if( !mJanus || !mJanus->isValid() ) { return; } @@ -189,7 +189,7 @@ KDialogBase::KDialogBase( const TQString &caption, int buttonMask, setCaption( caption ); makeRelay(); - connect( this, TQT_SIGNAL(layoutHintChanged()), TQT_SLOT(updateGeometry()) ); + connect( this, TQ_SIGNAL(layoutHintChanged()), TQ_SLOT(updateGeometry()) ); enableButtonSeparator( separator ); @@ -281,7 +281,7 @@ KDialogBase::delayedDestruct() { if (isVisible()) hide(); - TQTimer::singleShot( 0, this, TQT_SLOT(slotDelayedDestruct())); + TQTimer::singleShot( 0, this, TQ_SLOT(slotDelayedDestruct())); } void @@ -373,15 +373,15 @@ void KDialogBase::makeRelay() { if( mTile ) { - connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) ); + connect( mTile, TQ_SIGNAL(pixmapChanged()), TQ_SLOT(updateBackground()) ); return; } mTile = new KDialogBaseTile; if( mTile ) { - connect( mTile, TQT_SIGNAL(pixmapChanged()), TQT_SLOT(updateBackground()) ); - connect( tqApp, TQT_SIGNAL(aboutToQuit()), mTile, TQT_SLOT(cleanup()) ); + connect( mTile, TQ_SIGNAL(pixmapChanged()), TQ_SLOT(updateBackground()) ); + connect( tqApp, TQ_SIGNAL(aboutToQuit()), mTile, TQ_SLOT(cleanup()) ); } } @@ -576,35 +576,35 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, { KPushButton *pb = d->mButton.append( Help, KStdGuiItem::help() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotHelp()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotHelp()) ); } if( d->mButton.mask & Default ) { KPushButton *pb = d->mButton.append( Default, KStdGuiItem::defaults() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefault()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefault()) ); } if( d->mButton.mask & Details ) { KPushButton *pb = d->mButton.append( Details, TQString() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotDetails()) ); setDetails(false); } if( d->mButton.mask & User3 ) { KPushButton *pb = d->mButton.append( User3, user3 ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser3()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotUser3()) ); } if( d->mButton.mask & User2 ) { KPushButton *pb = d->mButton.append( User2, user2 ); if( mMessageBoxMode ) { - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotYes()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotYes()) ); } else { - connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUser2()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotUser2()) ); } } if( d->mButton.mask & User1 ) @@ -612,39 +612,39 @@ void KDialogBase::makeButtonBox( int buttonMask, ButtonCode defaultButton, KPushButton *pb = d->mButton.append( User1, user1 ); if( mMessageBoxMode ) { - connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNo()) ); + connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNo()) ); } else { - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotUser1()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotUser1()) ); } } if( d->mButton.mask & Ok ) { KPushButton *pb = d->mButton.append( Ok, KStdGuiItem::ok() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotOk()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotOk()) ); } if( d->mButton.mask & Apply ) { KPushButton *pb = d->mButton.append( Apply, KStdGuiItem::apply() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotApply()) ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(applyPressed()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotApply()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(applyPressed()) ); } if( d->mButton.mask & Try ) { KPushButton *pb = d->mButton.append( Try, i18n( "&Try" ) ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotTry()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotTry()) ); } if( d->mButton.mask & Cancel ) { KPushButton *pb = d->mButton.append( Cancel, KStdGuiItem::cancel() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotCancel()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotCancel()) ); } if( d->mButton.mask & Close ) { KPushButton *pb = d->mButton.append( Close, KStdGuiItem::close() ); - connect( pb, TQT_SIGNAL(clicked()), TQT_SLOT(slotClose()) ); + connect( pb, TQ_SIGNAL(clicked()), TQ_SLOT(slotClose()) ); } if( defaultButton != NoDefault ) @@ -1256,8 +1256,8 @@ void KDialogBase::enableLinkedHelp( bool state ) mUrlHelp->setBackgroundPixmap(*mTile->get()); } mUrlHelp->setMinimumHeight( fontMetrics().height() + marginHint() ); - connect(mUrlHelp,TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(helpClickedSlot(const TQString &))); + connect(mUrlHelp,TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(helpClickedSlot(const TQString &))); mUrlHelp->show(); } else diff --git a/tdeui/kdockwidget.cpp b/tdeui/kdockwidget.cpp index ef26821f0..645b8214d 100644 --- a/tdeui/kdockwidget.cpp +++ b/tdeui/kdockwidget.cpp @@ -230,28 +230,28 @@ KDockWidgetHeader::KDockWidgetHeader( KDockWidget* parent, const char* name ) TQToolTip::add( closeButton, i18n("Close") ); closeButton->setPixmap( style().stylePixmap (TQStyle::SP_TitleBarCloseButton , this)); closeButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); - connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerCloseButtonClicked())); + connect( closeButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(undock())); stayButton = new KDockButton_Private( this, "DockStayButton" ); TQToolTip::add( stayButton, i18n("Freeze the window geometry", "Freeze") ); stayButton->setToggleButton( true ); stayButton->setPixmap( const_cast< const char** >(not_close_xpm) ); stayButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( stayButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotStayClicked())); + connect( stayButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotStayClicked())); dockbackButton = new KDockButton_Private( this, "DockbackButton" ); TQToolTip::add( dockbackButton, i18n("Dock this window", "Dock") ); dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm)); dockbackButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked())); - connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SIGNAL(headerDockbackButtonClicked())); + connect( dockbackButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(dockBack())); d->toDesktopButton = new KDockButton_Private( this, "ToDesktopButton" ); TQToolTip::add( d->toDesktopButton, i18n("Detach") ); d->toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm)); d->toDesktopButton->setFixedSize(closeButton->pixmap()->width(),closeButton->pixmap()->height()); - connect( d->toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); + connect( d->toDesktopButton, TQ_SIGNAL(clicked()), parent, TQ_SLOT(toDesktop())); stayButton->hide(); d->dummy = new TQWidget( this ); @@ -522,7 +522,7 @@ KDockWidget::KDockWidget( KDockManager* dockManager, const char* name, const TQP setIcon( pixmap); widget = 0L; - TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) ); + TQObject::connect(this, TQ_SIGNAL(hasUndocked()), manager->main, TQ_SLOT(slotDockWidgetUndocked()) ); applyToWidget( parent, TQPoint(0,0) ); } @@ -1124,7 +1124,7 @@ KDockWidget* KDockWidget::manualDock( KDockWidget* target, DockPosition dockPos, if ( dockPos == KDockWidget::DockCenter ) { KDockTabGroup* tab = new KDockTabGroup( newDock, "_dock_tab"); - TQObject::connect(tab, TQT_SIGNAL(currentChanged(TQWidget*)), d, TQT_SLOT(slotFocusEmbeddedWidget(TQWidget*))); + TQObject::connect(tab, TQ_SIGNAL(currentChanged(TQWidget*)), d, TQ_SLOT(slotFocusEmbeddedWidget(TQWidget*))); newDock->setWidget( tab ); target->applyToWidget( tab ); @@ -1560,15 +1560,15 @@ void KDockWidget::setFormerBrotherDockWidget(KDockWidget *dockWidget) { formerBrotherDockWidget = dockWidget; if( formerBrotherDockWidget ) - TQObject::connect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::connect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); } void KDockWidget::loseFormerBrotherDockWidget() { if( formerBrotherDockWidget ) - TQObject::disconnect( formerBrotherDockWidget, TQT_SIGNAL(iMBeingClosed()), - this, TQT_SLOT(loseFormerBrotherDockWidget()) ); + TQObject::disconnect( formerBrotherDockWidget, TQ_SIGNAL(iMBeingClosed()), + this, TQ_SLOT(loseFormerBrotherDockWidget()) ); formerBrotherDockWidget = 0L; repaint(); } @@ -1658,8 +1658,8 @@ KDockManager::KDockManager( TQWidget* mainWindow , const char* name ) menu = new TQPopupMenu(); #endif - connect( menu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotMenuPopup()) ); - connect( menu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuActivated(int)) ); + connect( menu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotMenuPopup()) ); + connect( menu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuActivated(int)) ); childDock = new TQObjectList(); childDock->setAutoDelete( false ); diff --git a/tdeui/keditcl1.cpp b/tdeui/keditcl1.cpp index a550a7af1..85ccd1c88 100644 --- a/tdeui/keditcl1.cpp +++ b/tdeui/keditcl1.cpp @@ -67,8 +67,8 @@ KEdit::KEdit(TQWidget *_parent, const char *name) setAcceptDrops(true); KCursor::setAutoHideCursor( this, true ); - connect(this, TQT_SIGNAL(cursorPositionChanged(int,int)), - this, TQT_SLOT(slotCursorPositionChanged())); + connect(this, TQ_SIGNAL(cursorPositionChanged(int,int)), + this, TQ_SLOT(slotCursorPositionChanged())); } diff --git a/tdeui/keditcl2.cpp b/tdeui/keditcl2.cpp index 77a7d9391..3ccb5226b 100644 --- a/tdeui/keditcl2.cpp +++ b/tdeui/keditcl2.cpp @@ -58,8 +58,8 @@ void KEdit::search(){ if( !srchdialog ) { srchdialog = new KEdFind( this, "searchdialog", false); - connect(srchdialog,TQT_SIGNAL(search()),this,TQT_SLOT(search_slot())); - connect(srchdialog,TQT_SIGNAL(done()),this,TQT_SLOT(searchdone_slot())); + connect(srchdialog,TQ_SIGNAL(search()),this,TQ_SLOT(search_slot())); + connect(srchdialog,TQ_SIGNAL(done()),this,TQ_SLOT(searchdone_slot())); } // If we already searched / replaced something before make sure it shows @@ -254,10 +254,10 @@ void KEdit::replace() if( !replace_dialog ) { replace_dialog = new KEdReplace( this, "replace_dialog", false ); - connect(replace_dialog,TQT_SIGNAL(find()),this,TQT_SLOT(replace_search_slot())); - connect(replace_dialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replace_slot())); - connect(replace_dialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replace_all_slot())); - connect(replace_dialog,TQT_SIGNAL(done()),this,TQT_SLOT(replacedone_slot())); + connect(replace_dialog,TQ_SIGNAL(find()),this,TQ_SLOT(replace_search_slot())); + connect(replace_dialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replace_slot())); + connect(replace_dialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replace_all_slot())); + connect(replace_dialog,TQ_SIGNAL(done()),this,TQ_SLOT(replacedone_slot())); } TQString string = replace_dialog->getText(); @@ -715,8 +715,8 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal ) d->combo->setMinimumWidth(fontMetrics().maxWidth()*20); d->combo->setFocus(); - connect(d->combo, TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textSearchChanged ( const TQString & ))); + connect(d->combo, TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textSearchChanged ( const TQString & ))); topLayout->addWidget(d->combo); @@ -734,7 +734,7 @@ KEdFind::KEdFind( TQWidget *parent, const char *name, bool modal ) enableButton( KDialogBase::User1, !d->combo->currentText().isEmpty() ); if ( !modal ) - connect( this, TQT_SIGNAL( closeClicked() ), this, TQT_SLOT( slotCancel() ) ); + connect( this, TQ_SIGNAL( closeClicked() ), this, TQ_SLOT( slotCancel() ) ); } KEdFind::~KEdFind() @@ -856,8 +856,8 @@ KEdReplace::KEdReplace( TQWidget *parent, const char *name, bool modal ) d->replaceCombo->setMinimumWidth(fontMetrics().maxWidth()*20); topLayout->addWidget(d->replaceCombo); - connect(d->searchCombo, TQT_SIGNAL(textChanged ( const TQString & )), - this,TQT_SLOT(textSearchChanged ( const TQString & ))); + connect(d->searchCombo, TQ_SIGNAL(textChanged ( const TQString & )), + this,TQ_SLOT(textSearchChanged ( const TQString & ))); TQButtonGroup *group = new TQButtonGroup( i18n("Options"), page ); topLayout->addWidget( group ); diff --git a/tdeui/keditlistbox.cpp b/tdeui/keditlistbox.cpp index 33ca5bc19..92efce083 100644 --- a/tdeui/keditlistbox.cpp +++ b/tdeui/keditlistbox.cpp @@ -105,10 +105,10 @@ void KEditListBox::init( bool checkAtEntering, int buttons, d->buttons = 0; setButtons( buttons ); - connect(m_lineEdit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(typedSomething(const TQString&))); + connect(m_lineEdit,TQ_SIGNAL(textChanged(const TQString&)),this,TQ_SLOT(typedSomething(const TQString&))); m_lineEdit->setTrapReturnKey(true); - connect(m_lineEdit,TQT_SIGNAL(returnPressed()),this,TQT_SLOT(addItem())); - connect(m_listBox, TQT_SIGNAL(highlighted(int)), TQT_SLOT(enableMoveButtons(int))); + connect(m_lineEdit,TQ_SIGNAL(returnPressed()),this,TQ_SLOT(addItem())); + connect(m_listBox, TQ_SIGNAL(highlighted(int)), TQ_SLOT(enableMoveButtons(int))); // maybe supplied lineedit has some text already typedSomething( m_lineEdit->text() ); @@ -124,7 +124,7 @@ void KEditListBox::setButtons( uint buttons ) servNewButton = new TQPushButton(i18n("&Add"), this); servNewButton->setEnabled(false); servNewButton->show(); - connect(servNewButton, TQT_SIGNAL(clicked()), TQT_SLOT(addItem())); + connect(servNewButton, TQ_SIGNAL(clicked()), TQ_SLOT(addItem())); grid->addWidget(servNewButton, 2, 1); } else if ( ( buttons & Add ) == 0 && servNewButton ) { @@ -136,7 +136,7 @@ void KEditListBox::setButtons( uint buttons ) servRemoveButton = new TQPushButton(i18n("&Remove"), this); servRemoveButton->setEnabled(false); servRemoveButton->show(); - connect(servRemoveButton, TQT_SIGNAL(clicked()), TQT_SLOT(removeItem())); + connect(servRemoveButton, TQ_SIGNAL(clicked()), TQ_SLOT(removeItem())); grid->addWidget(servRemoveButton, 3, 1); } else if ( ( buttons & Remove ) == 0 && servRemoveButton ) { @@ -148,12 +148,12 @@ void KEditListBox::setButtons( uint buttons ) servUpButton = new TQPushButton(i18n("Move &Up"), this); servUpButton->setEnabled(false); servUpButton->show(); - connect(servUpButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemUp())); + connect(servUpButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemUp())); servDownButton = new TQPushButton(i18n("Move &Down"), this); servDownButton->setEnabled(false); servDownButton->show(); - connect(servDownButton, TQT_SIGNAL(clicked()), TQT_SLOT(moveItemDown())); + connect(servDownButton, TQ_SIGNAL(clicked()), TQ_SLOT(moveItemDown())); grid->addWidget(servUpButton, 4, 1); grid->addWidget(servDownButton, 5, 1); diff --git a/tdeui/kedittoolbar.cpp b/tdeui/kedittoolbar.cpp index 40b4aa8d1..193a2e4ac 100644 --- a/tdeui/kedittoolbar.cpp +++ b/tdeui/kedittoolbar.cpp @@ -422,8 +422,8 @@ void KEditToolbar::init() setMainWidget(m_widget); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(acceptOK(bool))); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(acceptOK(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(enableButtonApply(bool))); enableButtonApply(false); setMinimumSize(sizeHint()); @@ -499,8 +499,8 @@ void KEditToolbar::slotDefault() setMainWidget(m_widget); m_widget->show(); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(acceptOK(bool))); - connect(m_widget, TQT_SIGNAL(enableOk(bool)), TQT_SLOT(enableButtonApply(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(acceptOK(bool))); + connect(m_widget, TQ_SIGNAL(enableOk(bool)), TQ_SLOT(enableButtonApply(bool))); enableButtonApply(false); emit newToolbarConfig(); @@ -762,8 +762,8 @@ void KEditToolbarWidget::setupLayout() m_toolbarCombo->setEnabled(false); d->m_comboLabel->setBuddy(m_toolbarCombo); d->m_comboSeparator = new KSeparator(this); - connect(m_toolbarCombo, TQT_SIGNAL(activated(const TQString&)), - this, TQT_SLOT(slotToolbarSelected(const TQString&))); + connect(m_toolbarCombo, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(slotToolbarSelected(const TQString&))); // TQPushButton *new_toolbar = new TQPushButton(i18n("&New"), this); // new_toolbar->setPixmap(BarIcon("document-new", TDEIcon::SizeSmall)); @@ -785,10 +785,10 @@ void KEditToolbarWidget::setupLayout() int column2 = m_inactiveList->addColumn(""); // text m_inactiveList->setSorting( column2 ); inactive_label->setBuddy(m_inactiveList); - connect(m_inactiveList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotInactiveSelected(TQListViewItem *))); - connect(m_inactiveList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(slotInsertButton())); + connect(m_inactiveList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotInactiveSelected(TQListViewItem *))); + connect(m_inactiveList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(slotInsertButton())); // our list of active actions TQLabel *active_label = new TQLabel(i18n("Curr&ent actions:"), this); @@ -804,14 +804,14 @@ void KEditToolbarWidget::setupLayout() m_activeList->setSorting(-1); active_label->setBuddy(m_activeList); - connect(m_inactiveList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); - connect(m_activeList, TQT_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), - this, TQT_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); - connect(m_activeList, TQT_SIGNAL(selectionChanged(TQListViewItem *)), - this, TQT_SLOT(slotActiveSelected(TQListViewItem *))); - connect(m_activeList, TQT_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), - this, TQT_SLOT(slotRemoveButton())); + connect(m_inactiveList, TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); + connect(m_activeList, TQ_SIGNAL(dropped(TDEListView*,TQDropEvent*,TQListViewItem*)), + this, TQ_SLOT(slotDropped(TDEListView*,TQDropEvent*,TQListViewItem*))); + connect(m_activeList, TQ_SIGNAL(selectionChanged(TQListViewItem *)), + this, TQ_SLOT(slotActiveSelected(TQListViewItem *))); + connect(m_activeList, TQ_SIGNAL( doubleClicked( TQListViewItem *, const TQPoint &, int )), + this, TQ_SLOT(slotRemoveButton())); // "change icon" button d->m_changeIcon = new KPushButton( i18n( "Change &Icon..." ), this ); @@ -819,8 +819,8 @@ void KEditToolbarWidget::setupLayout() d->m_hasKDialog = !kdialogExe.isEmpty(); d->m_changeIcon->setEnabled( d->m_hasKDialog ); - connect( d->m_changeIcon, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotChangeIcon() ) ); + connect( d->m_changeIcon, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotChangeIcon() ) ); // The buttons in the middle TQIconSet iconSet; @@ -830,26 +830,26 @@ void KEditToolbarWidget::setupLayout() m_upAction->setIconSet( iconSet ); m_upAction->setEnabled(false); m_upAction->setAutoRepeat(true); - connect(m_upAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotUpButton())); + connect(m_upAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotUpButton())); m_insertAction = new TQToolButton(this); iconSet = TQApplication::reverseLayout() ? SmallIconSet( "back" ) : SmallIconSet( "forward" ); m_insertAction->setIconSet( iconSet ); m_insertAction->setEnabled(false); - connect(m_insertAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotInsertButton())); + connect(m_insertAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotInsertButton())); m_removeAction = new TQToolButton(this); iconSet = TQApplication::reverseLayout() ? SmallIconSet( "forward" ) : SmallIconSet( "back" ); m_removeAction->setIconSet( iconSet ); m_removeAction->setEnabled(false); - connect(m_removeAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemoveButton())); + connect(m_removeAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemoveButton())); m_downAction = new TQToolButton(this); iconSet = SmallIconSet( "go-down" ); m_downAction->setIconSet( iconSet ); m_downAction->setEnabled(false); m_downAction->setAutoRepeat(true); - connect(m_downAction, TQT_SIGNAL(clicked()), TQT_SLOT(slotDownButton())); + connect(m_downAction, TQ_SIGNAL(clicked()), TQ_SLOT(slotDownButton())); d->m_helpArea = new TQLabel(this); d->m_helpArea->setAlignment( TQt::WordBreak ); @@ -1405,8 +1405,8 @@ void KEditToolbarWidget::slotChangeIcon() m_activeList->setEnabled( false ); // don't change the current item m_toolbarCombo->setEnabled( false ); // don't change the current toolbar - connect( d->m_kdialogProcess, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( d->m_kdialogProcess, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); } void KEditToolbarWidget::slotProcessExited( TDEProcess* ) diff --git a/tdeui/kedittoolbar.h b/tdeui/kedittoolbar.h index b980b3cb4..d59756b71 100644 --- a/tdeui/kedittoolbar.h +++ b/tdeui/kedittoolbar.h @@ -67,7 +67,7 @@ namespace KEditToolbarInternal * { * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(actionCollection()); - * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + * connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); * dlg.exec(); * } * @@ -92,7 +92,7 @@ namespace KEditToolbarInternal * \code * saveMainWindowSettings( TDEGlobal::config(), "MainWindow" ); * KEditToolbar dlg(factory()); - * connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + * connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); * dlg.exec(); * * void MyClass::slotNewToolbarConfig() // This is called when OK, Apply or Defaults is clicked diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp index 676afcfad..ad923b90e 100644 --- a/tdeui/khelpmenu.cpp +++ b/tdeui/khelpmenu.cpp @@ -89,13 +89,13 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData, if (actions) { - KStdAction::helpContents(this, TQT_SLOT(appHelpActivated()), actions); + KStdAction::helpContents(this, TQ_SLOT(appHelpActivated()), actions); if (showWhatsThis) - KStdAction::whatsThis(this, TQT_SLOT(contextHelpActivated()), actions); - KStdAction::reportBug(this, TQT_SLOT(reportBug()), actions); - KStdAction::aboutApp(this, TQT_SLOT(aboutApplication()), actions); - KStdAction::aboutKDE(this, TQT_SLOT(aboutKDE()), actions); - KStdAction::switchApplicationLanguage(this, TQT_SLOT(switchApplicationLanguage()), actions); + KStdAction::whatsThis(this, TQ_SLOT(contextHelpActivated()), actions); + KStdAction::reportBug(this, TQ_SLOT(reportBug()), actions); + KStdAction::aboutApp(this, TQ_SLOT(aboutApplication()), actions); + KStdAction::aboutKDE(this, TQ_SLOT(aboutKDE()), actions); + KStdAction::switchApplicationLanguage(this, TQ_SLOT(switchApplicationLanguage()), actions); } } @@ -122,14 +122,14 @@ TDEPopupMenu* KHelpMenu::menu() TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name()); mMenu = new TDEPopupMenu(); - connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed())); + connect( mMenu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(menuDestroyed())); bool need_separator = false; if (kapp->authorizeTDEAction("help_contents")) { mMenu->insertItem( BarIcon( "contents", TDEIcon::SizeSmall), TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents ); - mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) ); + mMenu->connectItem( menuHelpContents, this, TQ_SLOT(appHelpActivated()) ); mMenu->setAccel( TDEStdAccel::shortcut(TDEStdAccel::Help), menuHelpContents ); need_separator = true; } @@ -138,7 +138,7 @@ TDEPopupMenu* KHelpMenu::menu() { TQToolButton* wtb = TQWhatsThis::whatsThisButton(0); mMenu->insertItem( wtb->iconSet(),i18n( "What's &This" ), menuWhatsThis); - mMenu->connectItem( menuWhatsThis, this, TQT_SLOT(contextHelpActivated()) ); + mMenu->connectItem( menuWhatsThis, this, TQ_SLOT(contextHelpActivated()) ); delete wtb; mMenu->setAccel( SHIFT + Key_F1, menuWhatsThis ); need_separator = true; @@ -149,7 +149,7 @@ TDEPopupMenu* KHelpMenu::menu() if (need_separator) mMenu->insertSeparator(); mMenu->insertItem( SmallIcon("bug"), i18n( "&Report Bug/Request Enhancement..." ), menuReportBug ); - mMenu->connectItem( menuReportBug, this, TQT_SLOT(reportBug()) ); + mMenu->connectItem( menuReportBug, this, TQ_SLOT(reportBug()) ); need_separator = true; } @@ -158,7 +158,7 @@ TDEPopupMenu* KHelpMenu::menu() if (need_separator) mMenu->insertSeparator(); mMenu->insertItem( SmallIcon("locale"), i18n( "Switch application &language..." ), menuSwitchLanguage ); - mMenu->connectItem( menuSwitchLanguage, this, TQT_SLOT(switchApplicationLanguage()) ); + mMenu->connectItem( menuSwitchLanguage, this, TQ_SLOT(switchApplicationLanguage()) ); need_separator = true; } @@ -169,13 +169,13 @@ TDEPopupMenu* KHelpMenu::menu() { mMenu->insertItem( kapp->miniIcon(), TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp ); - mMenu->connectItem( menuAboutApp, this, TQT_SLOT( aboutApplication() ) ); + mMenu->connectItem( menuAboutApp, this, TQ_SLOT( aboutApplication() ) ); } if (kapp->authorizeTDEAction("help_about_kde")) { mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &TDE" ), menuAboutKDE ); - mMenu->connectItem( menuAboutKDE, this, TQT_SLOT( aboutKDE() ) ); + mMenu->connectItem( menuAboutKDE, this, TQ_SLOT( aboutKDE() ) ); } } @@ -197,7 +197,7 @@ void KHelpMenu::aboutApplication() if( !mAboutApp ) { mAboutApp = new TDEAboutApplication( d->mAboutData, mParent, "about", false ); - connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); } mAboutApp->show(); } @@ -213,7 +213,7 @@ void KHelpMenu::aboutApplication() KDialogBase::Yes, KDialogBase::Yes, KDialogBase::Yes, mParent, "about", false, true, KStdGuiItem::ok() ); - connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); TQHBox *hbox = new TQHBox( mAboutApp ); mAboutApp->setMainWidget( hbox ); @@ -239,7 +239,7 @@ void KHelpMenu::aboutKDE() if( !mAboutKDE ) { mAboutKDE = new TDEAboutKDE( mParent, "aboutkde", false ); - connect( mAboutKDE, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( mAboutKDE, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); } mAboutKDE->show(); } @@ -250,7 +250,7 @@ void KHelpMenu::reportBug() if( !mBugReport ) { mBugReport = new KBugReport( mParent, false, d->mAboutData ); - connect( mBugReport, TQT_SIGNAL(finished()),this,TQT_SLOT( dialogFinished()) ); + connect( mBugReport, TQ_SIGNAL(finished()),this,TQ_SLOT( dialogFinished()) ); } mBugReport->show(); } @@ -260,7 +260,7 @@ void KHelpMenu::switchApplicationLanguage() if ( !d->mSwitchApplicationLanguage ) { d->mSwitchApplicationLanguage = new KSwitchLanguageDialog( mParent, "switchlanguagedialog", false ); - connect( d->mSwitchApplicationLanguage, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) ); + connect( d->mSwitchApplicationLanguage, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) ); } d->mSwitchApplicationLanguage->show(); } @@ -268,7 +268,7 @@ void KHelpMenu::switchApplicationLanguage() void KHelpMenu::dialogFinished() { - TQTimer::singleShot( 0, this, TQT_SLOT(timerExpired()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(timerExpired()) ); } diff --git a/tdeui/khelpmenu.h b/tdeui/khelpmenu.h index b2fbba759..ad0e65140 100644 --- a/tdeui/khelpmenu.h +++ b/tdeui/khelpmenu.h @@ -60,7 +60,7 @@ class KHelpMenuPrivate; * * \code * mHelpMenu = new KHelpMenu( this, ); - * connect( this, TQT_SIGNAL(someSignal()), mHelpMenu,TQT_SLOT(mHelpMenu->aboutKDE())); + * connect( this, TQ_SIGNAL(someSignal()), mHelpMenu,TQ_SLOT(mHelpMenu->aboutKDE())); * \endcode * * IMPORTANT: @@ -97,8 +97,8 @@ class KHelpMenuPrivate; * { * .. * KHelpMenu *helpMenu = new KHelpMenu( this ); - * connect( helpMenu, TQT_SIGNAL(showAboutApplication()), - * this, TQT_SLOT(myDialogSlot())); + * connect( helpMenu, TQ_SIGNAL(showAboutApplication()), + * this, TQ_SLOT(myDialogSlot())); * .. * } * @@ -116,7 +116,7 @@ class KHelpMenuPrivate; * { * KHelpMenu *helpMenu = new KHelpMenu( this ); * TDEPopupMenu *help = mHelpMenu->menu(); - * help->connectItem( KHelpMenu::menuAboutApp, this, TQT_SLOT(myDialogSlot()) ); + * help->connectItem( KHelpMenu::menuAboutApp, this, TQ_SLOT(myDialogSlot()) ); * } * * void MyClass::myDialogSlot() diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index e4ae13716..517730b9c 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -61,23 +61,23 @@ TDEIconView::TDEIconView( TQWidget *parent, const char *name, WFlags f ) { d = new TDEIconViewPrivate; - connect( this, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( this, TQT_SIGNAL( onItem( TQIconViewItem * ) ), - this, TQT_SLOT( slotOnItem( TQIconViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( this, TQ_SIGNAL( onItem( TQIconViewItem * ) ), + this, TQ_SLOT( slotOnItem( TQIconViewItem * ) ) ); slotSettingsChanged( TDEApplication::SETTINGS_MOUSE ); if ( kapp ) { // maybe null when used inside designer - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } m_pCurrentItem = 0L; m_pAutoSelect = new TQTimer( this ); - connect( m_pAutoSelect, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoSelect() ) ); + connect( m_pAutoSelect, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoSelect() ) ); - connect( &d->dragHoldTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotDragHoldTimeout()) ); + connect( &d->dragHoldTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotDragHoldTimeout()) ); } TDEIconView::~TDEIconView() @@ -128,25 +128,25 @@ void TDEIconView::slotSettingsChanged(int category) m_bUseSingle = TDEGlobalSettings::singleClick(); //kdDebug() << "TDEIconView::slotSettingsChanged for mouse, usesingle=" << m_bUseSingle << endl; - disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, + disconnect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ) ); -// disconnect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *, +// disconnect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQIconViewItem *, +// this, TQ_SLOT( slotExecute( TQIconViewItem *, // const TQPoint & ) ) ); if( m_bUseSingle ) { - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQIconViewItem *, const TQPoint & ) ) ); } else { -// connect( this, TQT_SIGNAL( doubleClicked( TQIconViewItem *, +// connect( this, TQ_SIGNAL( doubleClicked( TQIconViewItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQIconViewItem *, +// this, TQ_SLOT( slotExecute( TQIconViewItem *, // const TQPoint & ) ) ); } diff --git a/tdeui/kiconviewsearchline.cpp b/tdeui/kiconviewsearchline.cpp index 77b8082ea..f853221ff 100644 --- a/tdeui/kiconviewsearchline.cpp +++ b/tdeui/kiconviewsearchline.cpp @@ -152,15 +152,15 @@ void TDEIconViewSearchLine::setCaseSensitive( bool cs ) void TDEIconViewSearchLine::setIconView( TQIconView *iv ) { if ( d->iconView != NULL ) - disconnect( d->iconView, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( iconViewDeleted() ) ); + disconnect( d->iconView, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( iconViewDeleted() ) ); d->iconView = iv; if ( iv != NULL ) { - connect( d->iconView, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( iconViewDeleted() ) ); + connect( d->iconView, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( iconViewDeleted() ) ); setEnabled( true ); } else @@ -190,13 +190,13 @@ void TDEIconViewSearchLine::init( TQIconView *iconView ) d->iconView = iconView; - connect( this, TQT_SIGNAL( textChanged( const TQString & ) ), - this, TQT_SLOT( queueSearch( const TQString & ) ) ); + connect( this, TQ_SIGNAL( textChanged( const TQString & ) ), + this, TQ_SLOT( queueSearch( const TQString & ) ) ); if ( iconView != NULL ) { - connect( iconView, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( iconViewDeleted() ) ); + connect( iconView, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( iconViewDeleted() ) ); setEnabled( true ); } else @@ -231,7 +231,7 @@ void TDEIconViewSearchLine::queueSearch( const TQString &s ) { d->queuedSearches++; d->search = s; - TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( activateSearch() ) ); } void TDEIconViewSearchLine::activateSearch() @@ -244,7 +244,7 @@ void TDEIconViewSearchLine::activateSearch() d->queuedSearches = 0; } else { - TQTimer::singleShot( 200, this, TQT_SLOT( activateSearch() ) ); + TQTimer::singleShot( 200, this, TQ_SLOT( activateSearch() ) ); } } diff --git a/tdeui/kinputdialog.cpp b/tdeui/kinputdialog.cpp index 9da93ba0f..5bf89ae20 100644 --- a/tdeui/kinputdialog.cpp +++ b/tdeui/kinputdialog.cpp @@ -77,9 +77,9 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, if ( !mask.isEmpty() ) d->m_lineEdit->setInputMask( mask ); - connect( d->m_lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotEditTextChanged( const TQString & ) ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), d->m_lineEdit, TQT_SLOT( clear() ) ); + connect( d->m_lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotEditTextChanged( const TQString & ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), d->m_lineEdit, TQ_SLOT( clear() ) ); slotEditTextChanged( value ); setMinimumWidth( 350 ); @@ -105,7 +105,7 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_textEdit->setFocus(); d->m_label->setBuddy( d->m_textEdit ); - connect( this, TQT_SIGNAL( user1Clicked() ), d->m_textEdit, TQT_SLOT( clear() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), d->m_textEdit, TQ_SLOT( clear() ) ); setMinimumWidth( 400 ); } @@ -176,10 +176,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_comboBox->setCurrentItem( current ); layout->addWidget( d->m_comboBox ); - connect( d->m_comboBox, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( slotUpdateButtons( const TQString & ) ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), - d->m_comboBox, TQT_SLOT( clearEdit() ) ); + connect( d->m_comboBox, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( slotUpdateButtons( const TQString & ) ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), + d->m_comboBox, TQ_SLOT( clearEdit() ) ); slotUpdateButtons( d->m_comboBox->currentText() ); d->m_comboBox->setFocus(); } else { @@ -188,10 +188,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, d->m_listBox->setSelected( current, true ); d->m_listBox->ensureCurrentVisible(); layout->addWidget( d->m_listBox, 10 ); - connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); d->m_listBox->setFocus(); } @@ -232,10 +232,10 @@ KInputDialog::KInputDialog( const TQString &caption, const TQString &label, } else { - connect( d->m_listBox, TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); - connect( d->m_listBox, TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); + connect( d->m_listBox, TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), + TQ_SLOT( slotOk() ) ); TQString text = select.first(); item = d->m_listBox->findItem( text, CaseSensitive|ExactMatch ); @@ -370,7 +370,7 @@ TQString KInputDialog::getItem( const TQString &caption, const TQString &label, editable, parent, name ); if ( !editable) { - connect( dlg.listBox(), TQT_SIGNAL(doubleClicked ( TQListBoxItem *)), &dlg, TQT_SLOT( slotOk())); + connect( dlg.listBox(), TQ_SIGNAL(doubleClicked ( TQListBoxItem *)), &dlg, TQ_SLOT( slotOk())); } bool _ok = ( dlg.exec() == Accepted ); diff --git a/tdeui/kjanuswidget.cpp b/tdeui/kjanuswidget.cpp index 685301ab8..a17afc59c 100644 --- a/tdeui/kjanuswidget.cpp +++ b/tdeui/kjanuswidget.cpp @@ -115,8 +115,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mTreeList->header()->hide(); mTreeList->setRootIsDecorated(true); mTreeList->setSorting( -1 ); - connect( mTreeList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage()) ); - connect( mTreeList, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotItemClicked(TQListViewItem *))); + connect( mTreeList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage()) ); + connect( mTreeList, TQ_SIGNAL(clicked(TQListViewItem *)), TQ_SLOT(slotItemClicked(TQListViewItem *))); // // Page area. Title at top with a separator below and a pagestack using @@ -143,8 +143,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mIconList->setFont( listFont ); mIconList->verticalScrollBar()->installEventFilter( this ); - connect( mIconList, TQT_SIGNAL(selectionChanged()), TQT_SLOT(slotShowPage())); - connect( mIconList, TQT_SIGNAL(onItem(TQListBoxItem *)), TQT_SLOT(slotOnItem(TQListBoxItem *))); + connect( mIconList, TQ_SIGNAL(selectionChanged()), TQ_SLOT(slotShowPage())); + connect( mIconList, TQ_SIGNAL(onItem(TQListBoxItem *)), TQ_SLOT(slotOnItem(TQListBoxItem *))); hbox->addSpacing( KDialog::marginHint() ); page = new TQFrame( this ); @@ -170,8 +170,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) vbox->addWidget( mTitleSep ); mPageStack = new TQWidgetStack( page ); - connect(mPageStack, TQT_SIGNAL(aboutToShow(TQWidget *)), - TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mPageStack, TQ_SIGNAL(aboutToShow(TQWidget *)), + TQ_SIGNAL(aboutToShowPage(TQWidget *))); vbox->addWidget( mPageStack, 10 ); } else if( mFace == Tabbed ) @@ -180,8 +180,8 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) mTabControl = new TQTabWidget( this ); mTabControl->setMargin (KDialog::marginHint()); - connect(mTabControl, TQT_SIGNAL(currentChanged(TQWidget *)), - TQT_SIGNAL(aboutToShowPage(TQWidget *))); + connect(mTabControl, TQ_SIGNAL(currentChanged(TQWidget *)), + TQ_SIGNAL(aboutToShowPage(TQWidget *))); topLayout->addWidget( mTabControl, 10 ); } else if( mFace == Swallow ) @@ -197,7 +197,7 @@ KJanusWidget::KJanusWidget( TQWidget *parent, const char *name, int face ) } if ( kapp ) - connect(kapp,TQT_SIGNAL(tdedisplayFontChanged()),TQT_SLOT(slotFontChanged())); + connect(kapp,TQ_SIGNAL(tdedisplayFontChanged()),TQ_SLOT(slotFontChanged())); mValid = true; setSwallowedWidget(0); // Set default size if 'mFace' is Swallow. @@ -430,7 +430,7 @@ void KJanusWidget::InsertTreeListItem(const TQStringList &items, const TQPixmap void KJanusWidget::addPageWidget( TQFrame *page, const TQStringList &items, const TQString &header,const TQPixmap &pixmap ) { - connect(page, TQT_SIGNAL(destroyed(TQObject*)), TQT_SLOT(pageGone(TQObject*))); + connect(page, TQ_SIGNAL(destroyed(TQObject*)), TQ_SLOT(pageGone(TQObject*))); if( mFace == Tabbed ) { @@ -856,9 +856,9 @@ void KJanusWidget::unfoldTreeList( bool persist ) if( mFace == TreeList ) { if( persist ) - connect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) ); + connect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) ); else - disconnect( mTreeList, TQT_SIGNAL( collapsed( TQListViewItem * ) ), this, TQT_SLOT( slotReopen( TQListViewItem * ) ) ); + disconnect( mTreeList, TQ_SIGNAL( collapsed( TQListViewItem * ) ), this, TQ_SLOT( slotReopen( TQListViewItem * ) ) ); for( TQListViewItem * item = mTreeList->firstChild(); item; item = item->itemBelow() ) item->setOpen( true ); @@ -878,7 +878,7 @@ void KJanusWidget::addButtonBelowList( const TQString & text, TQObject * recv, c if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame ) { TQPushButton * button = new TQPushButton( text, d->mListFrame, "KJanusWidget::buttonBelowList" ); - connect( button, TQT_SIGNAL( clicked() ), recv, slot ); + connect( button, TQ_SIGNAL( clicked() ), recv, slot ); } } @@ -887,7 +887,7 @@ void KJanusWidget::addButtonBelowList( const KGuiItem & item, TQObject * recv, c if( ( mFace == TreeList || mFace == IconList ) && d->mListFrame ) { KPushButton * button = new KPushButton( item, d->mListFrame, "KJanusWidget::buttonBelowList" ); - connect( button, TQT_SIGNAL( clicked() ), recv, slot ); + connect( button, TQ_SIGNAL( clicked() ), recv, slot ); } } diff --git a/tdeui/kkeybutton.cpp b/tdeui/kkeybutton.cpp index 42799b2a2..08ba14342 100644 --- a/tdeui/kkeybutton.cpp +++ b/tdeui/kkeybutton.cpp @@ -71,7 +71,7 @@ KKeyButton::KKeyButton(TQWidget *parent, const char *name) d = new KKeyButtonPrivate; setFocusPolicy( TQWidget::StrongFocus ); m_bEditing = false; - connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(captureShortcut()) ); + connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(captureShortcut()) ); setShortcut( TDEShortcut(), true ); } diff --git a/tdeui/kkeydialog.cpp b/tdeui/kkeydialog.cpp index c6cc490ae..04f17821f 100644 --- a/tdeui/kkeydialog.cpp +++ b/tdeui/kkeydialog.cpp @@ -326,7 +326,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) TDEListViewSearchLine* listViewSearch = new TDEListViewSearchLine(this); searchLayout->addWidget(listViewSearch); slbl->setBuddy(listViewSearch); - connect(clearSearch, TQT_SIGNAL(pressed()), listViewSearch, TQT_SLOT(clear())); + connect(clearSearch, TQ_SIGNAL(pressed()), listViewSearch, TQ_SLOT(clear())); TQString wtstr = i18n("Search interactively for shortcut names (e.g. Copy) " "or combination of keys (e.g. Ctrl+C) by typing them here."); @@ -364,13 +364,13 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) d->pList->addColumn(i18n("Shortcut")); d->pList->addColumn(i18n("Alternate")); - connect( d->pList, TQT_SIGNAL(currentChanged(TQListViewItem*)), - TQT_SLOT(slotListItemSelected(TQListViewItem*)) ); + connect( d->pList, TQ_SIGNAL(currentChanged(TQListViewItem*)), + TQ_SLOT(slotListItemSelected(TQListViewItem*)) ); // handle double clicking an item - connect ( d->pList, TQT_SIGNAL ( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT ( captureCurrentItem()) ); - connect ( d->pList, TQT_SIGNAL ( spacePressed( TQListViewItem* )), TQT_SLOT( captureCurrentItem())); + connect ( d->pList, TQ_SIGNAL ( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT ( captureCurrentItem()) ); + connect ( d->pList, TQ_SIGNAL ( spacePressed( TQListViewItem* )), TQ_SLOT( captureCurrentItem())); // // CREATE CHOOSE KEY GROUP // @@ -396,7 +396,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //grid->addMultiCellWidget( rb, 1, 1, 1, 2 ); grid->addWidget( m_prbNone, 1, 0 ); TQWhatsThis::add( m_prbNone, i18n("The selected action will not be associated with any key.") ); - connect( m_prbNone, TQT_SIGNAL(clicked()), TQT_SLOT(slotNoKey()) ); + connect( m_prbNone, TQ_SIGNAL(clicked()), TQ_SLOT(slotNoKey()) ); m_prbDef = new TQRadioButton( i18n("default key", "De&fault"), d->fCArea ); d->kbGroup->insert( m_prbDef, DefaultKey ); @@ -404,7 +404,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //grid->addMultiCellWidget( rb, 2, 2, 1, 2 ); grid->addWidget( m_prbDef, 1, 1 ); TQWhatsThis::add( m_prbDef, i18n("This will bind the default key to the selected action. Usually a reasonable choice.") ); - connect( m_prbDef, TQT_SIGNAL(clicked()), TQT_SLOT(slotDefaultKey()) ); + connect( m_prbDef, TQ_SIGNAL(clicked()), TQ_SLOT(slotDefaultKey()) ); m_prbCustom = new TQRadioButton( i18n("C&ustom"), d->fCArea ); d->kbGroup->insert( m_prbCustom, CustomKey ); @@ -413,16 +413,16 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) grid->addWidget( m_prbCustom, 1, 2 ); TQWhatsThis::add( m_prbCustom, i18n("If this option is selected you can create a customized key binding for the" " selected action using the buttons below.") ); - connect( m_prbCustom, TQT_SIGNAL(clicked()), TQT_SLOT(slotCustomKey()) ); + connect( m_prbCustom, TQ_SIGNAL(clicked()), TQ_SLOT(slotCustomKey()) ); - //connect( d->kbGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( keyMode( int ) ) ); + //connect( d->kbGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( keyMode( int ) ) ); TQBoxLayout *pushLayout = new TQHBoxLayout( KDialog::spacingHint() ); grid->addLayout( pushLayout, 1, 3 ); d->pbtnShortcut = new KKeyButton(d->fCArea, "key"); d->pbtnShortcut->setEnabled( false ); - connect( d->pbtnShortcut, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)), TQT_SLOT(capturedShortcut(const TDEShortcut&)) ); + connect( d->pbtnShortcut, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)), TQ_SLOT(capturedShortcut(const TDEShortcut&)) ); grid->addRowSpacing( 1, d->pbtnShortcut->sizeHint().height() + 5 ); wtstr = i18n("Use this button to choose a new shortcut key. Once you click it, " @@ -451,7 +451,7 @@ void KKeyChooser::initGUI( ActionType type, bool bAllowLetterShortcuts ) //d->stdDict->setAutoDelete( true ); //if (type == Application || type == ApplicationGlobal) // readStdKeys(); - connect( kapp, TQT_SIGNAL( settingsChanged( int )), TQT_SLOT( slotSettingsChanged( int ))); + connect( kapp, TQ_SIGNAL( settingsChanged( int )), TQ_SLOT( slotSettingsChanged( int ))); if( allChoosers == NULL ) allChoosers = allChoosersDeleter.setObject( allChoosers, new TQValueList< KKeyChooser* > ); allChoosers->append( this ); @@ -1092,7 +1092,7 @@ KKeyDialog::KKeyDialog( KKeyChooser::ActionType type, bool bAllowLetterShortcuts { m_pKeyChooser = new KKeyChooser( this, type, bAllowLetterShortcuts ); setMainWidget( m_pKeyChooser ); - connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); + connect( this, TQ_SIGNAL(defaultClicked()), m_pKeyChooser, TQ_SLOT(allDefault()) ); TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); @@ -1104,7 +1104,7 @@ KKeyDialog::KKeyDialog( bool bAllowLetterShortcuts, TQWidget *parent, const char { m_pKeyChooser = new KKeyChooser( this, KKeyChooser::Application, bAllowLetterShortcuts ); setMainWidget( m_pKeyChooser ); - connect( this, TQT_SIGNAL(defaultClicked()), m_pKeyChooser, TQT_SLOT(allDefault()) ); + connect( this, TQ_SIGNAL(defaultClicked()), m_pKeyChooser, TQ_SLOT(allDefault()) ); TDEConfigGroup group( TDEGlobal::config(), "KKeyDialog Settings" ); TQSize sz = size(); diff --git a/tdeui/klanguagebutton.cpp b/tdeui/klanguagebutton.cpp index abbc4f5d3..ff6695dec 100644 --- a/tdeui/klanguagebutton.cpp +++ b/tdeui/klanguagebutton.cpp @@ -172,10 +172,10 @@ void KLanguageButton::insertSubmenu( const TQIconSet & icon, checkInsertPos( pi, text, index ); pi->insertItem( icon, text, p, count(), index ); m_ids->append( id ); - connect( p, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( p, TQT_SIGNAL( highlighted( int ) ), this, - TQT_SLOT( slotHighlighted( int ) ) ); + connect( p, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( p, TQ_SIGNAL( highlighted( int ) ), this, + TQ_SLOT( slotHighlighted( int ) ) ); } void KLanguageButton::insertSubmenu( const TQString &text, const TQString &id, @@ -218,10 +218,10 @@ void KLanguageButton::clear() d->button->setPopup( m_popup ); - connect( m_popup, TQT_SIGNAL( activated( int ) ), - TQT_SLOT( slotActivated( int ) ) ); - connect( m_popup, TQT_SIGNAL( highlighted( int ) ), - TQT_SLOT( slotHighlighted( int ) ) ); + connect( m_popup, TQ_SIGNAL( activated( int ) ), + TQ_SLOT( slotActivated( int ) ) ); + connect( m_popup, TQ_SIGNAL( highlighted( int ) ), + TQ_SLOT( slotHighlighted( int ) ) ); if ( !d->staticText ) { diff --git a/tdeui/klineedit.cpp b/tdeui/klineedit.cpp index a86fbaf9b..a012ef94f 100644 --- a/tdeui/klineedit.cpp +++ b/tdeui/klineedit.cpp @@ -136,7 +136,7 @@ void KLineEdit::init() d->autoSuggest = (mode == TDEGlobalSettings::CompletionMan || mode == TDEGlobalSettings::CompletionPopupAuto || mode == TDEGlobalSettings::CompletionAuto); - connect( this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(slotRestoreSelectionColors())); + connect( this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(slotRestoreSelectionColors())); TQPalette p = palette(); if ( !d->previousHighlightedTextColor.isValid() ) @@ -420,10 +420,10 @@ bool KLineEdit::copySqueezedText(bool clipboard) const return false; TQString t = d->squeezedText; t = t.mid(start, end - start); - disconnect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, 0); + disconnect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, 0); TQApplication::clipboard()->setText( t, clipboard ? TQClipboard::Clipboard : TQClipboard::Selection ); - connect( TQApplication::clipboard(), TQT_SIGNAL(selectionChanged()), this, - TQT_SLOT(clipboardChanged()) ); + connect( TQApplication::clipboard(), TQ_SIGNAL(selectionChanged()), this, + TQ_SLOT(clipboardChanged()) ); return true; } return false; @@ -821,7 +821,7 @@ void KLineEdit::mouseDoubleClickEvent( TQMouseEvent* e ) { possibleTripleClick=true; TQTimer::singleShot( TQApplication::doubleClickInterval(),this, - TQT_SLOT(tripleClickTimeout()) ); + TQ_SLOT(tripleClickTimeout()) ); } TQLineEdit::mouseDoubleClickEvent( e ); } @@ -879,8 +879,8 @@ TQPopupMenu *KLineEdit::createPopupMenu() if ( compObj() && !isReadOnly() && kapp->authorize("lineedit_text_completion") ) { TQPopupMenu *subMenu = new TQPopupMenu( popup ); - connect( subMenu, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( completionMenuActivated( int ) ) ); + connect( subMenu, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( completionMenuActivated( int ) ) ); popup->insertSeparator(); popup->insertItem( SmallIconSet("completion"), i18n("Text Completion"), @@ -1088,12 +1088,12 @@ void KLineEdit::setCompletionBox( TDECompletionBox *box ) d->completionBox = box; if ( handleSignals() ) { - connect( d->completionBox, TQT_SIGNAL(highlighted( const TQString& )), - TQT_SLOT(setTextWorkaround( const TQString& )) ); - connect( d->completionBox, TQT_SIGNAL(userCancelled( const TQString& )), - TQT_SLOT(userCancelled( const TQString& )) ); - connect( d->completionBox, TQT_SIGNAL( activated( const TQString& )), - TQT_SIGNAL(completionBoxActivated( const TQString& )) ); + connect( d->completionBox, TQ_SIGNAL(highlighted( const TQString& )), + TQ_SLOT(setTextWorkaround( const TQString& )) ); + connect( d->completionBox, TQ_SIGNAL(userCancelled( const TQString& )), + TQ_SLOT(userCancelled( const TQString& )) ); + connect( d->completionBox, TQ_SIGNAL( activated( const TQString& )), + TQ_SIGNAL(completionBoxActivated( const TQString& )) ); } } @@ -1271,12 +1271,12 @@ void KLineEdit::setCompletionObject( TDECompletion* comp, bool hsig ) { TDECompletion *oldComp = compObj(); if ( oldComp && handleSignals() ) - disconnect( oldComp, TQT_SIGNAL( matches( const TQStringList& )), - this, TQT_SLOT( setCompletedItems( const TQStringList& ))); + disconnect( oldComp, TQ_SIGNAL( matches( const TQStringList& )), + this, TQ_SLOT( setCompletedItems( const TQStringList& ))); if ( comp && hsig ) - connect( comp, TQT_SIGNAL( matches( const TQStringList& )), - this, TQT_SLOT( setCompletedItems( const TQStringList& ))); + connect( comp, TQ_SIGNAL( matches( const TQStringList& )), + this, TQ_SLOT( setCompletedItems( const TQStringList& ))); TDECompletionBase::setCompletionObject( comp, hsig ); } diff --git a/tdeui/klineedit.h b/tdeui/klineedit.h index fed0b4a25..6c56d6a3a 100644 --- a/tdeui/klineedit.h +++ b/tdeui/klineedit.h @@ -99,7 +99,7 @@ class KURL; * KLineEdit *edit = new KLineEdit( this, "mywidget" ); * TDECompletion *comp = edit->completionObject(); * // Connect to the return pressed signal - optional - * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(edit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * \endcode * * To use a customized completion objects or your @@ -110,7 +110,7 @@ class KURL; * KURLCompletion *comp = new KURLCompletion(); * edit->setCompletionObject( comp ); * // Connect to the return pressed signal - optional - * connect(edit,TQT_SIGNAL(returnPressed(const TQString&)),comp,TQT_SLOT(addItem(const TQString&))); + * connect(edit,TQ_SIGNAL(returnPressed(const TQString&)),comp,TQ_SLOT(addItem(const TQString&))); * \endcode * * Note if you specify your own completion object you have to either delete diff --git a/tdeui/klineeditdlg.cpp b/tdeui/klineeditdlg.cpp index 8fc0a9a4f..9bdd429ce 100644 --- a/tdeui/klineeditdlg.cpp +++ b/tdeui/klineeditdlg.cpp @@ -46,12 +46,12 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, edit = new KLineEdit( plainPage(), 0L ); edit->setMinimumWidth(edit->sizeHint().width() * 3); label->setBuddy(edit); // please "scheck" style - // connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); - connect( edit, TQT_SIGNAL(textChanged(const TQString&)), - TQT_SLOT(slotTextChanged(const TQString&)) ); + // connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(accept()) ); + connect( edit, TQ_SIGNAL(textChanged(const TQString&)), + TQ_SLOT(slotTextChanged(const TQString&)) ); topLayout->addWidget( edit, 1 ); - connect( this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(slotClear()) ); + connect( this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(slotClear()) ); edit->setText( _value ); if ( _value.isEmpty() ) { @@ -76,7 +76,7 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, edit = new KLineEdit( this, 0L ); edit->setMinimumWidth(edit->sizeHint().width() * 3); - connect( edit, TQT_SIGNAL(returnPressed()), TQT_SLOT(accept()) ); + connect( edit, TQ_SIGNAL(returnPressed()), TQ_SLOT(accept()) ); if ( _file_mode ) { completion = new KURLCompletion(); @@ -91,8 +91,8 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, if (_file_mode) { TQPushButton *browse = new TQPushButton(i18n("&Browse..."), this); layout->addWidget(browse, 1, 2, AlignCenter); - connect(browse, TQT_SIGNAL(clicked()), - TQT_SLOT(slotBrowse())); + connect(browse, TQ_SIGNAL(clicked()), + TQ_SLOT(slotBrowse())); } TQFrame *hLine = new TQFrame(this); @@ -104,17 +104,17 @@ KLineEditDlg::KLineEditDlg( const TQString&_text, const TQString& _value, TQPushButton *ok = bBox->addButton(KStdGuiItem::ok()); ok->setDefault(true); - connect( ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept())); + connect( ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept())); bBox->addStretch(1); TQPushButton *clear = bBox->addButton(KStdGuiItem::clear()); - connect( clear, TQT_SIGNAL(clicked()), TQT_SLOT(slotClear())); + connect( clear, TQ_SIGNAL(clicked()), TQ_SLOT(slotClear())); bBox->addStretch(1); TQPushButton *cancel = bBox->addButton(KStdGuiItem::cancel()); - connect( cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject())); + connect( cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject())); bBox->layout(); diff --git a/tdeui/knuminput.cpp b/tdeui/knuminput.cpp index fbbf4dd9a..0820fd29b 100644 --- a/tdeui/knuminput.cpp +++ b/tdeui/knuminput.cpp @@ -298,9 +298,9 @@ void KIntNumInput::init(int val, int _base) if (_base != 10) m_spin->setValidator(new KIntValidator(this, _base, "KNumInput::KIntValidtr")); - connect(m_spin, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(spinValueChanged(int))); - connect(this, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(slotEmitRelativeValueChanged(int))); + connect(m_spin, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(spinValueChanged(int))); + connect(this, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(slotEmitRelativeValueChanged(int))); setFocusProxy(m_spin); layout(true); @@ -346,8 +346,8 @@ void KIntNumInput::setRange(int lower, int upper, int step, bool slider) m_slider = new TQSlider(lower, upper, step, m_spin->value(), TQt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); - connect(m_slider, TQT_SIGNAL(valueChanged(int)), - m_spin, TQT_SLOT(setValue(int))); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), + m_spin, TQ_SLOT(setValue(int))); } // calculate (upper-lower)/10 without overflowing int's: @@ -616,10 +616,10 @@ void KDoubleNumInput::init(double value, double lower, double upper, d->spin = new KDoubleSpinBox( lower, upper, step, value, precision, this, "KDoubleNumInput::d->spin" ); setFocusProxy(d->spin); - connect( d->spin, TQT_SIGNAL(valueChanged(double)), - this, TQT_SIGNAL(valueChanged(double)) ); - connect( this, TQT_SIGNAL(valueChanged(double)), - this, TQT_SLOT(slotEmitRelativeValueChanged(double)) ); + connect( d->spin, TQ_SIGNAL(valueChanged(double)), + this, TQ_SIGNAL(valueChanged(double)) ); + connect( this, TQ_SIGNAL(valueChanged(double)), + this, TQ_SLOT(slotEmitRelativeValueChanged(double)) ); updateLegacyMembers(); @@ -754,8 +754,8 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, if( m_slider ) { // don't update the slider to avoid an endless recursion TQSpinBox * spin = d->spin; - disconnect(spin, TQT_SIGNAL(valueChanged(int)), - m_slider, TQT_SLOT(setValue(int)) ); + disconnect(spin, TQ_SIGNAL(valueChanged(int)), + m_slider, TQ_SLOT(setValue(int)) ); } d->spin->setRange( lower, upper, step, d->spin->precision() ); @@ -774,11 +774,11 @@ void KDoubleNumInput::setRange(double lower, double upper, double step, TQt::Horizontal, this); m_slider->setTickmarks(TQSlider::Below); // feedback line: when one moves, the other moves, too: - connect(m_slider, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(sliderMoved(int)) ); + connect(m_slider, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(sliderMoved(int)) ); } - connect(spin, TQT_SIGNAL(valueChanged(int)), - m_slider, TQT_SLOT(setValue(int)) ); + connect(spin, TQ_SIGNAL(valueChanged(int)), + m_slider, TQ_SLOT(setValue(int)) ); // calculate ( slmax - slmin ) / 10 without overflowing ints: int major = calcDiffByTen( slmax, slmin ); if ( !major ) major = slstep; // ### needed? @@ -1014,7 +1014,7 @@ KDoubleSpinBox::KDoubleSpinBox( TQWidget * parent, const char * name ) editor()->setAlignment( TQt::AlignRight ); d = new Private(); updateValidator(); - connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); + connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)) ); } KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, @@ -1026,7 +1026,7 @@ KDoubleSpinBox::KDoubleSpinBox( double lower, double upper, double step, d = new Private(); setRange( lower, upper, step, precision ); setValue( value ); - connect( this, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)) ); + connect( this, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)) ); } KDoubleSpinBox::~KDoubleSpinBox() { diff --git a/tdeui/kpanelmenu.cpp b/tdeui/kpanelmenu.cpp index 287208b66..f2a3d8f08 100644 --- a/tdeui/kpanelmenu.cpp +++ b/tdeui/kpanelmenu.cpp @@ -59,8 +59,8 @@ void KPanelMenu::init(const TQString& path) setInitialized( false ); d->startPath = path; - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); - connect(this, TQT_SIGNAL(aboutToShow()), TQT_SLOT(slotAboutToShow())); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotAboutToShow())); // setup cache timer TDEConfig *config = TDEGlobal::config(); @@ -99,8 +99,8 @@ void KPanelMenu::hideEvent(TQHideEvent *ev) { // start the cache timer if(d->clearDelay) { - disconnect(&(d->t), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClear())); - connect(&(d->t), TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClear())); + disconnect(&(d->t), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClear())); + connect(&(d->t), TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClear())); d->t.start(d->clearDelay, true); } TQPopupMenu::hideEvent(ev); diff --git a/tdeui/kpassdlg.cpp b/tdeui/kpassdlg.cpp index 4aebc70b6..c34801777 100644 --- a/tdeui/kpassdlg.cpp +++ b/tdeui/kpassdlg.cpp @@ -277,7 +277,7 @@ void KPasswordDialog::init() m_Keep = 0; m_keepWarnLbl->hide(); } - connect(cb, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotKeep(bool))); + connect(cb, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotKeep(bool))); m_pGrid->addWidget(cb, 9, 2, TQt::AlignLeft|TQt::AlignVCenter); // m_pGrid->addWidget(m_keepWarnLbl, 13, 2, TQt::AlignLeft|TQt::AlignVCenter); m_pGrid->addMultiCellWidget(m_keepWarnLbl, 13, 13, 0, 3); @@ -330,8 +330,8 @@ void KPasswordDialog::init() d->m_MatchLabel->setText(i18n("Passwords do not match")); - connect( m_pEdit, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(enableOkBtn()) ); - connect( m_pEdit2, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(enableOkBtn()) ); + connect( m_pEdit, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(enableOkBtn()) ); + connect( m_pEdit2, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(enableOkBtn()) ); enableOkBtn(); } @@ -446,7 +446,7 @@ void KPasswordDialog::slotKeep(bool keep) else { m_keepWarnLbl->hide(); } - TQTimer::singleShot(0, this, SLOT(slotLayout())); + TQTimer::singleShot(0, this, TQ_SLOT(slotLayout())); } m_Keep = keep; diff --git a/tdeui/kpassivepopup.cpp b/tdeui/kpassivepopup.cpp index 7821ec767..9da2a67ab 100644 --- a/tdeui/kpassivepopup.cpp +++ b/tdeui/kpassivepopup.cpp @@ -96,8 +96,8 @@ void KPassivePopup::init( int popupStyle ) setPalette(TQToolTip::palette()); setAutoMask(TRUE); } - connect( hideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( hide() ) ); - connect( this, TQT_SIGNAL( clicked() ), TQT_SLOT( hide() ) ); + connect( hideTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( hide() ) ); + connect( this, TQ_SIGNAL( clicked() ), TQ_SLOT( hide() ) ); } KPassivePopup::~KPassivePopup() diff --git a/tdeui/kpixmapregionselectorwidget.cpp b/tdeui/kpixmapregionselectorwidget.cpp index 48ee280a0..43cfa311d 100644 --- a/tdeui/kpixmapregionselectorwidget.cpp +++ b/tdeui/kpixmapregionselectorwidget.cpp @@ -141,12 +141,12 @@ TDEPopupMenu *KPixmapRegionSelectorWidget::createPopupMenu() popup->insertTitle(i18n("Image Operations")); TDEAction *action = new TDEAction(i18n("&Rotate Clockwise"), "object-rotate-right", - 0, this, TQT_SLOT(rotateClockwise()), + 0, this, TQ_SLOT(rotateClockwise()), popup, "rotateclockwise"); action->plug(popup); action = new TDEAction(i18n("Rotate &Counterclockwise"), "object-rotate-left", - 0, this, TQT_SLOT(rotateCounterclockwise()), + 0, this, TQ_SLOT(rotateCounterclockwise()), popup, "rotatecounterclockwise"); action->plug(popup); diff --git a/tdeui/kprogress.cpp b/tdeui/kprogress.cpp index 8fb050a11..1d259d820 100644 --- a/tdeui/kprogress.cpp +++ b/tdeui/kprogress.cpp @@ -196,9 +196,9 @@ KProgressDialog::KProgressDialog(TQWidget* parent, const char* name, mProgressBar = new KProgress(mainWidget); layout->addWidget(mProgressBar); - connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)), - this, TQT_SLOT(slotAutoActions(int))); - connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow())); + connect(mProgressBar, TQ_SIGNAL(percentageChanged(int)), + this, TQ_SLOT(slotAutoActions(int))); + connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow())); mShowTimer->start(mMinDuration, true); } diff --git a/tdeui/kprogressbox.cpp b/tdeui/kprogressbox.cpp index 2472207f4..12ddba0a4 100644 --- a/tdeui/kprogressbox.cpp +++ b/tdeui/kprogressbox.cpp @@ -86,9 +86,9 @@ KProgressBoxDialog::KProgressBoxDialog(TQWidget* parent, const char* name, mTextBox = new KTextEdit(mainWidget); layout->addWidget(mTextBox); - connect(mProgressBar, TQT_SIGNAL(percentageChanged(int)), - this, TQT_SLOT(slotAutoActions(int))); - connect(mShowTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAutoShow())); + connect(mProgressBar, TQ_SIGNAL(percentageChanged(int)), + this, TQ_SLOT(slotAutoActions(int))); + connect(mShowTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAutoShow())); mShowTimer->start(mMinDuration, true); } diff --git a/tdeui/kpushbutton.cpp b/tdeui/kpushbutton.cpp index 2baffc4ee..3c73de83e 100644 --- a/tdeui/kpushbutton.cpp +++ b/tdeui/kpushbutton.cpp @@ -106,8 +106,8 @@ void KPushButton::init( const KGuiItem &item ) if (kapp) { - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), - TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), + TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } } diff --git a/tdeui/krootpixmap.cpp b/tdeui/krootpixmap.cpp index 517821ea1..93cb1f456 100644 --- a/tdeui/krootpixmap.cpp +++ b/tdeui/krootpixmap.cpp @@ -67,14 +67,14 @@ void KRootPixmap::init() m_bActive = false; m_bCustomPaint = false; - connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int))); - connect(m_pTimer, TQT_SIGNAL(timeout()), TQT_SLOT(repaint())); + connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int))); + connect(m_pTimer, TQ_SIGNAL(timeout()), TQ_SLOT(repaint())); #ifdef Q_WS_X11 - connect(m_pPixmap, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); + connect(m_pPixmap, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); d->twin = new KWinModule( this ); - connect(d->twin, TQT_SIGNAL(windowChanged(WId, unsigned int)), TQT_SLOT(desktopChanged(WId, unsigned int))); - connect(d->twin, TQT_SIGNAL(currentDesktopChanged(int)), TQT_SLOT(desktopChanged(int))); + connect(d->twin, TQ_SIGNAL(windowChanged(WId, unsigned int)), TQ_SLOT(desktopChanged(WId, unsigned int))); + connect(d->twin, TQ_SIGNAL(currentDesktopChanged(int)), TQ_SLOT(desktopChanged(int))); #endif d->toplevel = m_pWidget->topLevelWidget(); diff --git a/tdeui/ksconfig.cpp b/tdeui/ksconfig.cpp index cb211e4df..8256ad72a 100644 --- a/tdeui/ksconfig.cpp +++ b/tdeui/ksconfig.cpp @@ -101,18 +101,18 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, TQGridLayout *glay = new TQGridLayout( this, 6, 3, 0, KDialog::spacingHint() ); cb1 = new TQCheckBox( i18n("Create &root/affix combinations" " not in dictionary"), this, "NoRootAffix" ); - connect( cb1, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sNoAff(bool)) ); + connect( cb1, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sNoAff(bool)) ); glay->addMultiCellWidget( cb1, 0, 0, 0, 2 ); cb2 = new TQCheckBox( i18n("Consider run-together &words" " as spelling errors"), this, "RunTogether" ); - connect( cb2, TQT_SIGNAL(toggled(bool)), TQT_SLOT(sRunTogether(bool)) ); + connect( cb2, TQ_SIGNAL(toggled(bool)), TQ_SLOT(sRunTogether(bool)) ); glay->addMultiCellWidget( cb2, 1, 1, 0, 2 ); dictcombo = new TQComboBox( this, "DictFromList" ); dictcombo->setInsertionPolicy( TQComboBox::NoInsertion ); - connect( dictcombo, TQT_SIGNAL (activated(int)), - this, TQT_SLOT (sSetDictionary(int)) ); + connect( dictcombo, TQ_SIGNAL (activated(int)), + this, TQ_SLOT (sSetDictionary(int)) ); glay->addMultiCellWidget( dictcombo, 2, 2, 1, 2 ); dictlist = new TQLabel( dictcombo, i18n("&Dictionary:"), this ); @@ -136,8 +136,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, encodingcombo->insertItem( "CP1251" ); encodingcombo->insertItem( "CP1255" ); - connect( encodingcombo, TQT_SIGNAL(activated(int)), this, - TQT_SLOT(sChangeEncoding(int)) ); + connect( encodingcombo, TQ_SIGNAL(activated(int)), this, + TQ_SLOT(sChangeEncoding(int)) ); glay->addMultiCellWidget( encodingcombo, 3, 3, 1, 2 ); TQLabel *tmpQLabel = new TQLabel( encodingcombo, i18n("&Encoding:"), this); @@ -149,8 +149,8 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, clientcombo->insertItem( i18n("Aspell") ); clientcombo->insertItem( i18n("Hspell") ); clientcombo->insertItem( i18n("Zemberek") ); - connect( clientcombo, TQT_SIGNAL (activated(int)), this, - TQT_SLOT (sChangeClient(int)) ); + connect( clientcombo, TQ_SIGNAL (activated(int)), this, + TQ_SLOT (sChangeClient(int)) ); glay->addMultiCellWidget( clientcombo, 4, 4, 1, 2 ); tmpQLabel = new TQLabel( clientcombo, i18n("&Client:"), this ); @@ -159,7 +159,7 @@ KSpellConfig::KSpellConfig( TQWidget *parent, const char *name, if( addHelpButton ) { TQPushButton *pushButton = new KPushButton( KStdGuiItem::help(), this ); - connect( pushButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(sHelp()) ); + connect( pushButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(sHelp()) ); glay->addWidget(pushButton, 5, 2); } @@ -926,7 +926,7 @@ KSpellConfig::sSetDictionary (int i) { setDictionary (langfnames[i]); setDictFromList (true); - TQTimer::singleShot( 0, this, TQT_SIGNAL( configChanged() ) ); + TQTimer::singleShot( 0, this, TQ_SIGNAL( configChanged() ) ); } void diff --git a/tdeui/kscrollview.cpp b/tdeui/kscrollview.cpp index b765e6a2c..f0d77be26 100644 --- a/tdeui/kscrollview.cpp +++ b/tdeui/kscrollview.cpp @@ -44,7 +44,7 @@ KScrollView::KScrollView( TQWidget *parent, const char *name, TQt::WFlags f ) : TQScrollView( parent, name, f ) { d = new KScrollViewPrivate; - connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(scrollTick())); + connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(scrollTick())); } KScrollView::~KScrollView() diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h index 79fa57100..cd3d53ad4 100644 --- a/tdeui/ksharedpixmap.h +++ b/tdeui/ksharedpixmap.h @@ -41,7 +41,7 @@ class TDESharedPixmapPrivate; * An example: copy from a shared pixmap: * \code * TDESharedPixmap *pm = new TDESharedPixmap; - * connect(pm, TQT_SIGNAL(done(bool)), TQT_SLOT(slotDone(bool))); + * connect(pm, TQ_SIGNAL(done(bool)), TQ_SLOT(slotDone(bool))); * pm->loadFromShared("My Pixmap"); * \endcode * diff --git a/tdeui/kstatusbar.cpp b/tdeui/kstatusbar.cpp index daa22f46b..ce6585686 100644 --- a/tdeui/kstatusbar.cpp +++ b/tdeui/kstatusbar.cpp @@ -44,8 +44,8 @@ KStatusBarLabel::KStatusBarLabel( const TQString& text, int _id, setAlignment( AlignHCenter | AlignVCenter | SingleLine ); - connect (this, TQT_SIGNAL(itemPressed(int)), parent, TQT_SIGNAL(pressed(int))); - connect (this, TQT_SIGNAL(itemReleased(int)), parent, TQT_SIGNAL(released(int))); + connect (this, TQ_SIGNAL(itemPressed(int)), parent, TQ_SIGNAL(pressed(int))); + connect (this, TQ_SIGNAL(itemReleased(int)), parent, TQ_SIGNAL(released(int))); } void KStatusBarLabel::mousePressEvent (TQMouseEvent *) diff --git a/tdeui/kstdaction.h b/tdeui/kstdaction.h index db1199757..76aad98a8 100644 --- a/tdeui/kstdaction.h +++ b/tdeui/kstdaction.h @@ -52,13 +52,13 @@ class TDEToggleFullScreenAction; * \code * TDEAction *newAct = new TDEAction(i18n("&New"), TQIconSet(BarIcon("document-new")), * TDEStdAccel::shortcut(TDEStdAccel::New), this, - * TQT_SLOT(fileNew()), actionCollection()); + * TQ_SLOT(fileNew()), actionCollection()); * \endcode * * You could drop that and replace it with: * * \code - * TDEAction *newAct = KStdAction::openNew(this, TQT_SLOT(fileNew()), + * TDEAction *newAct = KStdAction::openNew(this, TQ_SLOT(fileNew()), * actionCollection()); * \endcode * @@ -84,7 +84,7 @@ class TDEToggleFullScreenAction; * do something like: * * \code - * (void)KStdAction::cut(this, TQT_SLOT(editCut()), actionCollection(), "my_cut"); + * (void)KStdAction::cut(this, TQ_SLOT(editCut()), actionCollection(), "my_cut"); * \endcode * * Now, in your local XML resource file (e.g., yourappui.rc), simply @@ -102,14 +102,14 @@ class TDEToggleFullScreenAction; * * Another non-standard usage concerns instantiating the action in the * first place. Usually, you would use the member functions as - * shown above (e.g., KStdAction::cut(this, SLOT, parent)). You + * shown above (e.g., KStdAction::cut(this, TQ_SLOT, parent)). You * may, however, do this using the enums provided. This author can't * think of a reason why you would want to, but, hey, if you do, * here's how: * * \code - * (void)KStdAction::action(KStdAction::New, this, TQT_SLOT(fileNew()), actionCollection()); - * (void)KStdAction::action(KStdAction::Cut, this, TQT_SLOT(editCut()), actionCollection()); + * (void)KStdAction::action(KStdAction::New, this, TQ_SLOT(fileNew()), actionCollection()); + * (void)KStdAction::action(KStdAction::Cut, this, TQ_SLOT(editCut()), actionCollection()); * \endcode * * @author Kurt Granroth @@ -212,7 +212,7 @@ namespace KStdAction * Open a recently used document. The signature of the slot being called * is of the form slotURLSelected( const KURL & ). * @param recvr object to receive slot - * @param slot The TQT_SLOT to invoke when a URL is selected. The slot's + * @param slot The slot to invoke when a URL is selected. The slot's * signature is slotURLSelected( const KURL & ). * @param parent parent widget * @param name name of widget @@ -532,7 +532,7 @@ namespace KStdAction * Display the configure key bindings dialog. * * Note that you might be able to use the pre-built KXMLGUIFactory's fuction: - * KStdAction::keyBindings(guiFactory(), TQT_SLOT(configureShortcuts()), actionCollection()); + * KStdAction::keyBindings(guiFactory(), TQ_SLOT(configureShortcuts()), actionCollection()); */ TDEUI_EXPORT TDEAction *keyBindings(const TQObject *recvr, const char *slot, TDEActionCollection* parent, const char *name = 0 ); diff --git a/tdeui/kswitchlanguagedialog.cpp b/tdeui/kswitchlanguagedialog.cpp index 1f180c956..0d4563b6f 100644 --- a/tdeui/kswitchlanguagedialog.cpp +++ b/tdeui/kswitchlanguagedialog.cpp @@ -122,7 +122,7 @@ KSwitchLanguageDialog::KSwitchLanguageDialog( KPushButton *addLangButton = new KPushButton(i18n("Add fallback language"), d->page, "addLangButton"); TQToolTip::add(addLangButton, i18n("Adds one more language which will be used if other translations do not contain proper translation")); - connect(addLangButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddLanguageButton())); + connect(addLangButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddLanguageButton())); addButtonHorizontalLayout->addWidget(addLangButton); addButtonHorizontalLayout->addStretch(); @@ -291,9 +291,9 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo TQObject::connect( languageButton, - TQT_SIGNAL(activated( const TQString &)), + TQ_SIGNAL(activated( const TQString &)), p, - TQT_SLOT(languageOnButtonChanged(const TQString &)) + TQ_SLOT(languageOnButtonChanged(const TQString &)) ); LanguageRowData languageRowData; @@ -305,9 +305,9 @@ void KSwitchLanguageDialogPrivate::addLanguageButton(const TQString & languageCo TQObject::connect( removeButton, - TQT_SIGNAL(clicked()), + TQ_SIGNAL(clicked()), p, - TQT_SLOT(removeButtonClicked()) + TQ_SLOT(removeButtonClicked()) ); } diff --git a/tdeui/ksyntaxhighlighter.cpp b/tdeui/ksyntaxhighlighter.cpp index 80529ed34..8e46e14ec 100644 --- a/tdeui/ksyntaxhighlighter.cpp +++ b/tdeui/ksyntaxhighlighter.cpp @@ -300,11 +300,11 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, textEdit->viewport()->installEventFilter( this ); d->rehighlightRequest = new TQTimer(this); - connect( d->rehighlightRequest, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRehighlight() )); + connect( d->rehighlightRequest, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRehighlight() )); d->spellTimeout = new TQTimer(this); - connect( d->spellTimeout, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotKSpellNotResponding() )); + connect( d->spellTimeout, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotKSpellNotResponding() )); if ( d->globalConfig ) { d->spellKey = spellKey(); @@ -314,8 +314,8 @@ KDictSpellingHighlighter::KDictSpellingHighlighter( TQTextEdit *textEdit, } else { d->mDict = new TQDict(4001); - connect( d->mSpellConfig, TQT_SIGNAL( configChanged() ), - this, TQT_SLOT( slotLocalSpellConfigChanged() ) ); + connect( d->mSpellConfig, TQ_SIGNAL( configChanged() ), + this, TQ_SLOT( slotLocalSpellConfigChanged() ) ); } slotDictionaryChanged(); @@ -339,8 +339,8 @@ void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) if ( cg.readEntry("KSpell_DoSpellChecking") != "0" ) { if ( d->globalConfig ) { - connect( d->sDictionaryMonitor, TQT_SIGNAL( destroyed()), - this, TQT_SLOT( slotDictionaryChanged() )); + connect( d->sDictionaryMonitor, TQ_SIGNAL( destroyed()), + this, TQ_SLOT( slotDictionaryChanged() )); } if ( spell != d->spell ) { @@ -352,10 +352,10 @@ void KDictSpellingHighlighter::slotSpellReady( KSpell *spell ) for ( TQStringList::ConstIterator it = l.begin(); it != l.end(); ++it ) { d->spell->addPersonal( *it ); } - connect( spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int )), - this, TQT_SLOT( slotMisspelling( const TQString &, const TQStringList &, unsigned int ))); - connect( spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int )), - this, TQT_SLOT( slotCorrected( const TQString &, const TQString &, unsigned int ))); + connect( spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int )), + this, TQ_SLOT( slotMisspelling( const TQString &, const TQStringList &, unsigned int ))); + connect( spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int )), + this, TQ_SLOT( slotCorrected( const TQString &, const TQString &, unsigned int ))); d->checksRequested = 0; d->checksDone = 0; d->completeRehighlightRequired = true; @@ -514,7 +514,7 @@ void KDictSpellingHighlighter::slotRehighlight() } if (d->checksDone == d->checksRequested) d->completeRehighlightRequired = false; - TQTimer::singleShot( 0, this, TQT_SLOT( slotAutoDetection() )); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAutoDetection() )); } void KDictSpellingHighlighter::slotDictionaryChanged() @@ -526,7 +526,7 @@ void KDictSpellingHighlighter::slotDictionaryChanged() d->autoDict.clear(); d->spell = new KSpell( 0, i18n( "Incremental Spellcheck" ), this, - TQT_SLOT( slotSpellReady( KSpell * ) ), d->mSpellConfig ); + TQ_SLOT( slotSpellReady( KSpell * ) ), d->mSpellConfig ); } void KDictSpellingHighlighter::slotLocalSpellConfigChanged() @@ -657,7 +657,7 @@ bool KDictSpellingHighlighter::eventFilter( TQObject *o, TQEvent *e) if ( k->key() == Key_Space || k->key() == Key_Enter || k->key() == Key_Return ) { - TQTimer::singleShot( 0, this, TQT_SLOT( slotAutoDetection() )); + TQTimer::singleShot( 0, this, TQ_SLOT( slotAutoDetection() )); } } diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 7d4497d5a..295842f3f 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -77,12 +77,12 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) menu = new TDEPopupMenu( this ); menu->insertTitle( kapp->miniIcon(), kapp->caption() ); move( -1000, -1000 ); - KStdAction::quit(this, TQT_SLOT(maybeQuit()), d->actionCollection); + KStdAction::quit(this, TQ_SLOT(maybeQuit()), d->actionCollection); if (parentWidget()) { new TDEAction(i18n("Minimize"), "view-restore", TDEShortcut(), - this, TQT_SLOT( minimizeRestoreAction() ), + this, TQ_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); #ifdef Q_WS_X11 KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() ); diff --git a/tdeui/ktabbar.cpp b/tdeui/ktabbar.cpp index 01b228247..ed30bc466 100644 --- a/tdeui/ktabbar.cpp +++ b/tdeui/ktabbar.cpp @@ -43,12 +43,12 @@ KTabBar::KTabBar( TQWidget *parent, const char *name ) setMouseTracking( true ); mEnableCloseButtonTimer = new TQTimer( this ); - connect( mEnableCloseButtonTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( enableCloseButton() ) ); + connect( mEnableCloseButtonTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( enableCloseButton() ) ); mActivateDragSwitchTabTimer = new TQTimer( this ); - connect( mActivateDragSwitchTabTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( activateDragSwitchTab() ) ); + connect( mActivateDragSwitchTabTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( activateDragSwitchTab() ) ); - connect(this, TQT_SIGNAL(layoutChanged()), TQT_SLOT(onLayoutChange())); + connect(this, TQ_SIGNAL(layoutChanged()), TQ_SLOT(onLayoutChange())); } KTabBar::~KTabBar() @@ -201,7 +201,7 @@ void KTabBar::mouseMoveEvent( TQMouseEvent *e ) mEnableCloseButtonTimer->start( TQApplication::doubleClickInterval(), true ); } mHoverCloseButtonTab = t; - connect( mHoverCloseButton, TQT_SIGNAL( clicked() ), TQT_SLOT( closeButtonClicked() ) ); + connect( mHoverCloseButton, TQ_SIGNAL( clicked() ), TQ_SLOT( closeButtonClicked() ) ); return; } } diff --git a/tdeui/ktabctl.cpp b/tdeui/ktabctl.cpp index 0ff9f64e4..193e68a38 100644 --- a/tdeui/ktabctl.cpp +++ b/tdeui/ktabctl.cpp @@ -35,7 +35,7 @@ KTabCtl::KTabCtl(TQWidget *parent, const char *name) : TQWidget(parent, name) { tabs = new TQTabBar(this, "_tabbar"); - connect(tabs, TQT_SIGNAL(selected(int)), this, TQT_SLOT(showTab(int))); + connect(tabs, TQ_SIGNAL(selected(int)), this, TQ_SLOT(showTab(int))); tabs->move(2, 1); blBorder = true; diff --git a/tdeui/ktabwidget.cpp b/tdeui/ktabwidget.cpp index 10ed6ae76..bcccc4c9a 100644 --- a/tdeui/ktabwidget.cpp +++ b/tdeui/ktabwidget.cpp @@ -58,16 +58,16 @@ KTabWidget::KTabWidget( TQWidget *parent, const char *name, WFlags f ) setHoverCloseButtonDelayed(false); - connect(tabBar(), TQT_SIGNAL(contextMenu( int, const TQPoint & )), TQT_SLOT(contextMenu( int, const TQPoint & ))); - connect(tabBar(), TQT_SIGNAL(mouseDoubleClick( int )), TQT_SLOT(mouseDoubleClick( int ))); - connect(tabBar(), TQT_SIGNAL(mouseMiddleClick( int )), TQT_SLOT(mouseMiddleClick( int ))); - connect(tabBar(), TQT_SIGNAL(initiateDrag( int )), TQT_SLOT(initiateDrag( int ))); - connect(tabBar(), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); - connect(tabBar(), TQT_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQT_SLOT(receivedDropEvent( int, TQDropEvent * ))); - connect(tabBar(), TQT_SIGNAL(moveTab( int, int )), TQT_SLOT(moveTab( int, int ))); - connect(tabBar(), TQT_SIGNAL(closeRequest( int )), TQT_SLOT(closeRequest( int ))); + connect(tabBar(), TQ_SIGNAL(contextMenu( int, const TQPoint & )), TQ_SLOT(contextMenu( int, const TQPoint & ))); + connect(tabBar(), TQ_SIGNAL(mouseDoubleClick( int )), TQ_SLOT(mouseDoubleClick( int ))); + connect(tabBar(), TQ_SIGNAL(mouseMiddleClick( int )), TQ_SLOT(mouseMiddleClick( int ))); + connect(tabBar(), TQ_SIGNAL(initiateDrag( int )), TQ_SLOT(initiateDrag( int ))); + connect(tabBar(), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SIGNAL(testCanDecode(const TQDragMoveEvent *, bool & ))); + connect(tabBar(), TQ_SIGNAL(receivedDropEvent( int, TQDropEvent * )), TQ_SLOT(receivedDropEvent( int, TQDropEvent * ))); + connect(tabBar(), TQ_SIGNAL(moveTab( int, int )), TQ_SLOT(moveTab( int, int ))); + connect(tabBar(), TQ_SIGNAL(closeRequest( int )), TQ_SLOT(closeRequest( int ))); #ifndef TQT_NO_WHEELEVENT - connect(tabBar(), TQT_SIGNAL(wheelDelta( int )), TQT_SLOT(wheelDelta( int ))); + connect(tabBar(), TQ_SIGNAL(wheelDelta( int )), TQ_SLOT(wheelDelta( int ))); #endif } diff --git a/tdeui/ktextbrowser.cpp b/tdeui/ktextbrowser.cpp index a0331ccf7..f53973352 100644 --- a/tdeui/ktextbrowser.cpp +++ b/tdeui/ktextbrowser.cpp @@ -32,8 +32,8 @@ KTextBrowser::KTextBrowser( TQWidget *parent, const char *name, { // //1999-10-04 Espen Sand: Not required anymore ? - //connect( this, TQT_SIGNAL(highlighted(const TQString &)), - // this, TQT_SLOT(refChanged(const TQString &))); + //connect( this, TQ_SIGNAL(highlighted(const TQString &)), + // this, TQ_SLOT(refChanged(const TQString &))); } KTextBrowser::~KTextBrowser( void ) diff --git a/tdeui/ktextedit.cpp b/tdeui/ktextedit.cpp index 203a15add..d6c3f1264 100644 --- a/tdeui/ktextedit.cpp +++ b/tdeui/ktextedit.cpp @@ -229,16 +229,16 @@ TQPopupMenu *KTextEdit::createPopupMenu( const TQPoint &pos ) menu->insertSeparator(); id = menu->insertItem( SmallIconSet( "tools-check-spelling" ), i18n( "Check Spelling..." ), - this, TQT_SLOT( checkSpelling() ) ); + this, TQ_SLOT( checkSpelling() ) ); if( text().isEmpty() ) menu->setItemEnabled( id, false ); id = menu->insertItem( i18n( "Auto Spell Check" ), - this, TQT_SLOT( toggleAutoSpellCheck() ) ); + this, TQ_SLOT( toggleAutoSpellCheck() ) ); menu->setItemChecked(id, d->checkSpellingEnabled); menu->insertSeparator(); - id=menu->insertItem(i18n("Allow Tabulations"),this,TQT_SLOT(slotAllowTab())); + id=menu->insertItem(i18n("Allow Tabulations"),this,TQ_SLOT(slotAllowTab())); menu->setItemChecked(id, !tabChangesFocus()); } @@ -351,16 +351,16 @@ void KTextEdit::checkSpelling() { delete d->spell; d->spell = new KSpell( this, i18n( "Spell Checking" ), - this, TQT_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); + this, TQ_SLOT( slotSpellCheckReady( KSpell *) ), 0, true, true); - connect( d->spell, TQT_SIGNAL( death() ), - this, TQT_SLOT( spellCheckerFinished() ) ); + connect( d->spell, TQ_SIGNAL( death() ), + this, TQ_SLOT( spellCheckerFinished() ) ); - connect( d->spell, TQT_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ), - this, TQT_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); + connect( d->spell, TQ_SIGNAL( misspelling( const TQString &, const TQStringList &, unsigned int ) ), + this, TQ_SLOT( spellCheckerMisspelling( const TQString &, const TQStringList &, unsigned int ) ) ); - connect( d->spell, TQT_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ), - this, TQT_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); + connect( d->spell, TQ_SIGNAL( corrected( const TQString &, const TQString &, unsigned int ) ), + this, TQ_SLOT( spellCheckerCorrected( const TQString &, const TQString &, unsigned int ) ) ); } void KTextEdit::spellCheckerMisspelling( const TQString &text, const TQStringList &, unsigned int pos ) @@ -398,7 +398,7 @@ void KTextEdit::spellCheckerFinished() void KTextEdit::slotSpellCheckReady( KSpell *s ) { s->check( text() ); - connect( s, TQT_SIGNAL( done( const TQString & ) ), this, TQT_SLOT( slotSpellCheckDone( const TQString & ) ) ); + connect( s, TQ_SIGNAL( done( const TQString & ) ), this, TQ_SLOT( slotSpellCheckDone( const TQString & ) ) ); } void KTextEdit::slotSpellCheckDone( const TQString &s ) diff --git a/tdeui/ktimewidget.cpp b/tdeui/ktimewidget.cpp index 4d48b2129..aaa0be9e4 100644 --- a/tdeui/ktimewidget.cpp +++ b/tdeui/ktimewidget.cpp @@ -41,8 +41,8 @@ void KTimeWidget::init() d->timeWidget = new TQTimeEdit(this); - connect(d->timeWidget, TQT_SIGNAL(valueChanged(const TQTime &)), - TQT_SIGNAL(valueChanged(const TQTime &))); + connect(d->timeWidget, TQ_SIGNAL(valueChanged(const TQTime &)), + TQ_SIGNAL(valueChanged(const TQTime &))); } void KTimeWidget::setTime(const TQTime & time) diff --git a/tdeui/ktip.cpp b/tdeui/ktip.cpp index 76e44be0d..9480bf6ac 100644 --- a/tdeui/ktip.cpp +++ b/tdeui/ktip.cpp @@ -304,10 +304,10 @@ KTipDialog::KTipDialog(KTipDatabase *db, TQWidget *parent, const char *name) TDEConfigGroup config(kapp->config(), "TipOfDay"); mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true)); - connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextTip())); - connect(prev, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevTip())); - connect(ok, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept())); - connect(mTipOnStart, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(showOnStart(bool))); + connect(next, TQ_SIGNAL(clicked()), this, TQ_SLOT(nextTip())); + connect(prev, TQ_SIGNAL(clicked()), this, TQ_SLOT(prevTip())); + connect(ok, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept())); + connect(mTipOnStart, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(showOnStart(bool))); ok->setFocus(); diff --git a/tdeui/kurllabel.cpp b/tdeui/kurllabel.cpp index 434ef56bb..fcc020e20 100644 --- a/tdeui/kurllabel.cpp +++ b/tdeui/kurllabel.cpp @@ -50,7 +50,7 @@ public: MarginAltered(false), Timer (new TQTimer (label)) { - connect (Timer, TQT_SIGNAL (timeout ()), label, TQT_SLOT (updateColor ())); + connect (Timer, TQ_SIGNAL (timeout ()), label, TQ_SLOT (updateColor ())); } ~Private () diff --git a/tdeui/kurllabel.h b/tdeui/kurllabel.h index 797ee320c..ab5ff067e 100644 --- a/tdeui/kurllabel.h +++ b/tdeui/kurllabel.h @@ -51,8 +51,8 @@ class TQPixmap; * KURLLabel *address = new KURLLabel(this); * address->setText("My homepage"); * address->setURL("http://www.home.com/~me"); - * connect(address, TQT_SIGNAL(leftClickedURL(const TQString&)), - * TQT_SLOT(processMyURL(const TQString&))); + * connect(address, TQ_SIGNAL(leftClickedURL(const TQString&)), + * TQ_SLOT(processMyURL(const TQString&))); * \endcode * * In this example, the text "My homepage" would be displayed diff --git a/tdeui/kxmlguifactory.h b/tdeui/kxmlguifactory.h index b6b91ed47..775446308 100644 --- a/tdeui/kxmlguifactory.h +++ b/tdeui/kxmlguifactory.h @@ -183,7 +183,7 @@ class TDEUI_EXPORT KXMLGUIFactory : public TQObject * This slot can be connected dirrectly to the action to configure shortcuts. This is very simple to * do that by adding a single line * \code - * KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), actionCollection() ); + * KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), actionCollection() ); * \endcode * * @param bAllowLetterShortcuts Set to false if unmodified alphanumeric diff --git a/tdeui/tdeaboutapplication.cpp b/tdeui/tdeaboutapplication.cpp index e9eb2f4b8..636d336f2 100644 --- a/tdeui/tdeaboutapplication.cpp +++ b/tdeui/tdeaboutapplication.cpp @@ -96,8 +96,8 @@ void TDEAboutApplication::buildDialog( const TDEAboutData *aboutData ) url->setText(aboutData->homepage()); url->setURL(aboutData->homepage()); appPage->addWidget( url ); - connect( url, TQT_SIGNAL(leftClickedURL(const TQString &)), - this, TQT_SLOT(openURLSlot(const TQString &))); + connect( url, TQ_SIGNAL(leftClickedURL(const TQString &)), + this, TQ_SLOT(openURLSlot(const TQString &))); } int authorCount = aboutData->authors().count(); diff --git a/tdeui/tdeaboutdialog.cpp b/tdeui/tdeaboutdialog.cpp index b2b09e6a2..57bc84d24 100644 --- a/tdeui/tdeaboutdialog.cpp +++ b/tdeui/tdeaboutdialog.cpp @@ -96,15 +96,15 @@ TDEAboutContributor::TDEAboutContributor( TQWidget *_parent, const char *wname, kurl->setFloat(true); kurl->setUnderline(true); kurl->setMargin(0); - connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(emailClickedSlot(const TQString &))); + connect(kurl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(emailClickedSlot(const TQString &))); kurl = static_cast(mText[2]); kurl->setFloat(true); kurl->setUnderline(true); kurl->setMargin(0); - connect(kurl, TQT_SIGNAL(leftClickedURL(const TQString &)), - TQT_SLOT(urlClickedSlot(const TQString &))); + connect(kurl, TQ_SIGNAL(leftClickedURL(const TQString &)), + TQ_SLOT(urlClickedSlot(const TQString &))); mLabel[3]->setAlignment( AlignTop ); @@ -359,8 +359,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent, vbox = new TQVBoxLayout( mImageFrame, 1 ); mImageLabel = new KImageTrackLabel( mImageFrame ); - connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )), - TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); + connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )), + TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); vbox->addStretch(10); vbox->addWidget( mImageLabel ); vbox->addStretch(10); @@ -386,8 +386,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent, gbox->setColStretch( 2, 10 ); mImageLabel = new KImageTrackLabel( mImageFrame ); - connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )), - TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); + connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )), + TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); gbox->addWidget( mImageLabel, 1, 1 ); gbox->activate(); } @@ -410,8 +410,8 @@ TDEAboutContainerBase::TDEAboutContainerBase( int layoutType, TQWidget *_parent, vbox = new TQVBoxLayout( mImageFrame, 1 ); mImageLabel = new KImageTrackLabel( mImageFrame ); - connect( mImageLabel, TQT_SIGNAL(mouseTrack( int, const TQMouseEvent * )), - TQT_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); + connect( mImageLabel, TQ_SIGNAL(mouseTrack( int, const TQMouseEvent * )), + TQ_SLOT( slotMouseTrack( int, const TQMouseEvent * )) ); vbox->addStretch(10); vbox->addWidget( mImageLabel ); vbox->addStretch(10); @@ -475,10 +475,10 @@ TQFrame *TDEAboutContainerBase::addTextPage( const TQString &title, browser->setMinimumHeight( fontMetrics().lineSpacing()*numLines ); vbox->addWidget(browser); - connect(browser, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(browser, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(browser, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(browser, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); } else { @@ -527,10 +527,10 @@ TDEAboutContainer *TDEAboutContainerBase::addContainerPage( const TQString &titl innerAlignment ); mPageTab->addTab( container, title ); - connect(container, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(container, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); return container; } @@ -559,10 +559,10 @@ TDEAboutContainer *TDEAboutContainerBase::addScrolledContainerPage( scrollView->addChild( container ); - connect(container, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(container, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); return container; } @@ -591,10 +591,10 @@ TDEAboutContainer *TDEAboutContainerBase::addContainer( int childAlignment, 0, KDialog::spacingHint(), childAlignment, innerAlignment ); mTopLayout->addWidget( container, 0, childAlignment ); - connect(container, TQT_SIGNAL(urlClick(const TQString &)), - TQT_SLOT(slotUrlClick(const TQString &))); - connect(container, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - TQT_SLOT(slotMailClick(const TQString &,const TQString &))); + connect(container, TQ_SIGNAL(urlClick(const TQString &)), + TQ_SLOT(slotUrlClick(const TQString &))); + connect(container, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + TQ_SLOT(slotMailClick(const TQString &,const TQString &))); return container; } @@ -883,10 +883,10 @@ void TDEAboutContainer::addPerson( const TQString &_name, const TQString &_email TDEAboutContributor* const cont = new TDEAboutContributor( this, "pers", _name, _email, _url, _task, showHeader, showFrame, showBold ); - connect( cont, TQT_SIGNAL( openURL(const TQString&)), - this, TQT_SIGNAL( urlClick(const TQString &))); - connect( cont, TQT_SIGNAL( sendEmail(const TQString &, const TQString &)), - this, TQT_SIGNAL( mailClick(const TQString &, const TQString &))); + connect( cont, TQ_SIGNAL( openURL(const TQString&)), + this, TQ_SIGNAL( urlClick(const TQString &))); + connect( cont, TQ_SIGNAL( sendEmail(const TQString &, const TQString &)), + this, TQ_SIGNAL( mailClick(const TQString &, const TQString &))); } @@ -1011,10 +1011,10 @@ TDEAboutContributor::TDEAboutContributor(TQWidget* parent, const char* n) } setFrameStyle(TQFrame::Panel | TQFrame::Raised); // ----- - connect(email, TQT_SIGNAL(leftClickedURL(const TQString&)), - TQT_SLOT(emailClickedSlot(const TQString&))); - connect(url, TQT_SIGNAL(leftClickedURL(const TQString&)), - TQT_SLOT(urlClickedSlot(const TQString&))); + connect(email, TQ_SIGNAL(leftClickedURL(const TQString&)), + TQ_SLOT(emailClickedSlot(const TQString&))); + connect(url, TQ_SIGNAL(leftClickedURL(const TQString&)), + TQ_SLOT(urlClickedSlot(const TQString&))); // ############################################################ } @@ -1328,14 +1328,14 @@ TDEAboutWidget::TDEAboutWidget(TQWidget *_parent, const char *_name) logo->setFrameStyle(TQFrame::Panel | TQFrame::Raised); version->setAlignment(AlignCenter); // ----- - connect(author, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(author, TQT_SIGNAL(openURL(const TQString&)), - TQT_SLOT(openURLSlot(const TQString&))); - connect(maintainer, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(maintainer, TQT_SIGNAL(openURL(const TQString&)), - TQT_SLOT(openURLSlot(const TQString&))); + connect(author, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(author, TQ_SIGNAL(openURL(const TQString&)), + TQ_SLOT(openURLSlot(const TQString&))); + connect(maintainer, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(maintainer, TQ_SIGNAL(openURL(const TQString&)), + TQ_SLOT(openURLSlot(const TQString&))); // ################################################################# } @@ -1439,9 +1439,9 @@ TDEAboutWidget::addContributor(const TQString &_name, const TQString &_email, c->setURL(_url); c->setWork(_w); contributors.append(c); - connect(c, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(c, TQT_SIGNAL(openURL(const TQString&)), TQT_SLOT(openURLSlot(const TQString&))); + connect(c, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(c, TQ_SIGNAL(openURL(const TQString&)), TQ_SLOT(openURLSlot(const TQString&))); // ############################################################################ } @@ -1515,10 +1515,10 @@ TDEAboutDialog::TDEAboutDialog(TQWidget *_parent, const char *_name, bool modal) tqApp->quit(); } setMainWidget(about); - connect(about, TQT_SIGNAL(sendEmail(const TQString&, const TQString&)), - TQT_SLOT(sendEmailSlot(const TQString&, const TQString&))); - connect(about, TQT_SIGNAL(openURL(const TQString&)), - TQT_SLOT(openURLSlot(const TQString&))); + connect(about, TQ_SIGNAL(sendEmail(const TQString&, const TQString&)), + TQ_SLOT(sendEmailSlot(const TQString&, const TQString&))); + connect(about, TQ_SIGNAL(openURL(const TQString&)), + TQ_SLOT(openURLSlot(const TQString&))); // ################################################################# } @@ -1537,12 +1537,12 @@ TDEAboutDialog::TDEAboutDialog( int layoutType, const TQString &_caption, mContainerBase = new TDEAboutContainerBase( layoutType, this ); setMainWidget(mContainerBase); - connect( mContainerBase, TQT_SIGNAL(urlClick(const TQString &)), - this, TQT_SLOT(openURLSlot(const TQString &))); - connect( mContainerBase, TQT_SIGNAL(mailClick(const TQString &,const TQString &)), - this, TQT_SLOT(sendEmailSlot(const TQString &,const TQString &))); - connect( mContainerBase, TQT_SIGNAL(mouseTrack(int, const TQMouseEvent *)), - this, TQT_SLOT(mouseTrackSlot(int, const TQMouseEvent *))); + connect( mContainerBase, TQ_SIGNAL(urlClick(const TQString &)), + this, TQ_SLOT(openURLSlot(const TQString &))); + connect( mContainerBase, TQ_SIGNAL(mailClick(const TQString &,const TQString &)), + this, TQ_SLOT(sendEmailSlot(const TQString &,const TQString &))); + connect( mContainerBase, TQ_SIGNAL(mouseTrack(int, const TQMouseEvent *)), + this, TQ_SLOT(mouseTrackSlot(int, const TQMouseEvent *))); } diff --git a/tdeui/tdeaction.cpp b/tdeui/tdeaction.cpp index bf818fc03..d63e71feb 100644 --- a/tdeui/tdeaction.cpp +++ b/tdeui/tdeaction.cpp @@ -262,7 +262,7 @@ void TDEAction::initPrivate( const TQString& text, const TDEShortcut& cut, m_parentCollection->insert( this ); if ( receiver && slot ) - connect( this, TQT_SIGNAL( activated() ), receiver, slot ); + connect( this, TQ_SIGNAL( activated() ), receiver, slot ); if( !cut.isNull() && !qstrcmp( name(), "unnamed" ) ) kdWarning(129) << "TDEAction::initPrivate(): trying to assign a shortcut (" << cut.toStringInternal() << ") to an unnamed action." << endl; @@ -462,7 +462,7 @@ bool TDEAction::updateTDEAccelShortcut( TDEAccel* tdeaccel ) kdDebug(129) << "Inserting " << name() << ", " << d->text() << ", " << d->plainText() << endl; b = tdeaccel->insert( name(), d->plainText(), TQString::null, d->m_cut, - this, TQT_SLOT(slotActivated()), + this, TQ_SLOT(slotActivated()), isShortcutConfigurable(), isEnabled() ); } } @@ -478,7 +478,7 @@ void TDEAction::insertTDEAccel( TDEAccel* tdeaccel ) if ( !tdeaccel->actions().actionPtr( name() ) ) { if( updateTDEAccelShortcut( tdeaccel ) ) { d->m_tdeaccelList.append( tdeaccel ); - connect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + connect( tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); } } else @@ -496,7 +496,7 @@ void TDEAction::removeTDEAccel( TDEAccel* tdeaccel ) if( (*itr) == tdeaccel ) { tdeaccel->remove( name() ); accelList.remove( itr ); - disconnect( tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + disconnect( tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); break; } } @@ -664,12 +664,12 @@ int TDEAction::plug( TQWidget *w, int index ) else instance = TDEGlobal::instance(); id = menu->insertItem( d->iconSet( TDEIcon::Small, 0, instance ), d->text(), this,//dsweet - TQT_SLOT( slotPopupActivated() ), keyQt, + TQ_SLOT( slotPopupActivated() ), keyQt, -1, index ); } else id = menu->insertItem( d->text(), this, - TQT_SLOT( slotPopupActivated() ), + TQ_SLOT( slotPopupActivated() ), keyQt, -1, index ); // If the shortcut is already in a TDEAccel object, then @@ -686,7 +686,7 @@ int TDEAction::plug( TQWidget *w, int index ) menu->TQMenuData::setWhatsThis( id, whatsThisWithIcon() ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( menu, this ); @@ -706,8 +706,8 @@ int TDEAction::plug( TQWidget *w, int index ) if ( icon().isEmpty() && !iconSet().pixmap().isNull() ) // old code using TQIconSet directly { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index ); } else @@ -715,8 +715,8 @@ int TDEAction::plug( TQWidget *w, int index ) TQString icon = d->iconName(); if ( icon.isEmpty() ) icon = "unknown"; - bar->insertButton( icon, id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( icon, id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), d->isEnabled(), d->plainText(), index, instance ); } @@ -731,7 +731,7 @@ int TDEAction::plug( TQWidget *w, int index ) addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( bar, this ); @@ -791,10 +791,10 @@ void TDEAction::plugAccel(TDEAccel *kacc, bool configurable) d->m_tdeaccel = kacc; d->m_tdeaccel->insert(name(), d->plainText(), TQString::null, TDEShortcut(d->m_cut), - this, TQT_SLOT(slotActivated()), + this, TQ_SLOT(slotActivated()), configurable, isEnabled()); - connect(d->m_tdeaccel, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed())); - //connect(d->m_tdeaccel, TQT_SIGNAL(keycodeChanged()), this, TQT_SLOT(slotKeycodeChanged())); + connect(d->m_tdeaccel, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed())); + //connect(d->m_tdeaccel, TQ_SIGNAL(keycodeChanged()), this, TQ_SLOT(slotKeycodeChanged())); } else { @@ -1184,7 +1184,7 @@ void TDEAction::slotDestroyed() { if ( o == *itr ) { - disconnect( *itr, TQT_SIGNAL(destroyed()), this, TQT_SLOT(slotDestroyed()) ); + disconnect( *itr, TQ_SIGNAL(destroyed()), this, TQ_SLOT(slotDestroyed()) ); accelList.remove(itr); return; } diff --git a/tdeui/tdeaction.h b/tdeui/tdeaction.h index 355675e87..9bf232c49 100644 --- a/tdeui/tdeaction.h +++ b/tdeui/tdeaction.h @@ -109,12 +109,12 @@ class TDEMainWindow; * * \code * TQSignalMapper *desktopNumberMapper = new TQSignalMapper( this ); - * connect( desktopNumberMapper, TQT_SIGNAL( mapped( int ) ), - * this, TQT_SLOT( moveWindowToDesktop( int ) ) ); + * connect( desktopNumberMapper, TQ_SIGNAL( mapped( int ) ), + * this, TQ_SLOT( moveWindowToDesktop( int ) ) ); * * for ( uint i = 0; i < numberOfDesktops; ++i ) { * TDEAction *desktopAction = new TDEAction( i18n( "Move Window to Desktop %i" ).arg( i ), ... ); - * connect( desktopAction, TQT_SIGNAL( activated() ), desktopNumberMapper, TQT_SLOT( map() ) ); + * connect( desktopAction, TQ_SIGNAL( activated() ), desktopNumberMapper, TQ_SLOT( map() ) ); * desktopNumberMapper->setMapping( desktopAction, i ); * } * \endcode @@ -135,7 +135,7 @@ class TDEMainWindow; * \code * TDEAction *newAct = new TDEAction(i18n("&New"), "document-new", * TDEStdAccel::shortcut(TDEStdAccel::New), - * this, TQT_SLOT(fileNew()), + * this, TQ_SLOT(fileNew()), * actionCollection(), "new"); * \endcode * This line creates our action. It says that wherever this action is @@ -215,7 +215,7 @@ class TDEUI_EXPORT TDEAction : public TQObject public: /** * Constructs an action with text, potential keyboard - * shortcut, and a TQT_SLOT to call when this action is invoked by + * shortcut, and a slot to call when this action is invoked by * the user. * * If you do not want or have a keyboard shortcut, @@ -228,8 +228,8 @@ public: * * @param text The text that will be displayed. * @param cut The corresponding keyboard shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -239,7 +239,7 @@ public: /** * Constructs an action with text, icon, potential keyboard - * shortcut, and a TQT_SLOT to call when this action is invoked by + * shortcut, and a slot to call when this action is invoked by * the user. * * If you do not want or have a keyboard shortcut, set the @@ -251,8 +251,8 @@ public: * @param text The text that will be displayed. * @param pix The icon to display. * @param cut The corresponding keyboard shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -262,7 +262,7 @@ public: /** * Constructs an action with text, icon, potential keyboard - * shortcut, and a TQT_SLOT to call when this action is invoked by + * shortcut, and a slot to call when this action is invoked by * the user. The icon is loaded on demand later based on where it * is plugged in. * @@ -275,8 +275,8 @@ public: * @param text The text that will be displayed. * @param pix The icon to display. * @param cut The corresponding keyboard shortcut (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -290,8 +290,8 @@ public: * * @param item The KGuiItem with the label and (optional) icon. * @param cut The corresponding keyboard shortcut (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp index 3fff45564..ad9c4d102 100644 --- a/tdeui/tdeactionclasses.cpp +++ b/tdeui/tdeactionclasses.cpp @@ -507,7 +507,7 @@ void TDESelectAction::setupMenu() const for( uint id = 0; it != d->m_list.end(); ++it, ++id ) { TQString text = *it; if ( !text.isEmpty() ) - d->m_menu->insertItem( d->makeMenuText( text ), this, TQT_SLOT( slotActivated( int ) ), 0, id ); + d->m_menu->insertItem( d->makeMenuText( text ), this, TQ_SLOT( slotActivated( int ) ), 0, id ); else d->m_menu->insertSeparator(); } @@ -661,7 +661,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -670,8 +670,8 @@ int TDESelectAction::plug( TQWidget *widget, int index ) TDEToolBar* bar = static_cast( widget ); int id_ = TDEAction::getToolButtonID(); bar->insertCombo( comboItems(), id_, isEditable(), - TQT_SIGNAL( activated( const TQString & ) ), this, - TQT_SLOT( slotActivated( const TQString & ) ), isEnabled(), + TQ_SIGNAL( activated( const TQString & ) ), this, + TQ_SLOT( slotActivated( const TQString & ) ), isEnabled(), toolTip(), -1, index ); TQComboBox *cb = bar->getCombo( id_ ); @@ -691,7 +691,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); updateCurrentItem( containerCount() - 1 ); @@ -713,7 +713,7 @@ int TDESelectAction::plug( TQWidget *widget, int index ) menu->TQMenuData::setWhatsThis( id, wth ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -771,7 +771,7 @@ void TDESelectAction::slotActivated( int id ) setCurrentItem( id ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. - TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) ); } void TDESelectAction::slotActivated( const TQString &text ) @@ -793,7 +793,7 @@ void TDESelectAction::slotActivated( const TQString &text ) setCurrentItem( comboItems().findIndex( text ) ); // Delay this. Especially useful when the slot connected to activated() will re-create // the menu, e.g. in the recent files action. This prevents a crash. - TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) ); } void TDESelectAction::slotActivated() @@ -858,7 +858,7 @@ TDEListAction::TDEListAction( const TQString& text, const TDEShortcut& cut, { d = new TDEListActionPrivate; if ( receiver ) - connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot ); } TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix, @@ -885,7 +885,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix, { d = new TDEListActionPrivate; if ( receiver ) - connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot ); } TDEListAction::TDEListAction( const TQString& text, const TQString& pix, @@ -896,7 +896,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQString& pix, { d = new TDEListActionPrivate; if ( receiver ) - connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot ); + connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot ); } TDEListAction::TDEListAction( TQObject* parent, const char* name ) @@ -970,7 +970,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text, init(); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL&)), + connect( this, TQ_SIGNAL(urlSelected(const KURL&)), receiver, slot ); } @@ -1015,7 +1015,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text, init(); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL&)), + connect( this, TQ_SIGNAL(urlSelected(const KURL&)), receiver, slot ); } @@ -1034,7 +1034,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text, init(); if ( receiver ) - connect( this, TQT_SIGNAL(urlSelected(const KURL&)), + connect( this, TQ_SIGNAL(urlSelected(const KURL&)), receiver, slot ); } @@ -1052,10 +1052,10 @@ void TDERecentFilesAction::init() { TDERecentFilesAction *that = const_cast(this); that->d->m_popup = new TDEPopupMenu; - connect(d->m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow())); - connect(d->m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int))); - connect( this, TQT_SIGNAL( activated( const TQString& ) ), - this, TQT_SLOT( itemSelected( const TQString& ) ) ); + connect(d->m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow())); + connect(d->m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int))); + connect( this, TQ_SIGNAL( activated( const TQString& ) ), + this, TQ_SLOT( itemSelected( const TQString& ) ) ); setMenuAccelsEnabled( false ); } @@ -1284,13 +1284,13 @@ int TDERecentFilesAction::plug( TQWidget *widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotClicked() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotClicked() ), isEnabled(), plainText(), index, instance ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); bar->setDelayedPopup( id_, d->m_popup, true); @@ -1531,15 +1531,15 @@ int TDEFontAction::plug( TQWidget *w, int index ) TDEToolBar* bar = static_cast( w ); int id_ = TDEAction::getToolButtonID(); TDEFontCombo *cb = new TDEFontCombo( items(), bar ); - connect( cb, TQT_SIGNAL( activated( const TQString & ) ), - TQT_SLOT( slotActivated( const TQString & ) ) ); + connect( cb, TQ_SIGNAL( activated( const TQString & ) ), + TQ_SLOT( slotActivated( const TQString & ) ) ); cb->setEnabled( isEnabled() ); bar->insertWidget( id_, comboWidth(), cb, index ); cb->setMinimumWidth( cb->sizeHint().width() ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); updateCurrentItem( containerCount() - 1 ); @@ -1809,7 +1809,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) menu->setItemEnabled( id, false ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if ( m_parentCollection ) m_parentCollection->connectHighlight( menu, this ); @@ -1823,8 +1823,8 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index ); else { @@ -1835,8 +1835,8 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); } @@ -1845,7 +1845,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) if (!whatsThis().isEmpty()) TQWhatsThis::add( bar->getButton(id_), whatsThis() ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if (delayed()) { bar->setDelayedPopup( id_, popupMenu(), stickyMenu() ); @@ -1870,7 +1870,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index ) bar->setItemEnabled( id, false ); addContainer( bar, id ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -1950,8 +1950,8 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index ) int id_ = TDEAction::getToolButtonID(); if ( icon().isEmpty() && !iconSet().isNull() ) { - bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), isEnabled(), plainText(), index ); } else { @@ -1961,15 +1961,15 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, - TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ), + bar->insertButton( icon(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this, + TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ), isEnabled(), plainText(), index, instance ); } addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); if (delayed()) { bar->setDelayedPopup( id_, popupMenu(), stickyMenu() ); @@ -2036,9 +2036,9 @@ int TDEToggleToolBarAction::plug( TQWidget* w, int index ) if( m_toolBar ) { setChecked( m_toolBar->isVisible() ); - connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(setChecked(bool)) ); + connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(setChecked(bool)) ); // Also emit toggled when the toolbar's visibility changes (see comment in header) - connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SIGNAL(toggled(bool)) ); + connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SIGNAL(toggled(bool)) ); } else { setEnabled( false ); } @@ -2122,7 +2122,7 @@ KWidgetAction::KWidgetAction( TQWidget* widget, , m_widget( widget ) , m_autoSized( false ) { - connect( this, TQT_SIGNAL(enabled(bool)), widget, TQT_SLOT(setEnabled(bool)) ); + connect( this, TQ_SIGNAL(enabled(bool)), widget, TQ_SLOT(setEnabled(bool)) ); } KWidgetAction::~KWidgetAction() @@ -2173,8 +2173,8 @@ int KWidgetAction::plug( TQWidget* w, int index ) TQWhatsThis::add( m_widget, whatsThis() ); addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) ); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2187,7 +2187,7 @@ void KWidgetAction::unplug( TQWidget *w ) TDEToolBar* toolBar = (TDEToolBar*)m_widget->parent(); if ( toolBar == w ) { - disconnect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) ); + disconnect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) ); m_widget->reparent( 0L, TQPoint(), false /*showIt*/ ); } TDEAction::unplug( w ); @@ -2224,7 +2224,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) int id = menu->insertSeparator( index ); addContainer( menu, id ); - connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2236,7 +2236,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) addContainer( menuBar, id ); - connect( menuBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( menuBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2248,7 +2248,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index ) addContainer( toolBar, id ); - connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); return containerCount() - 1; } @@ -2265,8 +2265,8 @@ TDEPasteTextAction::TDEPasteTextAction( const TQString& text, : TDEAction( text, icon, cut, receiver, slot, parent, name ) { m_popup = new TDEPopupMenu; - connect(m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow())); - connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int))); + connect(m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow())); + connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int))); m_popup->setCheckable(true); m_mixedMode = true; } @@ -2297,13 +2297,13 @@ int TDEPasteTextAction::plug( TQWidget *widget, int index ) else instance = TDEGlobal::instance(); - bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this, - TQT_SLOT( slotActivated() ), isEnabled(), plainText(), + bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this, + TQ_SLOT( slotActivated() ), isEnabled(), plainText(), index, instance ); addContainer( bar, id_ ); - connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); + connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) ); bar->setDelayedPopup( id_, m_popup, true ); @@ -2357,7 +2357,7 @@ void TDEPasteTextAction::menuItemActivated( int id) if (reply.isValid()) kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl; } - TQTimer::singleShot(20, this, TQT_SLOT(slotActivated())); + TQTimer::singleShot(20, this, TQ_SLOT(slotActivated())); } void TDEPasteTextAction::slotActivated() diff --git a/tdeui/tdeactionclasses.h b/tdeui/tdeactionclasses.h index b865ccab5..f7536a6b3 100644 --- a/tdeui/tdeactionclasses.h +++ b/tdeui/tdeactionclasses.h @@ -88,8 +88,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -120,8 +120,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -132,8 +132,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -248,8 +248,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -280,8 +280,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -292,8 +292,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -355,8 +355,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -387,8 +387,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -399,8 +399,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -602,8 +602,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -634,8 +634,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -647,8 +647,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -717,8 +717,8 @@ public: /** * @param text The text that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a URL is selected. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a URL is selected. * Its signature is of the form slotURLSelected( const KURL & ). * @param parent This action's parent. * @param name An internal name for this action. @@ -757,8 +757,8 @@ public: * @param text The text that will be displayed. * @param pix The icons that go with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a URL is selected. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a URL is selected. * Its signature is of the form slotURLSelected( const KURL & ). * @param parent This action's parent. * @param name An internal name for this action. @@ -773,8 +773,8 @@ public: * @param text The text that will be displayed. * @param pix The dynamically loaded icon that goes with this action. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke when a URL is selected. + * @param receiver The slot's parent. + * @param slot The slot to invoke when a URL is selected. * Its signature is of the form slotURLSelected( const KURL & ). * @param parent This action's parent. * @param name An internal name for this action. @@ -1124,8 +1124,8 @@ public: * @param text The text that will be displayed. * @param icon The icon to display. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's owner. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's owner. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -1143,8 +1143,8 @@ public: * * @param item The text and icon that will be displayed. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's owner. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's owner. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -1269,8 +1269,8 @@ public: /** * Create a TDEToggleFullScreenAction * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param window the window that will switch to/from full screen mode * @param name An internal name for this action. @@ -1393,8 +1393,8 @@ public: * @param text The text that will be displayed. * @param icon The icon to display. * @param cut The corresponding keyboard accelerator (shortcut). - * @param receiver The SLOT's owner. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's owner. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/tdeui/tdeactioncollection.cpp b/tdeui/tdeactioncollection.cpp index d4d9576f5..7f4fe0191 100644 --- a/tdeui/tdeactioncollection.cpp +++ b/tdeui/tdeactioncollection.cpp @@ -503,19 +503,19 @@ void TDEActionCollection::connectHighlight( TQWidget *container, TDEAction *acti if ( ::tqt_cast( container ) ) { - connect( container, TQT_SIGNAL( highlighted( int ) ), - this, TQT_SLOT( slotMenuItemHighlighted( int ) ) ); - connect( container, TQT_SIGNAL( aboutToHide() ), - this, TQT_SLOT( slotMenuAboutToHide() ) ); + connect( container, TQ_SIGNAL( highlighted( int ) ), + this, TQ_SLOT( slotMenuItemHighlighted( int ) ) ); + connect( container, TQ_SIGNAL( aboutToHide() ), + this, TQ_SLOT( slotMenuAboutToHide() ) ); } else if ( ::tqt_cast( container ) ) { - connect( container, TQT_SIGNAL( highlighted( int, bool ) ), - this, TQT_SLOT( slotToolBarButtonHighlighted( int, bool ) ) ); + connect( container, TQ_SIGNAL( highlighted( int, bool ) ), + this, TQ_SLOT( slotToolBarButtonHighlighted( int, bool ) ) ); } - connect( container, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( slotDestroyed() ) ); + connect( container, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( slotDestroyed() ) ); d->m_dctHighlightContainers.insert( container, actionList ); } diff --git a/tdeui/tdeactioncollection.h b/tdeui/tdeactioncollection.h index c48bb5e2d..4de022d3e 100644 --- a/tdeui/tdeactioncollection.h +++ b/tdeui/tdeactioncollection.h @@ -69,10 +69,10 @@ typedef TQValueList TDEActionPtrList; * * \code * actionCollection()->setHighlightingEnabled(true); - * connect(actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ), - * statusBar(), TQT_SLOT( message( const TQString & ) ) ); - * connect(actionCollection(), TQT_SIGNAL( clearStatusText() ), - * statusBar(), TQT_SLOT( clear() ) ); + * connect(actionCollection(), TQ_SIGNAL( actionStatusText( const TQString & ) ), + * statusBar(), TQ_SLOT( message( const TQString & ) ) ); + * connect(actionCollection(), TQ_SIGNAL( clearStatusText() ), + * statusBar(), TQ_SLOT( clear() ) ); * \endcode */ class TDEUI_EXPORT TDEActionCollection : public TQObject diff --git a/tdeui/tdeactionselector.cpp b/tdeui/tdeactionselector.cpp index 23829597e..4ac8ac71d 100644 --- a/tdeui/tdeactionselector.cpp +++ b/tdeui/tdeactionselector.cpp @@ -99,18 +99,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) loadIcons(); - connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) ); - connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) ); - connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) ); - connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) ); - connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); - connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) ); + connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) ); + connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) ); + connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) ); + connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); d->availableListBox->installEventFilter( this ); d->selectedListBox->installEventFilter( this ); diff --git a/tdeui/tdecmodule.cpp b/tdeui/tdecmodule.cpp index d447ec17e..06ca1acda 100644 --- a/tdeui/tdecmodule.cpp +++ b/tdeui/tdecmodule.cpp @@ -98,7 +98,7 @@ void TDECModule::init() TDEConfigDialogManager* TDECModule::addConfig( TDEConfigSkeleton *config, TQWidget* widget ) { TDEConfigDialogManager* manager = new TDEConfigDialogManager( widget, config, name() ); - connect( manager, TQT_SIGNAL( widgetModified() ), TQT_SLOT( widgetChanged() )); + connect( manager, TQ_SIGNAL( widgetModified() ), TQ_SLOT( widgetChanged() )); d->managers.append( manager ); return manager; } diff --git a/tdeui/tdecompletionbox.cpp b/tdeui/tdecompletionbox.cpp index 5392e2c41..9ff9b95e5 100644 --- a/tdeui/tdecompletionbox.cpp +++ b/tdeui/tdecompletionbox.cpp @@ -66,14 +66,14 @@ TDECompletionBox::TDECompletionBox( TQWidget *parent, const char *name ) setVScrollBarMode( Auto ); setHScrollBarMode( AlwaysOff ); - connect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem * )), - TQT_SLOT( slotActivated( TQListBoxItem * )) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem * )), + TQ_SLOT( slotActivated( TQListBoxItem * )) ); // grmbl, just TQListBox workarounds :[ Thanks Volker. - connect( this, TQT_SIGNAL( currentChanged( TQListBoxItem * )), - TQT_SLOT( slotCurrentChanged() )); - connect( this, TQT_SIGNAL( clicked( TQListBoxItem * )), - TQT_SLOT( slotItemClicked( TQListBoxItem * )) ); + connect( this, TQ_SIGNAL( currentChanged( TQListBoxItem * )), + TQ_SLOT( slotCurrentChanged() )); + connect( this, TQ_SIGNAL( clicked( TQListBoxItem * )), + TQ_SLOT( slotItemClicked( TQListBoxItem * )) ); } TDECompletionBox::~TDECompletionBox() diff --git a/tdeui/tdeconfigdialog.cpp b/tdeui/tdeconfigdialog.cpp index df43defc5..274355910 100644 --- a/tdeui/tdeconfigdialog.cpp +++ b/tdeui/tdeconfigdialog.cpp @@ -65,11 +65,11 @@ TDEConfigDialog::TDEConfigDialog( TQWidget *parent, const char *name, setName(genericName); } - connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), this, TQT_SLOT(updateButtons())); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateWidgetsDefault())); - connect(this, TQT_SIGNAL(defaultClicked()), this, TQT_SLOT(updateButtons())); + connect(this, TQ_SIGNAL(okClicked()), this, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(applyClicked()), this, TQ_SLOT(updateButtons())); + connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateWidgetsDefault())); + connect(this, TQ_SIGNAL(defaultClicked()), this, TQ_SLOT(updateButtons())); d->manager = new TDEConfigDialogManager(this, config); setupManagerConnections(d->manager); @@ -150,12 +150,12 @@ void TDEConfigDialog::addPageInternal(TQWidget *page, void TDEConfigDialog::setupManagerConnections(TDEConfigDialogManager *manager) { - connect(manager, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(settingsChangedSlot())); - connect(manager, TQT_SIGNAL(widgetModified()), this, TQT_SLOT(updateButtons())); + connect(manager, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(settingsChangedSlot())); + connect(manager, TQ_SIGNAL(widgetModified()), this, TQ_SLOT(updateButtons())); - connect(this, TQT_SIGNAL(okClicked()), manager, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(applyClicked()), manager, TQT_SLOT(updateSettings())); - connect(this, TQT_SIGNAL(defaultClicked()), manager, TQT_SLOT(updateWidgetsDefault())); + connect(this, TQ_SIGNAL(okClicked()), manager, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(applyClicked()), manager, TQ_SLOT(updateSettings())); + connect(this, TQ_SIGNAL(defaultClicked()), manager, TQ_SLOT(updateWidgetsDefault())); } TDEConfigDialog* TDEConfigDialog::exists(const char* name) diff --git a/tdeui/tdeconfigdialog.h b/tdeui/tdeconfigdialog.h index 67a22b698..6ce44da22 100644 --- a/tdeui/tdeconfigdialog.h +++ b/tdeui/tdeconfigdialog.h @@ -52,8 +52,8 @@ class TDEConfigDialogManager; * TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", MySettings::self(), KDialogBase::IconList); * dialog->addPage(new General(0, "General"), i18n("General") ); * dialog->addPage(new Appearance(0, "Style"), i18n("Appearance") ); - * connect(dialog, TQT_SIGNAL(settingsChanged()), mainWidget, TQT_SLOT(loadSettings())); - * connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(loadSettings())); + * connect(dialog, TQ_SIGNAL(settingsChanged()), mainWidget, TQ_SLOT(loadSettings())); + * connect(dialog, TQ_SIGNAL(settingsChanged()), this, TQ_SLOT(loadSettings())); * dialog->show(); * } * \endcode diff --git a/tdeui/tdefontcombo.cpp b/tdeui/tdefontcombo.cpp index cc3b090b7..31cc23849 100644 --- a/tdeui/tdefontcombo.cpp +++ b/tdeui/tdefontcombo.cpp @@ -283,7 +283,7 @@ void TDEFontCombo::init() setInsertionPolicy(NoInsertion); setAutoCompletion(true); setSize(12); - connect( this, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotModified(int))); + connect( this, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotModified(int))); } TDEFontCombo::~TDEFontCombo() diff --git a/tdeui/tdefontdialog.cpp b/tdeui/tdefontdialog.cpp index eb2186ca5..2b657a7a8 100644 --- a/tdeui/tdefontdialog.cpp +++ b/tdeui/tdefontdialog.cpp @@ -131,7 +131,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, familyLayout->addSpacing( checkBoxGap ); if (diff) { familyCheckbox = new TQCheckBox(i18n("Font"), page); - connect(familyCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); + connect(familyCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox())); familyLayout->addWidget(familyCheckbox, 0, TQt::AlignLeft); TQString familyCBToolTipText = i18n("Change font family?"); @@ -150,7 +150,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, TQHBoxLayout *styleLayout = new TQHBoxLayout(); if (diff) { styleCheckbox = new TQCheckBox(i18n("Font style"), page); - connect(styleCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); + connect(styleCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox())); styleLayout->addWidget(styleCheckbox, 0, TQt::AlignLeft); TQString styleCBToolTipText = i18n("Change font style?"); @@ -170,7 +170,7 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, TQHBoxLayout *sizeLayout = new TQHBoxLayout(); if (diff) { sizeCheckbox = new TQCheckBox(i18n("Size"),page); - connect(sizeCheckbox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggled_checkbox())); + connect(sizeCheckbox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggled_checkbox())); sizeLayout->addWidget(sizeCheckbox, 0, TQt::AlignLeft); TQString sizeCBToolTipText = i18n("Change font size?"); @@ -200,8 +200,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, i18n("Here you can choose the font family to be used." ); TQWhatsThis::add( familyListBox, fontFamilyWhatsThisText ); TQWhatsThis::add(diff?(TQWidget *) familyCheckbox:(TQWidget *) familyLabel, fontFamilyWhatsThisText ); - connect(familyListBox, TQT_SIGNAL(highlighted(const TQString &)), - TQT_SLOT(family_chosen_slot(const TQString &))); + connect(familyListBox, TQ_SIGNAL(highlighted(const TQString &)), + TQ_SLOT(family_chosen_slot(const TQString &))); if(!fontList.isEmpty()) { familyListBox->insertStringList(fontList); @@ -230,8 +230,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, styleListBox->setMinimumHeight( minimumListHeight( styleListBox, visibleListSize ) ); - connect(styleListBox, TQT_SIGNAL(highlighted(const TQString &)), - TQT_SLOT(style_chosen_slot(const TQString &))); + connect(styleListBox, TQ_SIGNAL(highlighted(const TQString &)), + TQ_SLOT(style_chosen_slot(const TQString &))); sizeListBox = new TDEListBox( page, "sizeListBox"); @@ -280,11 +280,11 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, sizeListBox->setMinimumHeight( minimumListHeight( sizeListBox, visibleListSize ) ); - connect( sizeOfFont, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT(size_value_slot(int))); + connect( sizeOfFont, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT(size_value_slot(int))); - connect( sizeListBox, TQT_SIGNAL(highlighted(const TQString&)), - TQT_SLOT(size_chosen_slot(const TQString&)) ); + connect( sizeListBox, TQ_SIGNAL(highlighted(const TQString&)), + TQ_SLOT(size_chosen_slot(const TQString&)) ); sizeListBox->setSelected(sizeListBox->findItem(TQString::number(10)), true); // default to 10pt. row ++; @@ -302,8 +302,8 @@ TDEFontChooser::TDEFontChooser(TQWidget *parent, const char *name, i18n("This sample text illustrates the current settings. " "You may edit it to test special characters." ); TQWhatsThis::add( sampleEdit, sampleEditWhatsThisText ); - connect(this, TQT_SIGNAL(fontSelected(const TQFont &)), - TQT_SLOT(displaySample(const TQFont &))); + connect(this, TQ_SIGNAL(fontSelected(const TQFont &)), + TQ_SLOT(displaySample(const TQFont &))); TQVBoxLayout *vbox; if( makeFrame ) diff --git a/tdeui/tdefontrequester.cpp b/tdeui/tdefontrequester.cpp index 2cabede01..d5dd3b08c 100644 --- a/tdeui/tdefontrequester.cpp +++ b/tdeui/tdefontrequester.cpp @@ -43,7 +43,7 @@ TDEFontRequester::TDEFontRequester( TQWidget *parent, const char *name, layout->addWidget( m_sampleLabel, 1 ); layout->addWidget( m_button ); - connect( m_button, TQT_SIGNAL( clicked() ), TQT_SLOT( buttonClicked() ) ); + connect( m_button, TQ_SIGNAL( clicked() ), TQ_SLOT( buttonClicked() ) ); displaySampleText(); setToolTip(); diff --git a/tdeui/tdelistbox.cpp b/tdeui/tdelistbox.cpp index a308f5cbe..256e1669d 100644 --- a/tdeui/tdelistbox.cpp +++ b/tdeui/tdelistbox.cpp @@ -30,22 +30,22 @@ TDEListBox::TDEListBox( TQWidget *parent, const char *name, WFlags f ) : TQListBox( parent, name, f ), d(0) { - connect( this, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), - this, TQT_SLOT( slotOnItem( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ), + this, TQ_SLOT( slotOnItem( TQListBoxItem * ) ) ); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } m_pCurrentItem = 0L; m_pAutoSelect = new TQTimer( this ); - connect( m_pAutoSelect, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoSelect() ) ); + connect( m_pAutoSelect, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoSelect() ) ); } void TDEListBox::slotOnItem( TQListBoxItem *item ) @@ -75,27 +75,27 @@ void TDEListBox::slotSettingsChanged(int category) return; m_bUseSingle = TDEGlobalSettings::singleClick(); - disconnect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, + disconnect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ) ); -// disconnect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem *, +// disconnect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQListBoxItem *, +// this, TQ_SLOT( slotExecute( TQListBoxItem *, // const TQPoint & ) ) ); if( m_bUseSingle ) { - connect( this, TQT_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, + connect( this, TQ_SIGNAL( mouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ), - this, TQT_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, + this, TQ_SLOT( slotMouseButtonClicked( int, TQListBoxItem *, const TQPoint & ) ) ); } else { -// connect( this, TQT_SIGNAL( doubleClicked( TQListBoxItem *, +// connect( this, TQ_SIGNAL( doubleClicked( TQListBoxItem *, // const TQPoint & ) ), -// this, TQT_SLOT( slotExecute( TQListBoxItem *, +// this, TQ_SLOT( slotExecute( TQListBoxItem *, // const TQPoint & ) ) ); } diff --git a/tdeui/tdelistview.cpp b/tdeui/tdelistview.cpp index 4935bf566..868be813d 100644 --- a/tdeui/tdelistview.cpp +++ b/tdeui/tdelistview.cpp @@ -109,9 +109,9 @@ public: initialFileManagerItem(0) { renameable.append(0); - connect(editor, TQT_SIGNAL(done(TQListViewItem*,int)), listview, TQT_SLOT(doneEditing(TQListViewItem*,int))); - connect(editor, TQT_SIGNAL(renameNext(TQListViewItem*,int)), listview, TQT_SLOT(renameNextProxy(TQListViewItem*,int))); - connect(editor, TQT_SIGNAL(renamePrev(TQListViewItem*,int)), listview, TQT_SLOT(renamePrevProxy(TQListViewItem*,int))); + connect(editor, TQ_SIGNAL(done(TQListViewItem*,int)), listview, TQ_SLOT(doneEditing(TQListViewItem*,int))); + connect(editor, TQ_SIGNAL(renameNext(TQListViewItem*,int)), listview, TQ_SLOT(renameNextProxy(TQListViewItem*,int))); + connect(editor, TQ_SIGNAL(renamePrev(TQListViewItem*,int)), listview, TQ_SLOT(renamePrevProxy(TQListViewItem*,int))); } ~TDEListViewPrivate () @@ -189,9 +189,9 @@ TDEListViewLineEdit::TDEListViewLineEdit(TDEListView *parent) { setFrame( false ); hide(); - connect( parent, TQT_SIGNAL( selectionChanged() ), TQT_SLOT( slotSelectionChanged() )); - connect( parent, TQT_SIGNAL( itemRemoved( TQListViewItem * ) ), - TQT_SLOT( slotItemRemoved( TQListViewItem * ) )); + connect( parent, TQ_SIGNAL( selectionChanged() ), TQ_SLOT( slotSelectionChanged() )); + connect( parent, TQ_SIGNAL( itemRemoved( TQListViewItem * ) ), + TQ_SLOT( slotItemRemoved( TQListViewItem * ) )); } TDEListViewLineEdit::~TDEListViewLineEdit() @@ -459,42 +459,42 @@ TDEListView::TDEListView( TQWidget *parent, const char *name ) { setDragAutoScroll(true); - connect( this, TQT_SIGNAL( onViewport() ), - this, TQT_SLOT( slotOnViewport() ) ); - connect( this, TQT_SIGNAL( onItem( TQListViewItem * ) ), - this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), + this, TQ_SLOT( slotOnViewport() ) ); + connect( this, TQ_SIGNAL( onItem( TQListViewItem * ) ), + this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) ); - connect (this, TQT_SIGNAL(contentsMoving(int,int)), - this, TQT_SLOT(cleanDropVisualizer())); - connect (this, TQT_SIGNAL(contentsMoving(int,int)), - this, TQT_SLOT(cleanItemHighlighter())); + connect (this, TQ_SIGNAL(contentsMoving(int,int)), + this, TQ_SLOT(cleanDropVisualizer())); + connect (this, TQ_SIGNAL(contentsMoving(int,int)), + this, TQ_SLOT(cleanItemHighlighter())); slotSettingsChanged(TDEApplication::SETTINGS_MOUSE); if (kapp) { - connect( kapp, TQT_SIGNAL( settingsChanged(int) ), TQT_SLOT( slotSettingsChanged(int) ) ); + connect( kapp, TQ_SIGNAL( settingsChanged(int) ), TQ_SLOT( slotSettingsChanged(int) ) ); kapp->addKipcEventMask( KIPC::SettingsChanged ); } - connect(&d->autoSelect, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotAutoSelect() ) ); - connect(&d->dragExpand, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotDragExpand() ) ); + connect(&d->autoSelect, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotAutoSelect() ) ); + connect(&d->dragExpand, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotDragExpand() ) ); // context menu handling if (d->showContextMenusOnPress) { - connect (this, TQT_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect (this, TQ_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } else { - connect (this, TQT_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect (this, TQ_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } - connect (this, TQT_SIGNAL (menuShortCutPressed (TDEListView*, TQListViewItem*)), - this, TQT_SLOT (emitContextMenu (TDEListView*, TQListViewItem*))); + connect (this, TQ_SIGNAL (menuShortCutPressed (TDEListView*, TQListViewItem*)), + this, TQ_SLOT (emitContextMenu (TDEListView*, TQListViewItem*))); d->alternateBackground = TDEGlobalSettings::alternateBackgroundColor(); } @@ -585,12 +585,12 @@ void TDEListView::slotSettingsChanged(int category) d->dragDelay = TDEGlobalSettings::dndEventDelay(); d->bUseSingle = TDEGlobalSettings::singleClick(); - disconnect(this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int))); + disconnect(this, TQ_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT (slotMouseButtonClicked (int, TQListViewItem*, const TQPoint &, int))); if( d->bUseSingle ) - connect (this, TQT_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int))); + connect (this, TQ_SIGNAL (mouseButtonClicked (int, TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT (slotMouseButtonClicked( int, TQListViewItem*, const TQPoint &, int))); d->bChangeCursorOverItem = TDEGlobalSettings::changeCursorOverIcon(); if ( !d->disableAutoSelection ) @@ -607,17 +607,17 @@ void TDEListView::slotSettingsChanged(int category) if (d->showContextMenusOnPress) { - disconnect (0L, 0L, this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + disconnect (0L, 0L, this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL (rightButtonPressed (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } else { - disconnect (0L, 0L, this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + disconnect (0L, 0L, this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); - connect(this, TQT_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), - this, TQT_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); + connect(this, TQ_SIGNAL (rightButtonClicked (TQListViewItem*, const TQPoint&, int)), + this, TQ_SLOT (emitContextMenu (TQListViewItem*, const TQPoint&, int))); } break; diff --git a/tdeui/tdelistviewsearchline.cpp b/tdeui/tdelistviewsearchline.cpp index 2ed43ba4b..88ac3746c 100644 --- a/tdeui/tdelistviewsearchline.cpp +++ b/tdeui/tdelistviewsearchline.cpp @@ -63,15 +63,15 @@ TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, TDEListView *list d->listView = listView; - connect(this, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(queueSearch(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(queueSearch(const TQString &))); if(listView) { - connect(listView, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(listViewDeleted())); + connect(listView, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(listViewDeleted())); - connect(listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + connect(listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); } else setEnabled(false); @@ -84,8 +84,8 @@ TDEListViewSearchLine::TDEListViewSearchLine(TQWidget *parent, const char *name) d->listView = 0; - connect(this, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(queueSearch(const TQString &))); + connect(this, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(queueSearch(const TQString &))); setEnabled(false); } @@ -178,21 +178,21 @@ void TDEListViewSearchLine::setSearchColumns(const TQValueList &columns) void TDEListViewSearchLine::setListView(TDEListView *lv) { if(d->listView) { - disconnect(d->listView, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(listViewDeleted())); + disconnect(d->listView, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(listViewDeleted())); - disconnect(d->listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + disconnect(d->listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); } d->listView = lv; if(lv) { - connect(d->listView, TQT_SIGNAL(destroyed()), - this, TQT_SLOT(listViewDeleted())); + connect(d->listView, TQ_SIGNAL(destroyed()), + this, TQ_SLOT(listViewDeleted())); - connect(d->listView, TQT_SIGNAL(itemAdded(TQListViewItem *)), - this, TQT_SLOT(itemAdded(TQListViewItem *))); + connect(d->listView, TQ_SIGNAL(itemAdded(TQListViewItem *)), + this, TQ_SLOT(itemAdded(TQListViewItem *))); } setEnabled(bool(lv)); @@ -237,7 +237,7 @@ TQPopupMenu *TDEListViewSearchLine::createPopupMenu() if (d->listView->columns()>1) { TQPopupMenu *subMenu = new TQPopupMenu(popup); - connect(subMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(searchColumnsMenuActivated(int))); + connect(subMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(searchColumnsMenuActivated(int))); popup->insertSeparator(); popup->insertItem(i18n("Search Columns"), subMenu); @@ -285,7 +285,7 @@ void TDEListViewSearchLine::queueSearch(const TQString &search) { d->queuedSearches++; d->search = search; - TQTimer::singleShot(200, this, TQT_SLOT(activateSearch())); + TQTimer::singleShot(200, this, TQ_SLOT(activateSearch())); } void TDEListViewSearchLine::activateSearch() @@ -425,7 +425,7 @@ TDEListViewSearchLineWidget::TDEListViewSearchLineWidget(TDEListView *listView, setSpacing(5); - TQTimer::singleShot(0, this, TQT_SLOT(createWidgets())); + TQTimer::singleShot(0, this, TQ_SLOT(createWidgets())); } TDEListViewSearchLineWidget::~TDEListViewSearchLineWidget() @@ -460,7 +460,7 @@ void TDEListViewSearchLineWidget::createWidgets() label->setBuddy(d->searchLine); label->show(); - connect(d->clearButton, TQT_SIGNAL(clicked()), d->searchLine, TQT_SLOT(clear())); + connect(d->clearButton, TQ_SIGNAL(clicked()), d->searchLine, TQ_SLOT(clear())); } TDEListViewSearchLine *TDEListViewSearchLineWidget::searchLine() const diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp index 9905d2991..2a112f196 100644 --- a/tdeui/tdemainwindow.cpp +++ b/tdeui/tdemainwindow.cpp @@ -184,7 +184,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags) mHelpMenu = 0; kapp->setTopWidget( this ); actionCollection()->setWidget( this ); - connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown())); + connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); if( !memberList ) memberList = new TQPtrList; @@ -340,8 +340,8 @@ TDEPopupMenu* TDEMainWindow::helpMenu( const TQString &aboutAppText, bool showWh if ( !mHelpMenu ) return 0; - connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ), - this, TQT_SLOT( showAboutApplication() ) ); + connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ), + this, TQ_SLOT( showAboutApplication() ) ); } return mHelpMenu->menu(); @@ -351,8 +351,8 @@ TDEPopupMenu* TDEMainWindow::customHelpMenu( bool showWhatsThis ) { if( !mHelpMenu ) { mHelpMenu = new KHelpMenu( this, TQString::null, showWhatsThis ); - connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ), - this, TQT_SLOT( showAboutApplication() ) ); + connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ), + this, TQ_SLOT( showAboutApplication() ) ); } return mHelpMenu->menu(); @@ -441,7 +441,7 @@ int TDEMainWindow::configureToolbars() { saveMainWindowSettings(TDEGlobal::config()); KEditToolbar dlg(actionCollection(), xmlFile(), true, this); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(saveNewToolbarConfig())); return dlg.exec(); } @@ -458,7 +458,7 @@ void TDEMainWindow::setupGUI( int options, const TQString & xmlfile ) { void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xmlfile ) { if( options & Keys ){ KStdAction::keyBindings(guiFactory(), - TQT_SLOT(configureShortcuts()), actionCollection()); + TQ_SLOT(configureShortcuts()), actionCollection()); } if( (options & StatusBar) && internalStatusBar() ){ @@ -468,7 +468,7 @@ void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & if( options & ToolBar ){ setStandardToolBarMenuEnabled( true ); KStdAction::configureToolbars(this, - TQT_SLOT(configureToolbars() ), actionCollection()); + TQ_SLOT(configureToolbars() ), actionCollection()); } if( options & Create ){ @@ -659,7 +659,7 @@ void TDEMainWindow::closeEvent ( TQCloseEvent *e ) if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted? if ( queryExit() && !kapp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app? // don't call queryExit() twice - disconnect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown())); + disconnect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown())); d->shuttingDown = true; kapp->deref(); // ...and quit application. } else { @@ -804,9 +804,9 @@ bool TDEMainWindow::isStandardToolBarMenuEnabled() const void TDEMainWindow::createStandardStatusBarAction(){ if(!d->showStatusBarAction){ - d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection()); + d->showStatusBarAction = KStdAction::showStatusbar(this, TQ_SLOT(setSettingsDirty()), actionCollection()); KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already. - connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool))); + connect(d->showStatusBarAction, TQ_SIGNAL(toggled(bool)), sb, TQ_SLOT(setShown(bool))); d->showStatusBarAction->setChecked(sb->isHidden()); } } @@ -1017,7 +1017,7 @@ void TDEMainWindow::setSettingsDirty() if ( !d->settingsTimer ) { d->settingsTimer = new TQTimer( this ); - connect( d->settingsTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( saveAutoSaveSettings() ) ); + connect( d->settingsTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( saveAutoSaveSettings() ) ); } d->settingsTimer->start( 500, true ); } @@ -1039,10 +1039,10 @@ void TDEMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWi d->autoSaveGroup = groupName; d->autoSaveWindowSize = saveWindowSize; // Get notified when the user moves a toolbar around - disconnect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), - this, TQT_SLOT( setSettingsDirty() ) ); - connect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), - this, TQT_SLOT( setSettingsDirty() ) ); + disconnect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), + this, TQ_SLOT( setSettingsDirty() ) ); + connect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ), + this, TQ_SLOT( setSettingsDirty() ) ); // Now read the previously saved settings applyMainWindowSettings( TDEGlobal::config(), groupName ); diff --git a/tdeui/tdemainwindow.h b/tdeui/tdemainwindow.h index cca8e64ac..446b9c937 100644 --- a/tdeui/tdemainwindow.h +++ b/tdeui/tdemainwindow.h @@ -541,8 +541,8 @@ public: * this function) a connection needs to be made to let TDEMainWindow * know when that status (hidden/shown) of the statusbar has changed. * For example: - * connect(action, TQT_SIGNAL(activated()), - * tdemainwindow, TQT_SLOT(setSettingsDirty())); + * connect(action, TQ_SIGNAL(activated()), + * tdemainwindow, TQ_SLOT(setSettingsDirty())); * Otherwise the status (hidden/show) of the statusbar might not be saved * by TDEMainWindow. * @since 3.2 @@ -683,7 +683,7 @@ public slots: * This slot can be connected dirrectly to the action to configure shortcuts. * This is very simple to do that by adding a single line * \code - * KStdAction::configureToolbars( guiFactory(), TQT_SLOT( configureToolbars() ), + * KStdAction::configureToolbars( guiFactory(), TQ_SLOT( configureToolbars() ), * actionCollection() ); * \endcode * @@ -734,8 +734,8 @@ public slots: * \code * TDEIconLoader &loader = *TDEGlobal::iconLoader(); * TQPixmap pixmap = loader.loadIcon( "help" ); - * toolBar(0)->insertButton( pixmap, 0, TQT_SIGNAL(clicked()), - * this, TQT_SLOT(appHelpActivated()), true, i18n("Help") ); + * toolBar(0)->insertButton( pixmap, 0, TQ_SIGNAL(clicked()), + * this, TQ_SLOT(appHelpActivated()), true, i18n("Help") ); * \endcode * */ diff --git a/tdeui/tdemenubar.cpp b/tdeui/tdemenubar.cpp index 78fd8eb30..eba259b28 100644 --- a/tdeui/tdemenubar.cpp +++ b/tdeui/tdemenubar.cpp @@ -137,15 +137,15 @@ KMenuBar::KMenuBar(TQWidget *parent, const char *name) QXEmbed::initialize(); #endif d = new KMenuBarPrivate; - connect( &d->selection_timer, TQT_SIGNAL( timeout()), - this, TQT_SLOT( selectionTimeout())); + connect( &d->selection_timer, TQ_SIGNAL( timeout()), + this, TQ_SLOT( selectionTimeout())); - connect( tqApp->desktop(), TQT_SIGNAL( resized( int )), TQT_SLOT( updateFallbackSize())); + connect( tqApp->desktop(), TQ_SIGNAL( resized( int )), TQ_SLOT( updateFallbackSize())); if ( kapp ) // toolbarAppearanceChanged(int) is sent when changing macstyle - connect( kapp, TQT_SIGNAL(toolbarAppearanceChanged(int)), - this, TQT_SLOT(slotReadConfig())); + connect( kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), + this, TQ_SLOT(slotReadConfig())); slotReadConfig(); } @@ -179,10 +179,10 @@ void KMenuBar::setTopLevelMenuInternal(bool top_level) #ifdef Q_WS_X11 d->selection = new TDESelectionWatcher( KMenuBarPrivate::makeSelectionAtom(), DefaultScreen( tqt_xdisplay())); - connect( d->selection, TQT_SIGNAL( newOwner( Window )), - this, TQT_SLOT( updateFallbackSize())); - connect( d->selection, TQT_SIGNAL( lostOwner()), - this, TQT_SLOT( updateFallbackSize())); + connect( d->selection, TQ_SIGNAL( newOwner( Window )), + this, TQ_SLOT( updateFallbackSize())); + connect( d->selection, TQ_SIGNAL( lostOwner()), + this, TQ_SLOT( updateFallbackSize())); #endif d->frameStyle = frameStyle(); d->lineWidth = lineWidth(); diff --git a/tdeui/tdemessagebox.cpp b/tdeui/tdemessagebox.cpp index 728540ede..53c51d271 100644 --- a/tdeui/tdemessagebox.cpp +++ b/tdeui/tdemessagebox.cpp @@ -214,8 +214,8 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, KActiveLabel *label2 = new KActiveLabel( qt_text, contents ); if (!(options & KMessageBox::AllowLink)) { - TQObject::disconnect(label2, TQT_SIGNAL(linkClicked(const TQString &)), - label2, TQT_SLOT(openLink(const TQString &))); + TQObject::disconnect(label2, TQ_SIGNAL(linkClicked(const TQString &)), + label2, TQ_SLOT(openLink(const TQString &))); } // We add 10 pixels extra to compensate for some KActiveLabel margins. @@ -250,8 +250,8 @@ int KMessageBox::createKMessageBox(KDialogBase *dialog, TQPixmap icon, label3->setMinimumSize(label3->sizeHint()); if (!(options & KMessageBox::AllowLink)) { - TQObject::disconnect(label3, TQT_SIGNAL(linkClicked(const TQString &)), - label3, TQT_SLOT(openLink(const TQString &))); + TQObject::disconnect(label3, TQ_SIGNAL(linkClicked(const TQString &)), + label3, TQ_SLOT(openLink(const TQString &))); } } else { TQTextEdit* te = new TQTextEdit(details, TQString::null, detailsGroup); diff --git a/tdeui/tdepassivepopupstack.cpp b/tdeui/tdepassivepopupstack.cpp index aef49d15c..cef63db18 100644 --- a/tdeui/tdepassivepopupstack.cpp +++ b/tdeui/tdepassivepopupstack.cpp @@ -60,9 +60,9 @@ KPassivePopup* TDEPassivePopupStackContainer::displayMessage(TQString title, TQS leftCorner.setX(mRightOfStack-popupSize.width()); leftCorner.setY(mTopOfStack); } - connect(popup, SIGNAL(hidden(KPassivePopup*)), this, SLOT(popupClosed(KPassivePopup*))); - connect(popup, SIGNAL(clicked(TQPoint)), this, SLOT(popupClicked(TQPoint))); - connect(popup, SIGNAL(destroyed(TQObject*)), this, SLOT(popupDestroyed(TQObject*))); + connect(popup, TQ_SIGNAL(hidden(KPassivePopup*)), this, TQ_SLOT(popupClosed(KPassivePopup*))); + connect(popup, TQ_SIGNAL(clicked(TQPoint)), this, TQ_SLOT(popupClicked(TQPoint))); + connect(popup, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(popupDestroyed(TQObject*))); mPopupList.append(popup); mPopupIDMap[popup] = id; popup->show(leftCorner); diff --git a/tdeui/tdepopupmenu.cpp b/tdeui/tdepopupmenu.cpp index 453a3e41f..5195c64a8 100644 --- a/tdeui/tdepopupmenu.cpp +++ b/tdeui/tdepopupmenu.cpp @@ -164,7 +164,7 @@ TDEPopupMenu::TDEPopupMenu(TQWidget *parent, const char *name) { d = new TDEPopupMenuPrivate; resetKeyboardVars(); - connect(&(d->clearTimer), TQT_SIGNAL(timeout()), TQT_SLOT(resetKeyboardVars())); + connect(&(d->clearTimer), TQ_SIGNAL(timeout()), TQ_SLOT(resetKeyboardVars())); } TDEPopupMenu::~TDEPopupMenu() @@ -514,7 +514,7 @@ TQPopupMenu* TDEPopupMenu::contextMenu() if (!d->m_ctxMenu) { d->m_ctxMenu = new TQPopupMenu(this); - connect(d->m_ctxMenu, TQT_SIGNAL(aboutToHide()), this, TQT_SLOT(ctxMenuHiding())); + connect(d->m_ctxMenu, TQ_SIGNAL(aboutToHide()), this, TQ_SLOT(ctxMenuHiding())); } return d->m_ctxMenu; @@ -559,7 +559,7 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos) TQPopupMenu* subMenu = item->popup(); if (subMenu) { - disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); + disconnect(subMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(ctxMenuHideShowingMenu())); } } @@ -576,8 +576,8 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos) TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { - connect(subMenu, TQT_SIGNAL(aboutToShow()), TQT_SLOT(ctxMenuHideShowingMenu())); - TQTimer::singleShot(100, subMenu, TQT_SLOT(hide())); + connect(subMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(ctxMenuHideShowingMenu())); + TQTimer::singleShot(100, subMenu, TQ_SLOT(hide())); } if (!TDEPopupMenuPrivate::s_continueCtxMenuShow) @@ -588,7 +588,7 @@ void TDEPopupMenu::showCtxMenu(TQPoint pos) TDEPopupMenuPrivate::s_contextedMenu = this; d->m_ctxMenu->popup(this->mapToGlobal(pos)); - connect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int))); + connect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(itemHighlighted(int))); } /* @@ -603,7 +603,7 @@ void TDEPopupMenu::ctxMenuHideShowingMenu() TQPopupMenu* subMenu = item->popup(); if (subMenu) { - TQTimer::singleShot(0, subMenu, TQT_SLOT(hide())); + TQTimer::singleShot(0, subMenu, TQ_SLOT(hide())); } } } @@ -615,11 +615,11 @@ void TDEPopupMenu::ctxMenuHiding() TQPopupMenu* subMenu = findItem(TDEPopupMenuPrivate::s_highlightedItem)->popup(); if (subMenu) { - disconnect(subMenu, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(ctxMenuHideShowingMenu())); + disconnect(subMenu, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(ctxMenuHideShowingMenu())); } } - disconnect(this, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(itemHighlighted(int))); + disconnect(this, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(itemHighlighted(int))); TDEPopupMenuPrivate::s_continueCtxMenuShow = true; } diff --git a/tdeui/tdeshortcutdialog.cpp b/tdeui/tdeshortcutdialog.cpp index 4d95970b6..5436e3b17 100644 --- a/tdeui/tdeshortcutdialog.cpp +++ b/tdeui/tdeshortcutdialog.cpp @@ -91,21 +91,21 @@ TDEShortcutDialog::TDEShortcutDialog( const TDEShortcut& shortcut, bool bQtShort m_simple->m_btnClearShortcut->setPixmap( SmallIcon( "locationbar_erase" ) ); m_adv->m_btnClearPrimary->setPixmap( SmallIcon( "locationbar_erase" ) ); m_adv->m_btnClearAlternate->setPixmap( SmallIcon( "locationbar_erase" ) ); - connect(m_simple->m_btnClearShortcut, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearShortcut())); - connect(m_adv->m_btnClearPrimary, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearPrimary())); - connect(m_adv->m_btnClearAlternate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotClearAlternate())); - - connect(m_adv->m_txtPrimary, TQT_SIGNAL(clicked()), - m_adv->m_btnPrimary, TQT_SLOT(animateClick())); - connect(m_adv->m_txtAlternate, TQT_SIGNAL(clicked()), - m_adv->m_btnAlternate, TQT_SLOT(animateClick())); - connect(m_adv->m_btnPrimary, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectPrimary())); - connect(m_adv->m_btnAlternate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotSelectAlternate())); + connect(m_simple->m_btnClearShortcut, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearShortcut())); + connect(m_adv->m_btnClearPrimary, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearPrimary())); + connect(m_adv->m_btnClearAlternate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotClearAlternate())); + + connect(m_adv->m_txtPrimary, TQ_SIGNAL(clicked()), + m_adv->m_btnPrimary, TQ_SLOT(animateClick())); + connect(m_adv->m_txtAlternate, TQ_SIGNAL(clicked()), + m_adv->m_btnAlternate, TQ_SLOT(animateClick())); + connect(m_adv->m_btnPrimary, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectPrimary())); + connect(m_adv->m_btnAlternate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotSelectAlternate())); KGuiItem ok = KStdGuiItem::ok(); ok.setText( i18n( "OK" ) ); @@ -442,7 +442,7 @@ void TDEShortcutDialog::keyPressEvent( TQKeyEvent * e ) updateShortcutDisplay(); if( !m_adv->m_btnMultiKey->isChecked() ) - TQTimer::singleShot(500, this, TQT_SLOT(accept())); + TQTimer::singleShot(500, this, TQ_SLOT(accept())); } return; } @@ -520,7 +520,7 @@ void TDEShortcutDialog::keyPressed( KKey key ) updateShortcutDisplay(); if( !m_adv->m_btnMultiKey->isChecked() ) - TQTimer::singleShot(500, this, TQT_SLOT(accept())); + TQTimer::singleShot(500, this, TQ_SLOT(accept())); } #include "tdeshortcutdialog.moc" diff --git a/tdeui/tdespell.cpp b/tdeui/tdespell.cpp index e5d21d45b..05f5c09d4 100644 --- a/tdeui/tdespell.cpp +++ b/tdeui/tdespell.cpp @@ -97,10 +97,10 @@ public: // Connects a slot to KProcIO's output signal -#define OUTPUT(x) (connect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *)))) +#define OUTPUT(x) (connect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *)))) // Disconnect a slot from... -#define NOOUTPUT(x) (disconnect (proc, TQT_SIGNAL (readReady(KProcIO *)), this, TQT_SLOT (x(KProcIO *)))) +#define NOOUTPUT(x) (disconnect (proc, TQ_SIGNAL (readReady(KProcIO *)), this, TQ_SLOT (x(KProcIO *)))) @@ -296,11 +296,11 @@ KSpell::startIspell() if (trystart == 0) //don't connect these multiple times { - connect( proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this, TQT_SLOT(ispellErrors(TDEProcess *, char *, int)) ); + connect( proc, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this, TQ_SLOT(ispellErrors(TDEProcess *, char *, int)) ); - connect( proc, TQT_SIGNAL(processExited(TDEProcess *)), - this, TQT_SLOT(ispellExit (TDEProcess *)) ); + connect( proc, TQ_SIGNAL(processExited(TDEProcess *)), + this, TQ_SLOT(ispellExit (TDEProcess *)) ); OUTPUT(KSpell2); } @@ -308,7 +308,7 @@ KSpell::startIspell() if ( !proc->start() ) { m_status = Error; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath())); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath())); } } @@ -331,14 +331,14 @@ void KSpell::KSpell2( KProcIO * ) if ( proc->readln( line, true ) == -1 ) { - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } if ( line[0] != '@' ) //@ indicates that ispell is working fine { - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } @@ -346,7 +346,7 @@ void KSpell::KSpell2( KProcIO * ) if ( !ignore("kde") ) { kdDebug(750) << "@KDE was false" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } @@ -354,7 +354,7 @@ void KSpell::KSpell2( KProcIO * ) if ( !ignore("linux") ) { kdDebug(750) << "@Linux was false" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); return; } @@ -375,10 +375,10 @@ KSpell::setUpDialog( bool reallyuseprogressbar ) progressbar && reallyuseprogressbar, modaldlg ); ksdlg->setCaption( caption ); - connect( ksdlg, TQT_SIGNAL(command(int)), - this, TQT_SLOT(slotStopCancel(int)) ); - connect( this, TQT_SIGNAL(progress(unsigned int)), - ksdlg, TQT_SLOT(slotProgress(unsigned int)) ); + connect( ksdlg, TQ_SIGNAL(command(int)), + this, TQ_SLOT(slotStopCancel(int)) ); + connect( this, TQ_SIGNAL(progress(unsigned int)), + ksdlg, TQ_SLOT(slotProgress(unsigned int)) ); #ifdef Q_WS_X11 // FIXME(E): Implement for Qt/Embedded KWin::setIcons( ksdlg->winId(), kapp->icon(), kapp->miniIcon() ); @@ -488,7 +488,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) return false; } ///set the dialog signal handler - dialog3slot = TQT_SLOT(checkWord3()); + dialog3slot = TQ_SLOT(checkWord3()); usedialog = _usedialog; setUpDialog( false ); @@ -503,7 +503,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog ) while (proc->readln( blank_line, true ) != -1); // eat spurious blanks OUTPUT(checkWord2); - // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); + // connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3())); proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell @@ -532,7 +532,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) ///set the dialog signal handler if ( !suggest ) { - dialog3slot = TQT_SLOT(checkWord3()); + dialog3slot = TQ_SLOT(checkWord3()); usedialog = _usedialog; setUpDialog( false ); if ( _usedialog ) @@ -547,7 +547,7 @@ bool KSpell::checkWord( const TQString & buffer, bool _usedialog, bool suggest ) while (proc->readln( blank_line, true ) != -1); // eat spurious blanks OUTPUT(checkWord2); - // connect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkWord3())); + // connect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkWord3())); proc->writeStdin(TQString("%")); // turn off terse mode proc->writeStdin( buffer ); // send the word to ispell @@ -578,7 +578,7 @@ void KSpell::checkWord2( KProcIO* ) if ( mistake && usedialog ) { cwword = word; - dialog( word, sugg, TQT_SLOT(checkWord3()) ); + dialog( word, sugg, TQ_SLOT(checkWord3()) ); d->checkNextTimer->start( 0, true ); return; } @@ -626,14 +626,14 @@ void KSpell::suggestWord( KProcIO * ) if ( mistake && usedialog ) { cwword=word; - dialog( word, sugg, TQT_SLOT(checkWord3()) ); + dialog( word, sugg, TQ_SLOT(checkWord3()) ); return; } } void KSpell::checkWord3() { - disconnect( this, TQT_SIGNAL(dialog3()), this, TQT_SLOT(checkWord3()) ); + disconnect( this, TQ_SIGNAL(dialog3()), this, TQ_SLOT(checkWord3()) ); emit corrected( cwword, replacement(), 0L ); } @@ -792,7 +792,7 @@ bool KSpell::checkList (TQStringList *_wordlist, bool _usedialog) setUpDialog(); //set the dialog signal handler - dialog3slot = TQT_SLOT (checkList4 ()); + dialog3slot = TQ_SLOT (checkList4 ()); proc->writeStdin (TQString("%")); // turn off terse mode & check one word at a time @@ -883,7 +883,7 @@ void KSpell::checkList3a (KProcIO *) cwword = word; dlgon = true; // show the dialog - dialog( word, sugg, TQT_SLOT(checkList4()) ); + dialog( word, sugg, TQ_SLOT(checkList4()) ); return; } else @@ -930,7 +930,7 @@ void KSpell::checkList4 () dlgon=false; TQString old; - disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (checkList4())); + disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (checkList4())); //others should have been processed by dialog() already switch (dlgresult) @@ -980,7 +980,7 @@ bool KSpell::check( const TQString &_buffer, bool _usedialog ) usedialog = _usedialog; setUpDialog(); //set the dialog signal handler - dialog3slot = TQT_SLOT(check3()); + dialog3slot = TQ_SLOT(check3()); kdDebug(750) << "KS: check" << endl; origbuffer = _buffer; @@ -1090,7 +1090,7 @@ void KSpell::check2( KProcIO * ) //kdDebug(750) << "(Before dialog) word=[" << word << "] cwword =[" << cwword << "]\n" << endl; if ( usedialog ) { // show the word in the dialog - dialog( word, sugg, TQT_SLOT(check3()) ); + dialog( word, sugg, TQ_SLOT(check3()) ); } else { // No dialog, just emit misspelling and continue d->m_bNoMisspellingsEncountered = false; @@ -1152,7 +1152,7 @@ void KSpell::check2( KProcIO * ) void KSpell::check3 () // evaluates the return value of the dialog { - disconnect (this, TQT_SIGNAL (dialog3()), this, TQT_SLOT (check3())); + disconnect (this, TQ_SIGNAL (dialog3()), this, TQ_SLOT (check3())); kdDebug(750) << "check3 [" << cwword << "] [" << replacement() << "] " << dlgresult << endl; //others should have been processed by dialog() already @@ -1199,7 +1199,7 @@ KSpell::slotStopCancel (int result) if (!dialog3slot.isEmpty()) { dlgresult=result; - connect (this, TQT_SIGNAL (dialog3()), this, dialog3slot.ascii()); + connect (this, TQ_SIGNAL (dialog3()), this, dialog3slot.ascii()); emit dialog3(); } } @@ -1211,7 +1211,7 @@ void KSpell::dialog( const TQString & word, TQStringList & sugg, const char *_sl dialog3slot = _slot; dialogwillprocess = true; - connect( ksdlg, TQT_SIGNAL(command(int)), this, TQT_SLOT(dialog2(int)) ); + connect( ksdlg, TQ_SIGNAL(command(int)), this, TQ_SLOT(dialog2(int)) ); TQString tmpBuf = newbuffer; kdDebug(750)<<" position = "<standby(); @@ -1277,7 +1277,7 @@ void KSpell::dialog2( int result ) break; } - connect( this, TQT_SIGNAL(dialog3()), this, dialog3slot.ascii() ); + connect( this, TQ_SIGNAL(dialog3()), this, dialog3slot.ascii() ); emit dialog3(); } @@ -1334,7 +1334,7 @@ void KSpell::ispellExit( TDEProcess* ) return; // Dead already kdDebug(750) << "Death" << endl; - TQTimer::singleShot( 0, this, TQT_SLOT(emitDeath()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitDeath()) ); } // This is always called from the event loop to make @@ -1423,12 +1423,12 @@ void KSpell::slotModalReady() //kdDebug(750) << "MODAL READY------------------" << endl; Q_ASSERT( m_status == Running ); - connect( this, TQT_SIGNAL( done( const TQString & ) ), - this, TQT_SLOT( slotModalDone( const TQString & ) ) ); - TQObject::connect( this, TQT_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ), - this, TQT_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) ); - TQObject::connect( this, TQT_SIGNAL( death() ), - this, TQT_SLOT( slotModalSpellCheckerFinished( ) ) ); + connect( this, TQ_SIGNAL( done( const TQString & ) ), + this, TQ_SLOT( slotModalDone( const TQString & ) ) ); + TQObject::connect( this, TQ_SIGNAL( corrected( const TQString&, const TQString&, unsigned int ) ), + this, TQ_SLOT( slotSpellCheckerCorrected( const TQString&, const TQString &, unsigned int ) ) ); + TQObject::connect( this, TQ_SIGNAL( death() ), + this, TQ_SLOT( slotModalSpellCheckerFinished( ) ) ); check( modaltext ); } @@ -1463,8 +1463,8 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption, d->checking = false; d->aspellV6 = false; d->checkNextTimer = new TQTimer( this ); - connect( d->checkNextTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( checkNext() )); + connect( d->checkNextTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( checkNext() )); autoDelete = false; modaldlg = _modal; progressbar = _progressbar; @@ -1559,10 +1559,10 @@ void KSpell::initialize( TQWidget *_parent, const TQString &_caption, if ( obj && slot ) // caller wants to know when tdespell is ready - connect( this, TQT_SIGNAL(ready(KSpell *)), obj, slot); + connect( this, TQ_SIGNAL(ready(KSpell *)), obj, slot); else // Hack for modal spell checking - connect( this, TQT_SIGNAL(ready(KSpell *)), this, TQT_SLOT(slotModalReady()) ); + connect( this, TQ_SIGNAL(ready(KSpell *)), this, TQ_SLOT(slotModalReady()) ); proc = new KProcIO( codec ); diff --git a/tdeui/tdespelldlg.cpp b/tdeui/tdespelldlg.cpp index 9e8206505..f111eb50f 100644 --- a/tdeui/tdespelldlg.cpp +++ b/tdeui/tdespelldlg.cpp @@ -60,44 +60,44 @@ KSpellDlg::KSpellDlg( TQWidget * parent, const char * name, bool _progressbar, b d->ui = new KSpellUI( this ); setMainWidget( d->ui ); - connect( d->ui->m_replaceBtn, TQT_SIGNAL(clicked()), - this, TQT_SLOT(replace())); - connect( this, TQT_SIGNAL(ready(bool)), - d->ui->m_replaceBtn, TQT_SLOT(setEnabled(bool)) ); + connect( d->ui->m_replaceBtn, TQ_SIGNAL(clicked()), + this, TQ_SLOT(replace())); + connect( this, TQ_SIGNAL(ready(bool)), + d->ui->m_replaceBtn, TQ_SLOT(setEnabled(bool)) ); - connect( d->ui->m_replaceAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(replaceAll())); - connect(this, TQT_SIGNAL(ready(bool)), d->ui->m_replaceAllBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_replaceAllBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(replaceAll())); + connect(this, TQ_SIGNAL(ready(bool)), d->ui->m_replaceAllBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_skipBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(ignore())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_skipBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_skipBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(ignore())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_skipBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_skipAllBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(ignoreAll())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_skipAllBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_skipAllBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(ignoreAll())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_skipAllBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_addBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(add())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_addBtn, TQT_SLOT(setEnabled(bool))); + connect( d->ui->m_addBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(add())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_addBtn, TQ_SLOT(setEnabled(bool))); - connect( d->ui->m_suggestBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(suggest())); - connect( this, TQT_SIGNAL(ready(bool)), d->ui->m_suggestBtn, TQT_SLOT(setEnabled(bool)) ); + connect( d->ui->m_suggestBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(suggest())); + connect( this, TQ_SIGNAL(ready(bool)), d->ui->m_suggestBtn, TQ_SLOT(setEnabled(bool)) ); d->ui->m_suggestBtn->hide(); - connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(stop())); + connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(stop())); - connect( d->ui->m_replacement, TQT_SIGNAL(textChanged(const TQString &)), - TQT_SLOT(textChanged(const TQString &)) ); + connect( d->ui->m_replacement, TQ_SIGNAL(textChanged(const TQString &)), + TQ_SLOT(textChanged(const TQString &)) ); - connect( d->ui->m_replacement, TQT_SIGNAL(returnPressed()), TQT_SLOT(replace()) ); - connect( d->ui->m_suggestions, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(slotSelectionChanged(TQListViewItem*)) ); + connect( d->ui->m_replacement, TQ_SIGNAL(returnPressed()), TQ_SLOT(replace()) ); + connect( d->ui->m_suggestions, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(slotSelectionChanged(TQListViewItem*)) ); - connect( d->ui->m_suggestions, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), - TQT_SLOT( replace() ) ); + connect( d->ui->m_suggestions, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), + TQ_SLOT( replace() ) ); d->spellConfig = new KSpellConfig( 0, 0 ,0, false ); d->spellConfig->fillDicts( d->ui->m_language ); - connect( d->ui->m_language, TQT_SIGNAL(activated(int)), - d->spellConfig, TQT_SLOT(sSetDictionary(int)) ); - connect( d->spellConfig, TQT_SIGNAL(configChanged()), - TQT_SLOT(slotConfigChanged()) ); + connect( d->ui->m_language, TQ_SIGNAL(activated(int)), + d->spellConfig, TQ_SLOT(sSetDictionary(int)) ); + connect( d->spellConfig, TQ_SIGNAL(configChanged()), + TQ_SLOT(slotConfigChanged()) ); setHelp( "spelldlg", "tdespell" ); setMinimumSize( sizeHint() ); diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp index 73d9ec2b8..817af5007 100644 --- a/tdeui/tdetoolbar.cpp +++ b/tdeui/tdetoolbar.cpp @@ -149,8 +149,8 @@ TDEToolBarSeparator::TDEToolBarSeparator(Orientation o , bool l, TQToolBar *pare const char* name ) :TQFrame( parent, name ), line( l ) { - connect( parent, TQT_SIGNAL(orientationChanged(Orientation)), - this, TQT_SLOT(setOrientation(Orientation)) ); + connect( parent, TQ_SIGNAL(orientationChanged(Orientation)), + this, TQ_SLOT(setOrientation(Orientation)) ); setOrientation( o ); setBackgroundMode( parent->backgroundMode() ); setBackgroundOrigin( ParentOrigin ); @@ -232,16 +232,16 @@ void TDEToolBar::init( bool readConfig, bool honorStyle ) d->m_honorStyle = honorStyle; context = 0; layoutTimer = new TQTimer( this ); - connect( layoutTimer, TQT_SIGNAL( timeout() ), - this, TQT_SLOT( rebuildLayout() ) ); - connect( &(d->repaintTimer), TQT_SIGNAL( timeout() ), - this, TQT_SLOT( slotRepaint() ) ); + connect( layoutTimer, TQ_SIGNAL( timeout() ), + this, TQ_SLOT( rebuildLayout() ) ); + connect( &(d->repaintTimer), TQ_SIGNAL( timeout() ), + this, TQ_SLOT( slotRepaint() ) ); if ( kapp ) { // may be null when started inside designer - connect(kapp, TQT_SIGNAL(toolbarAppearanceChanged(int)), this, TQT_SLOT(slotAppearanceChanged())); + connect(kapp, TQ_SIGNAL(toolbarAppearanceChanged(int)), this, TQ_SLOT(slotAppearanceChanged())); // request notification of changes in icon style kapp->addKipcEventMask(KIPC::IconChanged); - connect(kapp, TQT_SIGNAL(iconChanged(int)), this, TQT_SLOT(slotIconChanged(int))); + connect(kapp, TQ_SIGNAL(iconChanged(int)), this, TQ_SLOT(slotIconChanged(int))); } // finally, read in our configurable settings @@ -249,11 +249,11 @@ void TDEToolBar::init( bool readConfig, bool honorStyle ) slotReadConfig(); if ( mainWindow() ) - connect( mainWindow(), TQT_SIGNAL( toolBarPositionChanged( TQToolBar * ) ), - this, TQT_SLOT( toolBarPosChanged( TQToolBar * ) ) ); + connect( mainWindow(), TQ_SIGNAL( toolBarPositionChanged( TQToolBar * ) ), + this, TQ_SLOT( toolBarPosChanged( TQToolBar * ) ) ); // Hack to make sure we recalculate our size when we dock. - connect( this, TQT_SIGNAL(placeChanged(TQDockWindow::Place)), TQT_SLOT(rebuildLayout()) ); + connect( this, TQ_SIGNAL(placeChanged(TQDockWindow::Place)), TQ_SLOT(rebuildLayout()) ); } int TDEToolBar::insertButton(const TQString& icon, int id, bool enabled, @@ -422,7 +422,7 @@ int TDEToolBar::insertAnimatedWidget(int id, TQObject *receiver, const char *slo insertWidgetInternal( anim, index, id ); if ( receiver ) - connect( anim, TQT_SIGNAL(clicked()), receiver, slot); + connect( anim, TQ_SIGNAL(clicked()), receiver, slot); return index; } @@ -1145,12 +1145,12 @@ TQString TDEToolBar::text() const void TDEToolBar::doConnections( TDEToolBarButton *button ) { - connect(button, TQT_SIGNAL(clicked(int)), this, TQT_SIGNAL( clicked( int ) ) ); - connect(button, TQT_SIGNAL(doubleClicked(int)), this, TQT_SIGNAL( doubleClicked( int ) ) ); - connect(button, TQT_SIGNAL(released(int)), this, TQT_SIGNAL( released( int ) ) ); - connect(button, TQT_SIGNAL(pressed(int)), this, TQT_SIGNAL( pressed( int ) ) ); - connect(button, TQT_SIGNAL(toggled(int)), this, TQT_SIGNAL( toggled( int ) ) ); - connect(button, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SIGNAL( highlighted( int, bool ) ) ); + connect(button, TQ_SIGNAL(clicked(int)), this, TQ_SIGNAL( clicked( int ) ) ); + connect(button, TQ_SIGNAL(doubleClicked(int)), this, TQ_SIGNAL( doubleClicked( int ) ) ); + connect(button, TQ_SIGNAL(released(int)), this, TQ_SIGNAL( released( int ) ) ); + connect(button, TQ_SIGNAL(pressed(int)), this, TQ_SIGNAL( pressed( int ) ) ); + connect(button, TQ_SIGNAL(toggled(int)), this, TQ_SIGNAL( toggled( int ) ) ); + connect(button, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SIGNAL( highlighted( int, bool ) ) ); } void TDEToolBar::mousePressEvent ( TQMouseEvent *m ) @@ -1309,8 +1309,8 @@ void TDEToolBar::insertWidgetInternal( TQWidget *w, int &index, int id ) // we can't have it in widgets, or something is really wrong //widgets.removeRef( w ); - connect( w, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( widgetDestroyed() ) ); + connect( w, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( widgetDestroyed() ) ); if ( index == -1 || index > (int)widgets.count() ) { index = (int)widgets.count(); widgets.append( w ); @@ -2125,10 +2125,10 @@ TDEPopupMenu *TDEToolBar::contextMenu() context->setItemChecked(CONTEXT_ICONS, true); context->insertItem( i18n("Icon Size"), size ); - connect( context, TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( slotContextAboutToShow() ) ); + connect( context, TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( slotContextAboutToShow() ) ); // Unplugging a submenu from abouttohide leads to the popupmenu floating around // So better simply call that code from after exec() returns (DF) - //connect( context, TQT_SIGNAL( aboutToHide() ), this, TQT_SLOT( slotContextAboutToHide() ) ); + //connect( context, TQ_SIGNAL( aboutToHide() ), this, TQ_SLOT( slotContextAboutToHide() ) ); return context; } diff --git a/tdeui/tdetoolbar.h b/tdeui/tdetoolbar.h index adbb5b521..919af5cfe 100644 --- a/tdeui/tdetoolbar.h +++ b/tdeui/tdetoolbar.h @@ -466,8 +466,8 @@ public: * You will insert a normal button with connection (or use signals from * toolbar): * \code - * bar->insertButton(icon, id, TQT_SIGNAL(clicked ()), this, - * TQT_SLOT (slotClick()), true, "click or wait for popup"); + * bar->insertButton(icon, id, TQ_SIGNAL(clicked ()), this, + * TQ_SLOT (slotClick()), true, "click or wait for popup"); * \endcode * And then add a delayed popup: * \code diff --git a/tdeui/tdetoolbarbutton.cpp b/tdeui/tdetoolbarbutton.cpp index d957a2edf..1c3f550db 100644 --- a/tdeui/tdetoolbarbutton.cpp +++ b/tdeui/tdetoolbarbutton.cpp @@ -125,19 +125,19 @@ TDEToolBarButton::TDEToolBarButton( const TQString& _icon, int _id, d->m_parent = dynamic_cast(_parent); if (d->m_parent) { - connect(d->m_parent, TQT_SIGNAL( modechange() ), - this, TQT_SLOT( modeChange() )); + connect(d->m_parent, TQ_SIGNAL( modechange() ), + this, TQ_SLOT( modeChange() )); } setFocusPolicy( TQWidget::NoFocus ); // connect all of our slots and start trapping events - connect(this, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClicked() ) ); - connect(this, TQT_SIGNAL( pressed() ), - this, TQT_SLOT( slotPressed() ) ); - connect(this, TQT_SIGNAL( released() ), - this, TQT_SLOT( slotReleased() ) ); + connect(this, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClicked() ) ); + connect(this, TQ_SIGNAL( pressed() ), + this, TQ_SLOT( slotPressed() ) ); + connect(this, TQ_SIGNAL( released() ), + this, TQ_SLOT( slotReleased() ) ); installEventFilter(this); d->m_iconName = _icon; @@ -158,19 +158,19 @@ TDEToolBarButton::TDEToolBarButton( const TQPixmap& pixmap, int _id, d->m_parent = dynamic_cast(_parent); if (d->m_parent) { - connect(d->m_parent, TQT_SIGNAL( modechange() ), - this, TQT_SLOT( modeChange() )); + connect(d->m_parent, TQ_SIGNAL( modechange() ), + this, TQ_SLOT( modeChange() )); } setFocusPolicy( TQWidget::NoFocus ); // connect all of our slots and start trapping events - connect(this, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotClicked() )); - connect(this, TQT_SIGNAL( pressed() ), - this, TQT_SLOT( slotPressed() )); - connect(this, TQT_SIGNAL( released() ), - this, TQT_SLOT( slotReleased() )); + connect(this, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotClicked() )); + connect(this, TQ_SIGNAL( pressed() ), + this, TQ_SLOT( slotPressed() )); + connect(this, TQ_SIGNAL( released() ), + this, TQ_SLOT( slotReleased() )); installEventFilter(this); // set our pixmap and do our initial setup @@ -734,9 +734,9 @@ void TDEToolBarButton::setToggle(bool flag) { setToggleButton(flag); if (flag) - connect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + connect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); else - disconnect(this, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggled())); + disconnect(this, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggled())); } TQSize TDEToolBarButton::sizeHint() const diff --git a/tdeui/tdetoolbarhandler.cpp b/tdeui/tdetoolbarhandler.cpp index 45f2564e9..37540ae92 100644 --- a/tdeui/tdetoolbarhandler.cpp +++ b/tdeui/tdetoolbarhandler.cpp @@ -177,8 +177,8 @@ void ToolBarHandler::setupActions() /* for ( TQPtrListIterator toolBarIt( m_toolBars ); toolBarIt.current(); ++toolBarIt ) - connect( toolBarIt.current(), TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( setupActions() ) ); + connect( toolBarIt.current(), TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( setupActions() ) ); */ if (kapp && kapp->authorizeTDEAction("options_show_toolbar")) @@ -198,8 +198,8 @@ void ToolBarHandler::init( TDEMainWindow *mainWindow ) d = 0; m_mainWindow = mainWindow; - connect( m_mainWindow->guiFactory(), TQT_SIGNAL( clientAdded( KXMLGUIClient * ) ), - this, TQT_SLOT( clientAdded( KXMLGUIClient * ) ) ); + connect( m_mainWindow->guiFactory(), TQ_SIGNAL( clientAdded( KXMLGUIClient * ) ), + this, TQ_SLOT( clientAdded( KXMLGUIClient * ) ) ); /* re-use an existing resource file if it exists. can happen if the user launches the * toolbar editor */ @@ -236,8 +236,8 @@ void ToolBarHandler::connectToActionContainer( TQWidget *container ) if ( !popupMenu ) return; - connect( popupMenu, TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( setupActions() ) ); + connect( popupMenu, TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( setupActions() ) ); } #include "tdetoolbarhandler.moc" diff --git a/tdeui/tdetoolbarlabelaction.h b/tdeui/tdetoolbarlabelaction.h index f57365359..801f0ed78 100644 --- a/tdeui/tdetoolbarlabelaction.h +++ b/tdeui/tdetoolbarlabelaction.h @@ -36,10 +36,10 @@ class TQLabel; * KHistoryCombo* findCombo = new KHistoryCombo(true, this); * KWidgetAction* action * = new KWidgetAction(findCombo, i18n("F&ind Combo"), TQt::Key_F6, this, - * TQT_SLOT(slotFocus()), actionCollection(), "find_combo"); + * TQ_SLOT(slotFocus()), actionCollection(), "find_combo"); * * new TDEToolBarLabelAction(findCombo, i18n("F&ind "), 0, this, - * TQT_SLOT(slotFocus()), actionCollection(), + * TQ_SLOT(slotFocus()), actionCollection(), * "find_label"); * * \endcode @@ -54,8 +54,8 @@ public: * * @param text The label's and the action's text. * @param cut The action's shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -70,8 +70,8 @@ public: * typed. * @param text The label's and the action's text. * @param cut The action's shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ @@ -93,8 +93,8 @@ public: * * @param label the label which is displayed in the toolbar. * @param cut The action's shortcut. - * @param receiver The SLOT's parent. - * @param slot The TQT_SLOT to invoke to execute this action. + * @param receiver The slot's parent. + * @param slot The slot to invoke to execute this action. * @param parent This action's parent. * @param name An internal name for this action. */ diff --git a/tdeui/tdetoolbarradiogroup.cpp b/tdeui/tdetoolbarradiogroup.cpp index 937354357..0f5febb0a 100644 --- a/tdeui/tdetoolbarradiogroup.cpp +++ b/tdeui/tdetoolbarradiogroup.cpp @@ -36,7 +36,7 @@ TDEToolBarRadioGroup::TDEToolBarRadioGroup (TDEToolBar *_parent, const char *_na { buttons = new TDEToolBarButtonList(); tb = _parent; - connect (tb, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int))); + connect (tb, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(slotToggled(int))); } TDEToolBarRadioGroup::~TDEToolBarRadioGroup() diff --git a/tdeui/tests/itemcontainertest.cpp b/tdeui/tests/itemcontainertest.cpp index 4837fe119..7226eb6f5 100644 --- a/tdeui/tests/itemcontainertest.cpp +++ b/tdeui/tests/itemcontainertest.cpp @@ -74,8 +74,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) m_pbgMode->setExclusive( true ); vBox->addWidget( m_pbgMode ); - connect( m_pbgMode, TQT_SIGNAL( clicked( int ) ), - this, TQT_SLOT( slotSwitchMode( int ) ) ); + connect( m_pbgMode, TQ_SIGNAL( clicked( int ) ), + this, TQ_SLOT( slotSwitchMode( int ) ) ); //Signal labels TQGroupBox* gbWiget = new TQGroupBox( 1, TQt::Horizontal, "Widget", this); @@ -91,8 +91,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) TQButtonGroup* bgListView = new TQButtonGroup( 1, TQt::Horizontal, "TDEListView", this); TQCheckBox* cbListView = new TQCheckBox("Single Column", bgListView); vBox->addWidget( bgListView ); - connect( cbListView, TQT_SIGNAL( toggled( bool ) ), - this, TQT_SLOT( slotToggleSingleColumn( bool ) ) ); + connect( cbListView, TQ_SIGNAL( toggled( bool ) ), + this, TQ_SLOT( slotToggleSingleColumn( bool ) ) ); TDEGlobal::config()->reparseConfiguration(); @@ -101,8 +101,8 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) m_pIconView = new TDEIconView( gbIconView ); hBox->addWidget( gbIconView ); hBox->addSpacing( 5 ); - connect( m_pIconView, TQT_SIGNAL( executed( TQIconViewItem* ) ), - this, TQT_SLOT( slotIconViewExec( TQIconViewItem* ) ) ); + connect( m_pIconView, TQ_SIGNAL( executed( TQIconViewItem* ) ), + this, TQ_SLOT( slotIconViewExec( TQIconViewItem* ) ) ); //Create ListView TQGroupBox* gbListView = new TQGroupBox( 1, TQt::Horizontal, "TDEListView", this); @@ -111,15 +111,15 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) m_pListView->addColumn("Text"); hBox->addWidget( gbListView ); hBox->addSpacing( 5 ); - connect( m_pListView, TQT_SIGNAL( executed( TQListViewItem* ) ), - this, TQT_SLOT( slotListViewExec( TQListViewItem* ) ) ); + connect( m_pListView, TQ_SIGNAL( executed( TQListViewItem* ) ), + this, TQ_SLOT( slotListViewExec( TQListViewItem* ) ) ); //Create ListBox TQGroupBox* gbListBox = new TQGroupBox( 1, TQt::Horizontal, "TDEListBox", this); m_pListBox = new TDEListBox( gbListBox ); hBox->addWidget( gbListBox ); - connect( m_pListBox, TQT_SIGNAL( executed( TQListBoxItem* ) ), - this, TQT_SLOT( slotListBoxExec( TQListBoxItem* ) ) ); + connect( m_pListBox, TQ_SIGNAL( executed( TQListBoxItem* ) ), + this, TQ_SLOT( slotListBoxExec( TQListBoxItem* ) ) ); //Initialize buttons cbListView->setChecked( !m_pListView->allColumnsShowFocus() ); @@ -137,10 +137,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) new TQListBoxPixmap( m_pListBox, TQPixmap(item_xpm), TQString("Item%1").arg(i)); } - connect( m_pIconView, TQT_SIGNAL( clicked( TQIconViewItem* ) ), - this, TQT_SLOT( slotClicked( TQIconViewItem* ) ) ); - connect( m_pIconView, TQT_SIGNAL( doubleClicked( TQIconViewItem* ) ), - this, TQT_SLOT( slotDoubleClicked( TQIconViewItem* ) ) ); + connect( m_pIconView, TQ_SIGNAL( clicked( TQIconViewItem* ) ), + this, TQ_SLOT( slotClicked( TQIconViewItem* ) ) ); + connect( m_pIconView, TQ_SIGNAL( doubleClicked( TQIconViewItem* ) ), + this, TQ_SLOT( slotDoubleClicked( TQIconViewItem* ) ) ); } void TopLevel::slotSwitchMode( int id ) diff --git a/tdeui/tests/kbuttonboxtest.cpp b/tdeui/tests/kbuttonboxtest.cpp index a44175b68..3390ce5f3 100644 --- a/tdeui/tests/kbuttonboxtest.cpp +++ b/tdeui/tests/kbuttonboxtest.cpp @@ -43,10 +43,10 @@ int main(int argc, char **argv) { KButtonBox *bbox = new KButtonBox(w); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addStretch(1); bbox->addButton("Help"); @@ -72,10 +72,10 @@ int main(int argc, char **argv) { bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->layout(); tl->addWidget(bbox,0); tl->activate(); @@ -98,10 +98,10 @@ int main(int argc, char **argv) { bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addStretch(1); bbox->layout(); tl->addWidget(bbox,0); @@ -127,10 +127,10 @@ int main(int argc, char **argv) { bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addButton("Push me and I give you a banana"); bbox->addStretch(1); @@ -159,10 +159,10 @@ int main(int argc, char **argv) { bbox->addStretch(1); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addButton("Push me and I give you a banana", true); bbox->addStretch(1); @@ -188,10 +188,10 @@ int main(int argc, char **argv) { KButtonBox *bbox = new KButtonBox(w, KButtonBox::Vertical); TQPushButton *b = bbox->addButton("OK"); b->setDefault(true); - w->connect(b, TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); - w->connect(bbox->addButton("Cancel"), TQT_SIGNAL(clicked()), - w, TQT_SLOT(accept())); + w->connect(b, TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); + w->connect(bbox->addButton("Cancel"), TQ_SIGNAL(clicked()), + w, TQ_SLOT(accept())); bbox->addStretch(1); bbox->layout(); diff --git a/tdeui/tests/kcomboboxtest.cpp b/tdeui/tests/kcomboboxtest.cpp index d2b59a4c2..7e51396c1 100644 --- a/tdeui/tests/kcomboboxtest.cpp +++ b/tdeui/tests/kcomboboxtest.cpp @@ -40,8 +40,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_qc = new TQComboBox(hbox, "QtReadOnlyCombo" ); lbl->setBuddy (m_qc); - TQObject::connect (m_qc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_qc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); + TQObject::connect (m_qc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_qc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&))); vbox->addWidget (hbox); // Read-only combobox @@ -53,8 +53,8 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_ro = new KComboBox(hbox, "ReadOnlyCombo" ); lbl->setBuddy (m_ro); m_ro->setCompletionMode( TDEGlobalSettings::CompletionAuto ); - TQObject::connect (m_ro, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_ro, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); + TQObject::connect (m_ro, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_ro, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&))); vbox->addWidget (hbox); // Read-write combobox @@ -68,10 +68,10 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_rw->setDuplicatesEnabled( true ); m_rw->setInsertionPolicy( TQComboBox::NoInsertion ); m_rw->setTrapReturnKey( true ); - TQObject::connect (m_rw, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_rw, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&))); - TQObject::connect (m_rw, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); - TQObject::connect (m_rw, TQT_SIGNAL(returnPressed(const TQString&)), TQT_SLOT(slotReturnPressed(const TQString&))); + TQObject::connect (m_rw, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_rw, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&))); + TQObject::connect (m_rw, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed())); + TQObject::connect (m_rw, TQ_SIGNAL(returnPressed(const TQString&)), TQ_SLOT(slotReturnPressed(const TQString&))); vbox->addWidget (hbox); // History combobox... @@ -84,9 +84,9 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) lbl->setBuddy (m_hc); m_hc->setDuplicatesEnabled( true ); m_hc->setInsertionPolicy( TQComboBox::NoInsertion ); - TQObject::connect (m_hc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_hc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(slotActivated(const TQString&))); - TQObject::connect (m_hc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); + TQObject::connect (m_hc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_hc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(slotActivated(const TQString&))); + TQObject::connect (m_hc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed())); vbox->addWidget (hbox); m_hc->setTrapReturnKey(true); @@ -99,19 +99,19 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_konqc = new KComboBox( true, hbox, "KonqyCombo" ); lbl->setBuddy (m_konqc); m_konqc->setMaxCount( 10 ); - TQObject::connect (m_konqc, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int))); - TQObject::connect (m_konqc, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT (slotActivated(const TQString&))); - TQObject::connect (m_konqc, TQT_SIGNAL(returnPressed()), TQT_SLOT(slotReturnPressed())); + TQObject::connect (m_konqc, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int))); + TQObject::connect (m_konqc, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT (slotActivated(const TQString&))); + TQObject::connect (m_konqc, TQ_SIGNAL(returnPressed()), TQ_SLOT(slotReturnPressed())); vbox->addWidget (hbox); // Create an exit button hbox = new TQHBox (this); m_btnExit = new TQPushButton( "E&xit", hbox ); - TQObject::connect( m_btnExit, TQT_SIGNAL(clicked()), TQT_SLOT(quitApp()) ); + TQObject::connect( m_btnExit, TQ_SIGNAL(clicked()), TQ_SLOT(quitApp()) ); // Create a disable button... m_btnEnable = new TQPushButton( "Disa&ble", hbox ); - TQObject::connect (m_btnEnable, TQT_SIGNAL(clicked()), TQT_SLOT(slotDisable())); + TQObject::connect (m_btnEnable, TQ_SIGNAL(clicked()), TQ_SLOT(slotDisable())); vbox->addWidget (hbox); @@ -150,7 +150,7 @@ KComboBoxTest::KComboBoxTest(TQWidget* widget, const char* name ) m_konqc->setCurrentItem( m_konqc->count()-1 ); m_timer = new TQTimer (this); - connect (m_timer, TQT_SIGNAL (timeout()), TQT_SLOT (slotTimeout())); + connect (m_timer, TQ_SIGNAL (timeout()), TQ_SLOT (slotTimeout())); } KComboBoxTest::~KComboBoxTest() diff --git a/tdeui/tests/kcompletiontest.cpp b/tdeui/tests/kcompletiontest.cpp index ff477e027..a6c010fc7 100644 --- a/tdeui/tests/kcompletiontest.cpp +++ b/tdeui/tests/kcompletiontest.cpp @@ -74,8 +74,8 @@ Form1::Form1( TQWidget* parent, const char* name ) combo->setCompletionObject( edit->completionObject() ); // combo->setMaxCount( 5 ); combo->setHistoryItems( defaultItems(), true ); - connect( combo, TQT_SIGNAL( activated( const TQString& )), - combo, TQT_SLOT( addToHistory( const TQString& ))); + connect( combo, TQ_SIGNAL( activated( const TQString& )), + combo, TQ_SLOT( addToHistory( const TQString& ))); TQToolTip::add( combo, "KHistoryCombo" ); Layout2->addWidget( combo ); @@ -84,7 +84,7 @@ Form1::Form1( TQWidget* parent, const char* name ) PushButton1 = new TQPushButton( GroupBox1, "PushButton1" ); PushButton1->setText( "Add" ); - connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAdd() )); + connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAdd() )); Layout2->addWidget( PushButton1 ); Layout9->addLayout( Layout2 ); @@ -96,7 +96,7 @@ Form1::Form1( TQWidget* parent, const char* name ) PushButton1_4 = new TQPushButton( GroupBox1, "PushButton1_4" ); PushButton1_4->setText( "Remove" ); - connect( PushButton1_4, TQT_SIGNAL( clicked() ), TQT_SLOT( slotRemove() )); + connect( PushButton1_4, TQ_SIGNAL( clicked() ), TQ_SLOT( slotRemove() )); Layout3->addWidget( PushButton1_4 ); Layout9->addLayout( Layout3 ); @@ -106,8 +106,8 @@ Form1::Form1( TQWidget* parent, const char* name ) ListBox1 = new TQListBox( GroupBox1, "ListBox1" ); Layout8->addWidget( ListBox1 ); - connect( ListBox1, TQT_SIGNAL( highlighted( const TQString& )), - TQT_SLOT( slotHighlighted( const TQString& ))); + connect( ListBox1, TQ_SIGNAL( highlighted( const TQString& )), + TQ_SLOT( slotHighlighted( const TQString& ))); TQToolTip::add( ListBox1, "Contains the contents of the completion object.\n:x is the weighting, i.e. how often an item has been inserted"); Layout7 = new TQVBoxLayout; @@ -116,13 +116,13 @@ Form1::Form1( TQWidget* parent, const char* name ) PushButton1_3 = new TQPushButton( GroupBox1, "PushButton1_3" ); PushButton1_3->setText( "Completion items" ); - connect( PushButton1_3, TQT_SIGNAL( clicked() ), TQT_SLOT( slotList() )); + connect( PushButton1_3, TQ_SIGNAL( clicked() ), TQ_SLOT( slotList() )); Layout7->addWidget( PushButton1_3 ); PushButton1_2 = new TQPushButton( GroupBox1, "PushButton1_2" ); PushButton1_2->setText( "Clear" ); - connect( PushButton1_2, TQT_SIGNAL( clicked() ), - edit->completionObject(), TQT_SLOT( clear() )); + connect( PushButton1_2, TQ_SIGNAL( clicked() ), + edit->completionObject(), TQ_SLOT( clear() )); Layout7->addWidget( PushButton1_2 ); Layout8->addLayout( Layout7 ); Layout9->addLayout( Layout8 ); diff --git a/tdeui/tests/kdesattest.cpp b/tdeui/tests/kdesattest.cpp index a986ce026..3daf22b08 100644 --- a/tdeui/tests/kdesattest.cpp +++ b/tdeui/tests/kdesattest.cpp @@ -15,7 +15,7 @@ KDesatWidget::KDesatWidget(TQWidget *parent, const char *name) slide = new KDoubleNumInput(700, this, "desat"); slide->setRange(0, 1, 0.001); slide->setLabel("Desaturate: ", AlignVCenter | AlignLeft); - connect(slide,TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(change(double))); + connect(slide,TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(change(double))); resize(image.width()*2, image.height() + slide->height()); slide->setGeometry(0, image.height(), image.width()*2, slide->height()); diff --git a/tdeui/tests/kdockwidgetdemo.cpp b/tdeui/tests/kdockwidgetdemo.cpp index a922acf2d..ba3f97d74 100644 --- a/tdeui/tests/kdockwidgetdemo.cpp +++ b/tdeui/tests/kdockwidgetdemo.cpp @@ -116,8 +116,8 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const fd->reparent(d_fd, TQPoint(0,0)); d_fd->setWidget( fd ); - connect( dirView, TQT_SIGNAL( folderSelected( const TQString & ) ), fd, TQT_SLOT( setDir2( const TQString & ) ) ); - connect( fd, TQT_SIGNAL( dirEntered( const TQString & ) ), dirView, TQT_SLOT( setDir( const TQString & ) ) ); + connect( dirView, TQ_SIGNAL( folderSelected( const TQString & ) ), fd, TQ_SLOT( setDir2( const TQString & ) ) ); + connect( fd, TQ_SIGNAL( dirEntered( const TQString & ) ), dirView, TQ_SLOT( setDir( const TQString & ) ) ); d_fd->setDockSite( KDockWidget::DockTop|KDockWidget::DockLeft|KDockWidget::DockRight|KDockWidget::DockBottom ); d_fd->setEnableDocking(KDockWidget::DockNone); @@ -128,16 +128,16 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const d_dirView->manualDock( d_fd, KDockWidget::DockLeft, 20 ); d_preview->manualDock( d_fd, KDockWidget::DockBottom, 70 ); - connect(fd, TQT_SIGNAL(fileHighlighted(const TQString&)), preview, TQT_SLOT(showPreview(const TQString&))); - connect(fd, TQT_SIGNAL(signalDone(int)), this, TQT_SLOT(done(int))); + connect(fd, TQ_SIGNAL(fileHighlighted(const TQString&)), preview, TQ_SLOT(showPreview(const TQString&))); + connect(fd, TQ_SIGNAL(signalDone(int)), this, TQ_SLOT(done(int))); - connect(fd, TQT_SIGNAL(dirEntered(const TQString&)), this, TQT_SLOT(changeDir(const TQString&))); - connect(dirView, TQT_SIGNAL(folderSelected(const TQString&)), this, TQT_SLOT(changeDir(const TQString&))); + connect(fd, TQ_SIGNAL(dirEntered(const TQString&)), this, TQ_SLOT(changeDir(const TQString&))); + connect(dirView, TQ_SIGNAL(folderSelected(const TQString&)), this, TQ_SLOT(changeDir(const TQString&))); b_tree = new TQToolButton( fd ); TQToolTip::add( b_tree, "Show/Hide Tree" ); b_tree->setPixmap( TQPixmap( dir_tree_xpm ) ); - connect( b_tree, TQT_SIGNAL(clicked()), d_dirView, TQT_SLOT(changeHideShowState()) ); + connect( b_tree, TQ_SIGNAL(clicked()), d_dirView, TQ_SLOT(changeHideShowState()) ); b_tree->setToggleButton(true); b_tree->setOn(true); fd->addToolButton( b_tree, true ); @@ -145,13 +145,13 @@ SFileDialog::SFileDialog( TQString initially, const TQStringList& filter, const b_preview = new TQToolButton( fd ); TQToolTip::add( b_preview, "Show/Hide Preview" ); b_preview->setPixmap( TQPixmap( preview_xpm ) ); - connect( b_preview, TQT_SIGNAL(clicked()), d_preview, TQT_SLOT(changeHideShowState()) ); + connect( b_preview, TQ_SIGNAL(clicked()), d_preview, TQ_SLOT(changeHideShowState()) ); b_preview->setToggleButton(true); b_preview->setOn(true); fd->addToolButton( b_preview ); - connect( dockManager, TQT_SIGNAL(change()), this, TQT_SLOT(dockChange())); - connect( dockManager, TQT_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQT_SLOT(setDockDefaultPos(KDockWidget*))); + connect( dockManager, TQ_SIGNAL(change()), this, TQ_SLOT(dockChange())); + connect( dockManager, TQ_SIGNAL(setDockDefaultPos(KDockWidget*)), this, TQ_SLOT(setDockDefaultPos(KDockWidget*))); setCaption("Open File"); resize(550,450); tqDebug("read config"); @@ -403,7 +403,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent ) TQToolTip::add( p, tr( "Bookmarks" ) ); bookmarkMenu = new TQPopupMenu( this ); - connect( bookmarkMenu, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( bookmarkChosen( int ) ) ); + connect( bookmarkMenu, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( bookmarkChosen( int ) ) ); addId = bookmarkMenu->insertItem( "Add bookmark" ); clearId = bookmarkMenu->insertItem( TQPixmap(folder_trash), "Clear bookmarks" ); bookmarkMenu->insertSeparator(); @@ -416,7 +416,7 @@ CustomFileDialog::CustomFileDialog( TQWidget* parent ) TQToolTip::add( b, tr( "Go Home!" ) ); b->setPixmap( TQPixmap( homepage_xpm ) ); - connect( b, TQT_SIGNAL( clicked() ), this, TQT_SLOT( goHome() ) ); + connect( b, TQ_SIGNAL( clicked() ), this, TQ_SLOT( goHome() ) ); addToolButton( b ); } @@ -695,12 +695,12 @@ TQString Directory::text( int column ) const DirectoryView::DirectoryView( TQWidget *parent, const char *name ) :TQListView( parent, name ) { - connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ), - this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - this, TQT_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + this, TQ_SLOT( slotFolderSelected( TQListViewItem * ) ) ); setAcceptDrops( true ); viewport()->setAcceptDrops( true ); diff --git a/tdeui/tests/kdockwidgettest.cpp b/tdeui/tests/kdockwidgettest.cpp index f27fd0b4e..154d02463 100644 --- a/tdeui/tests/kdockwidgettest.cpp +++ b/tdeui/tests/kdockwidgettest.cpp @@ -120,12 +120,12 @@ DockApplication::DockApplication( const char* name ) TQPushButton* b1 = new TQPushButton(mainW); b1->setGeometry(10, 10, 250, 25); b1->setText("write dock config"); - connect(b1, TQT_SIGNAL(clicked()), TQT_SLOT(wConfig())); + connect(b1, TQ_SIGNAL(clicked()), TQ_SLOT(wConfig())); TQPushButton* b2 = new TQPushButton(mainW); b2->setGeometry(10, 35, 250, 25); b2->setText("read dock config"); - connect(b2, TQT_SIGNAL(clicked()), TQT_SLOT(rConfig())); + connect(b2, TQ_SIGNAL(clicked()), TQ_SLOT(rConfig())); m_bname = new TQPushButton(mainW); m_bname->setGeometry(10, 60, 250, 25); @@ -134,12 +134,12 @@ DockApplication::DockApplication( const char* name ) TQPushButton *b3 = new TQPushButton(mainW); b3->setGeometry(10,95,250,25); b3->setText("change the icon of the green widget"); - connect(b3,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix1())); + connect(b3,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix1())); TQPushButton *b4 = new TQPushButton(mainW); b4->setGeometry(10,130,250,25); b4->setText("remove icon "); - connect(b4,TQT_SIGNAL(clicked()), TQT_SLOT(gSetPix2())); + connect(b4,TQ_SIGNAL(clicked()), TQ_SLOT(gSetPix2())); setGeometry(200, 100, 500, 300); @@ -170,11 +170,11 @@ void DockApplication::initMenuBar() TQPixmap p(folder); TQPopupMenu *file_menu = new TQPopupMenu(); - file_menu->insertItem(p, "Change Green Widget Caption", this, TQT_SLOT(cap()) ); + file_menu->insertItem(p, "Change Green Widget Caption", this, TQ_SLOT(cap()) ); file_menu->insertSeparator(); - file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQT_SLOT(greenMain()) ); - file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQT_SLOT(blueMain()) ); - file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQT_SLOT(nullMain()) ); + file_menu->insertItem(p, "Set Green Widget as MainDockWidget", this, TQ_SLOT(greenMain()) ); + file_menu->insertItem(p, "Set Blue Widget as MainDockWidget", this, TQ_SLOT(blueMain()) ); + file_menu->insertItem(p, "Set NULL as MainDockWidget", this, TQ_SLOT(nullMain()) ); KMenuBar* menu_bar = menuBar(); menu_bar->insertItem( "&Test", file_menu ); diff --git a/tdeui/tests/kdualcolortest.cpp b/tdeui/tests/kdualcolortest.cpp index 512bfc610..a9be04cac 100644 --- a/tdeui/tests/kdualcolortest.cpp +++ b/tdeui/tests/kdualcolortest.cpp @@ -12,12 +12,12 @@ KDualColorWidget::KDualColorWidget(TQWidget *parent, const char *name) KDualColorButton *colorBtn = new KDualColorButton(lbl->colorGroup().text(), lbl->colorGroup().background(), this); - connect(colorBtn, TQT_SIGNAL(fgChanged(const TQColor &)), - TQT_SLOT(slotFgChanged(const TQColor &))); - connect(colorBtn, TQT_SIGNAL(bgChanged(const TQColor &)), - TQT_SLOT(slotBgChanged(const TQColor &))); - connect(colorBtn, TQT_SIGNAL(currentChanged(KDualColorButton::DualColor)), - TQT_SLOT(slotCurrentChanged(KDualColorButton::DualColor))); + connect(colorBtn, TQ_SIGNAL(fgChanged(const TQColor &)), + TQ_SLOT(slotFgChanged(const TQColor &))); + connect(colorBtn, TQ_SIGNAL(bgChanged(const TQColor &)), + TQ_SLOT(slotBgChanged(const TQColor &))); + connect(colorBtn, TQ_SIGNAL(currentChanged(KDualColorButton::DualColor)), + TQ_SLOT(slotCurrentChanged(KDualColorButton::DualColor))); TQHBoxLayout *layout = new TQHBoxLayout(this, 5); layout->addWidget(colorBtn, 0); diff --git a/tdeui/tests/kjanuswidgettest.cpp b/tdeui/tests/kjanuswidgettest.cpp index 71e72fb13..798145f47 100644 --- a/tdeui/tests/kjanuswidgettest.cpp +++ b/tdeui/tests/kjanuswidgettest.cpp @@ -18,7 +18,7 @@ int main(int argc, char** argv) TQCheckBox* cb2 = new TQCheckBox( "a", page2 ); janus->show(); - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) ); return app.exec(); } diff --git a/tdeui/tests/kledtest.cpp b/tdeui/tests/kledtest.cpp index 564d4d2f2..4694bd2c9 100644 --- a/tdeui/tests/kledtest.cpp +++ b/tdeui/tests/kledtest.cpp @@ -42,9 +42,9 @@ KLedTest::KLedTest(TQWidget* parent) t_toggle.start(1000, false); t_color.start(3500, false); t_look.start(3500, false); - TQObject::connect(&t_toggle, TQT_SIGNAL(timeout()), l, TQT_SLOT(toggle())); - TQObject::connect(&t_color, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextColor())); - TQObject::connect(&t_look, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextLook())); + TQObject::connect(&t_toggle, TQ_SIGNAL(timeout()), l, TQ_SLOT(toggle())); + TQObject::connect(&t_color, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextColor())); + TQObject::connect(&t_look, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextLook())); l->show(); resize(240,140); } @@ -66,7 +66,7 @@ KLedTest::KLedTest(TQWidget* parent) y+=Grid+LedHeight; } setFixedSize(x+Grid, y+Grid); - connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); + connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout())); timer.start(500); } } diff --git a/tdeui/tests/klineedittest.cpp b/tdeui/tests/klineedittest.cpp index 20e9b6ca8..e9601ccec 100644 --- a/tdeui/tests/klineedittest.cpp +++ b/tdeui/tests/klineedittest.cpp @@ -31,28 +31,28 @@ KLineEditTest::KLineEditTest (TQWidget* widget, const char* name ) m_lineedit->completionObject()->setItems( list ); m_lineedit->setFixedSize(500,30); m_lineedit->setEnableSqueezedText( true ); - connect( m_lineedit, TQT_SIGNAL( returnPressed() ), TQT_SLOT( slotReturnPressed() ) ); - connect( m_lineedit, TQT_SIGNAL( returnPressed(const TQString&) ), - TQT_SLOT( slotReturnPressed(const TQString&) ) ); + connect( m_lineedit, TQ_SIGNAL( returnPressed() ), TQ_SLOT( slotReturnPressed() ) ); + connect( m_lineedit, TQ_SIGNAL( returnPressed(const TQString&) ), + TQ_SLOT( slotReturnPressed(const TQString&) ) ); TQHBox *hbox = new TQHBox (this); m_btnExit = new TQPushButton( "E&xit", hbox ); m_btnExit->setFixedSize(100,30); - connect( m_btnExit, TQT_SIGNAL( clicked() ), TQT_SLOT( quitApp() ) ); + connect( m_btnExit, TQ_SIGNAL( clicked() ), TQ_SLOT( quitApp() ) ); m_btnReadOnly = new TQPushButton( "&Read Only", hbox ); m_btnReadOnly->setToggleButton (true); m_btnReadOnly->setFixedSize(100,30); - connect( m_btnReadOnly, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotReadOnly(bool) ) ); + connect( m_btnReadOnly, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotReadOnly(bool) ) ); m_btnEnable = new TQPushButton( "Dis&able", hbox ); m_btnEnable->setToggleButton (true); m_btnEnable->setFixedSize(100,30); - connect( m_btnEnable, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotEnable(bool) ) ); + connect( m_btnEnable, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotEnable(bool) ) ); m_btnHide = new TQPushButton( "Hi&de", hbox ); m_btnHide->setFixedSize(100,30); - connect( m_btnHide, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHide() ) ); + connect( m_btnHide, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHide() ) ); layout->addWidget( m_lineedit ); layout->addWidget( hbox ); @@ -113,7 +113,7 @@ void KLineEditTest::slotHide() m_btnHide->setEnabled( false ); m_lineedit->setText( "My dog ate the homework, whaaaaaaaaaaaaaaaaaaaaaaa" "aaaaaaaaaaaaaaaaaaaaaaaaa! I want my mommy!" ); - TQTimer::singleShot( 1000, this, TQT_SLOT(show()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(show()) ); } int main ( int argc, char **argv) diff --git a/tdeui/tests/knuminputtest.cpp b/tdeui/tests/knuminputtest.cpp index 9a333dfda..8e99df1b9 100644 --- a/tdeui/tests/knuminputtest.cpp +++ b/tdeui/tests/knuminputtest.cpp @@ -26,7 +26,7 @@ void TopLevel::slotPrint( double n ) { kdDebug() << "slotPrint( " << n << " )" << endl; } -#define conn(x,y) connect( x, TQT_SIGNAL(valueChanged(y)), TQT_SLOT(slotPrint(y))) +#define conn(x,y) connect( x, TQ_SIGNAL(valueChanged(y)), TQ_SLOT(slotPrint(y))) TopLevel::TopLevel(TQWidget *parent, const char *name) : TQWidget(parent, name) { @@ -67,10 +67,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) i6->setLabel("Height (should be 2xWidth):"); i6->setRange(0, 200, 1, false); i6->setReferencePoint( 10 ); - connect( i5, TQT_SIGNAL(relativeValueChanged(double)), - i6, TQT_SLOT(setRelativeValue(double)) ); - connect( i6, TQT_SIGNAL(relativeValueChanged(double)), - i5, TQT_SLOT(setRelativeValue(double)) ); + connect( i5, TQ_SIGNAL(relativeValueChanged(double)), + i6, TQ_SLOT(setRelativeValue(double)) ); + connect( i6, TQ_SIGNAL(relativeValueChanged(double)), + i5, TQ_SLOT(setRelativeValue(double)) ); i7 = new KIntNumInput(i6, 0, b1, 10); i7->setLabel("math test:", AlignVCenter|AlignLeft ); @@ -119,10 +119,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) d7 = new KDoubleNumInput(d6, -30, 30, 0, 0.001, 3, b2, "d7"); d7->setReferencePoint( -3 ); - connect( d6, TQT_SIGNAL(relativeValueChanged(double)), - d7, TQT_SLOT(setRelativeValue(double)) ); - connect( d7, TQT_SIGNAL(relativeValueChanged(double)), - d6, TQT_SLOT(setRelativeValue(double)) ); + connect( d6, TQ_SIGNAL(relativeValueChanged(double)), + d7, TQ_SLOT(setRelativeValue(double)) ); + connect( d7, TQ_SIGNAL(relativeValueChanged(double)), + d6, TQ_SLOT(setRelativeValue(double)) ); l->addWidget(b2); } diff --git a/tdeui/tests/kpanelmenutest.cpp b/tdeui/tests/kpanelmenutest.cpp index a14cb3366..c08c03a8c 100644 --- a/tdeui/tests/kpanelmenutest.cpp +++ b/tdeui/tests/kpanelmenutest.cpp @@ -15,8 +15,8 @@ TestWidget::TestWidget(TQWidget *parent, const char *name) KPanelAppMenu *ssub = subMenu->insertMenu(locate("mini", "x.png"), "One more"); - connect(testMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotMenuCalled(int))); - connect(subMenu, TQT_SIGNAL(activated(int)), TQT_SLOT(slotSubMenuCalled(int))); + connect(testMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotMenuCalled(int))); + connect(subMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSubMenuCalled(int))); init(); setText("We added \"Client Test\" to kicker. Click the TDE Menu to check."); diff --git a/tdeui/tests/krulertest.cpp b/tdeui/tests/krulertest.cpp index 628c5096e..28bc2a362 100644 --- a/tdeui/tests/krulertest.cpp +++ b/tdeui/tests/krulertest.cpp @@ -76,14 +76,14 @@ KRulerTest::KRulerTest( const char *name ) vruler->setOffset( 0 ); vruler->setRange( 0, 1000 ); - connect( bigwidget, TQT_SIGNAL(newXPos(int)), - hruler, TQT_SLOT(slotNewValue(int)) ); - connect( bigwidget, TQT_SIGNAL(newYPos(int)), - vruler, TQT_SLOT(slotNewValue(int)) ); - connect( bigwidget, TQT_SIGNAL(newWidth(int)), - TQT_SLOT(slotNewWidth(int)) ); - connect( bigwidget, TQT_SIGNAL(newHeight(int)), - TQT_SLOT(slotNewHeight(int)) ); + connect( bigwidget, TQ_SIGNAL(newXPos(int)), + hruler, TQ_SLOT(slotNewValue(int)) ); + connect( bigwidget, TQ_SIGNAL(newYPos(int)), + vruler, TQ_SLOT(slotNewValue(int)) ); + connect( bigwidget, TQ_SIGNAL(newWidth(int)), + TQ_SLOT(slotNewWidth(int)) ); + connect( bigwidget, TQ_SIGNAL(newHeight(int)), + TQ_SLOT(slotNewHeight(int)) ); layout->addWidget(miniwidget, 0, 0); layout->addWidget(hruler, 0, 1); @@ -101,38 +101,38 @@ KRulerTest::KRulerTest( const char *name ) showTM->adjustSize(); showTM->move(5,15); showTM->setChecked(true); - connect(showTM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetTinyMarks(bool)) ); + connect(showTM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetTinyMarks(bool)) ); showLM = new TQCheckBox("show little marks", showMarks); showLM->adjustSize(); showLM->move(5,35); showLM->setChecked(true); - connect(showLM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetLittleMarks(bool)) ); + connect(showLM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetLittleMarks(bool)) ); showMM = new TQCheckBox("show medium marks", showMarks); showMM->adjustSize(); showMM->move(5,55); showMM->setChecked(true); - connect(showMM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetMediumMarks(bool)) ); + connect(showMM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetMediumMarks(bool)) ); showBM = new TQCheckBox("show big marks", showMarks); showBM->adjustSize(); showBM->move(5,75); showBM->setChecked(true); - connect(showBM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetBigMarks(bool)) ); + connect(showBM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetBigMarks(bool)) ); showEM = new TQCheckBox("show end marks", showMarks); showEM->adjustSize(); showEM->move(5,95); showEM->setChecked(true); - connect(showEM, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetEndMarks(bool)) ); + connect(showEM, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetEndMarks(bool)) ); showPT = new TQCheckBox("show ruler pointer", showMarks); showPT->adjustSize(); showPT->move(5,115); showPT->setChecked(true); - connect(showPT, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotSetRulerPointer(bool)) ); + connect(showPT, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotSetRulerPointer(bool)) ); fixLen = new TQCheckBox("fix ruler length", showMarks); fixLen->adjustSize(); fixLen->move(5,135); fixLen->setChecked(true); - connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFixRulerLength(bool)) ); - connect(fixLen, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotCheckLength(bool)) ); + connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFixRulerLength(bool)) ); + connect(fixLen, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotCheckLength(bool)) ); lineEdit = new TQGroupBox("Value of begin/end", bigwidget); lineEdit->setFixedSize(140, 80); @@ -141,26 +141,26 @@ KRulerTest::KRulerTest( const char *name ) beginMark->setRange(-1000, 1000, 1, false); beginMark->move(5, 15); beginMark->setFixedSize(beginMark->sizeHint()); - connect(beginMark, TQT_SIGNAL(valueChanged(int)), - hruler, TQT_SLOT(slotNewOffset(int)) ); - connect(beginMark, TQT_SIGNAL(valueChanged(int)), - vruler, TQT_SLOT(slotNewOffset(int)) ); + connect(beginMark, TQ_SIGNAL(valueChanged(int)), + hruler, TQ_SLOT(slotNewOffset(int)) ); + connect(beginMark, TQ_SIGNAL(valueChanged(int)), + vruler, TQ_SLOT(slotNewOffset(int)) ); endMark = new KIntNumInput(0, lineEdit); endMark->setRange(-1000, 1000, 1, false); endMark->move(5, 35); endMark->setFixedSize(endMark->sizeHint()); - connect(endMark, TQT_SIGNAL(valueChanged(int)), - hruler, TQT_SLOT(slotEndOffset(int)) ); - connect(endMark, TQT_SIGNAL(valueChanged(int)), - vruler, TQT_SLOT(slotEndOffset(int)) ); + connect(endMark, TQ_SIGNAL(valueChanged(int)), + hruler, TQ_SLOT(slotEndOffset(int)) ); + connect(endMark, TQ_SIGNAL(valueChanged(int)), + vruler, TQ_SLOT(slotEndOffset(int)) ); lengthInput = new KIntNumInput(0, lineEdit); lengthInput->setRange(-1000, 1000, 1, false); lengthInput->move(5, 55); lengthInput->setFixedSize(lengthInput->sizeHint()); - connect(lengthInput, TQT_SIGNAL(valueChanged(int)), - hruler, TQT_SLOT(slotEndOffset(int)) ); - connect(lengthInput, TQT_SIGNAL(valueChanged(int)), - vruler, TQT_SLOT(slotEndOffset(int)) ); + connect(lengthInput, TQ_SIGNAL(valueChanged(int)), + hruler, TQ_SLOT(slotEndOffset(int)) ); + connect(lengthInput, TQ_SIGNAL(valueChanged(int)), + vruler, TQ_SLOT(slotEndOffset(int)) ); vertrot = new TQGroupBox("Value of rotate translate for Vert.", bigwidget); @@ -171,22 +171,22 @@ KRulerTest::KRulerTest( const char *name ) transX->move(5, 15); transX->setFixedSize(transX->sizeHint()); //transX->setLabel("transx", AlignLeft); - connect(transX, TQT_SIGNAL(valueChanged(double)), - TQT_SLOT(slotSetXTrans(double)) ); + connect(transX, TQ_SIGNAL(valueChanged(double)), + TQ_SLOT(slotSetXTrans(double)) ); transY = new KDoubleNumInput(-12.0, vertrot); transY->setRange(-1000, 1000, 1, false); transY->move(5, 35); transY->setFixedSize(transY->sizeHint()); //transY->setLabel("transy", AlignLeft); - connect(transY, TQT_SIGNAL(valueChanged(double)), - TQT_SLOT(slotSetYTrans(double)) ); + connect(transY, TQ_SIGNAL(valueChanged(double)), + TQ_SLOT(slotSetYTrans(double)) ); rotV = new KDoubleNumInput(90.0, vertrot); rotV->setRange(-1000, 1000, 1, false); rotV->move(5, 55); rotV->setFixedSize(rotV->sizeHint()); //rotV->setLabel("rot", AlignLeft); - connect(rotV, TQT_SIGNAL(valueChanged(double)), - TQT_SLOT(slotSetRotate(double)) ); + connect(rotV, TQ_SIGNAL(valueChanged(double)), + TQ_SLOT(slotSetRotate(double)) ); metricstyle = new TQButtonGroup("metric styles", bigwidget); @@ -212,7 +212,7 @@ KRulerTest::KRulerTest( const char *name ) mmetric->adjustSize(); mmetric->move(5,95); metricstyle->insert(mmetric, (int)KRuler::Metres); - connect ( metricstyle, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotSetMStyle(int)) ); + connect ( metricstyle, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotSetMStyle(int)) ); setCentralWidget(mainframe); diff --git a/tdeui/tests/kstatusbartest.cpp b/tdeui/tests/kstatusbartest.cpp index 0a8c6d10c..a2bb2b6e8 100644 --- a/tdeui/tests/kstatusbartest.cpp +++ b/tdeui/tests/kstatusbartest.cpp @@ -23,7 +23,7 @@ testWindow::testWindow (TQWidget *, const char *name) fileMenu = new TQPopupMenu; menuBar->insertItem ("&File", fileMenu); fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), - TQT_SLOT( quit() ), ALT + Key_Q ); + TQ_SLOT( quit() ), ALT + Key_Q ); statusbar = new KStatusBar (this); statusbar->insertItem("Zoom: XXXX", 0); statusbar->insertItem("XXX", 1); @@ -34,8 +34,8 @@ testWindow::testWindow (TQWidget *, const char *name) insert = true; statusbar->changeItem("Line: 13567", 2); - connect (statusbar, TQT_SIGNAL(pressed(int)), this, TQT_SLOT(slotPress(int))); - connect (statusbar, TQT_SIGNAL(released(int)), this, TQT_SLOT(slotClick(int))); + connect (statusbar, TQ_SIGNAL(pressed(int)), this, TQ_SLOT(slotPress(int))); + connect (statusbar, TQ_SIGNAL(released(int)), this, TQ_SLOT(slotClick(int))); widget = new TQMultiLineEdit (this); @@ -53,7 +53,7 @@ testWindow::testWindow (TQWidget *, const char *name) smenu->insertItem("400%"); smenu->insertItem("oo%"); - connect (smenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenu(int))); + connect (smenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenu(int))); } void testWindow::slotClick(int id) diff --git a/tdeui/tests/ktabctltest.cpp b/tdeui/tests/ktabctltest.cpp index 05fe2aeb3..27229e436 100644 --- a/tdeui/tests/ktabctltest.cpp +++ b/tdeui/tests/ktabctltest.cpp @@ -43,10 +43,10 @@ TopLevel::TopLevel(TQWidget *parent, const char *name) */ test = new KTabCtl(this, "test"); - connect(test, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(tabChanged(int))); + connect(test, TQ_SIGNAL(tabSelected(int)), this, TQ_SLOT(tabChanged(int))); TQWidget *w = new TQWidget(test, "_page1"); TQPushButton *bt = new TQPushButton("Click me to quit", w, "_bt1"); - connect(bt, TQT_SIGNAL(clicked()), this, TQT_SLOT(okPressed())); + connect(bt, TQ_SIGNAL(clicked()), this, TQ_SLOT(okPressed())); bt->adjustSize(); bt->move(20, 20); test->addTab(w, "Seite 1"); diff --git a/tdeui/tests/ktabwidgettest.cpp b/tdeui/tests/ktabwidgettest.cpp index 01bafd192..362df8558 100644 --- a/tdeui/tests/ktabwidgettest.cpp +++ b/tdeui/tests/ktabwidgettest.cpp @@ -24,18 +24,18 @@ Test::Test( TQWidget* parent, const char *name ) mWidget->setTabColor( mWidget->page(0), TQt::red ); mWidget->setTabColor( mWidget->page(1), TQt::blue ); - connect( mWidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), TQT_SLOT( currentChanged( TQWidget * ) ) ); - connect( mWidget, TQT_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQT_SLOT(contextMenu( TQWidget *, const TQPoint & ))); - connect( mWidget, TQT_SIGNAL( contextMenu( const TQPoint & )), TQT_SLOT(tabbarContextMenu( const TQPoint & ))); - connect( mWidget, TQT_SIGNAL( mouseDoubleClick( TQWidget * )), TQT_SLOT(mouseDoubleClick( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( mouseMiddleClick() ), TQT_SLOT(addTab() )); - connect( mWidget, TQT_SIGNAL( mouseMiddleClick( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( closeRequest( TQWidget * )), TQT_SLOT(mouseMiddleClick( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQT_SLOT(testCanDecode(const TQDragMoveEvent *, bool & ))); - connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQDropEvent * ))); - connect( mWidget, TQT_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQT_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * ))); - connect( mWidget, TQT_SIGNAL( initiateDrag( TQWidget * )), TQT_SLOT(initiateDrag( TQWidget * ))); - connect( mWidget, TQT_SIGNAL( movedTab( int, int )), TQT_SLOT(movedTab( int, int ))); + connect( mWidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), TQ_SLOT( currentChanged( TQWidget * ) ) ); + connect( mWidget, TQ_SIGNAL( contextMenu( TQWidget *, const TQPoint & )), TQ_SLOT(contextMenu( TQWidget *, const TQPoint & ))); + connect( mWidget, TQ_SIGNAL( contextMenu( const TQPoint & )), TQ_SLOT(tabbarContextMenu( const TQPoint & ))); + connect( mWidget, TQ_SIGNAL( mouseDoubleClick( TQWidget * )), TQ_SLOT(mouseDoubleClick( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( mouseMiddleClick() ), TQ_SLOT(addTab() )); + connect( mWidget, TQ_SIGNAL( mouseMiddleClick( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( closeRequest( TQWidget * )), TQ_SLOT(mouseMiddleClick( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( testCanDecode(const TQDragMoveEvent *, bool & )), TQ_SLOT(testCanDecode(const TQDragMoveEvent *, bool & ))); + connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQDropEvent * ))); + connect( mWidget, TQ_SIGNAL( receivedDropEvent( TQWidget *, TQDropEvent * )), TQ_SLOT(receivedDropEvent( TQWidget *, TQDropEvent * ))); + connect( mWidget, TQ_SIGNAL( initiateDrag( TQWidget * )), TQ_SLOT(initiateDrag( TQWidget * ))); + connect( mWidget, TQ_SIGNAL( movedTab( int, int )), TQ_SLOT(movedTab( int, int ))); mWidget->setTabReorderingEnabled( true ); TQWidget * grid = new TQWidget(this); @@ -43,48 +43,48 @@ Test::Test( TQWidget* parent, const char *name ) TQPushButton * addTab = new TQPushButton( "Add Tab", grid ); gridlayout->addWidget( addTab, 0, 0 ); - connect( addTab, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) ); + connect( addTab, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) ); TQPushButton * removeTab = new TQPushButton( "Remove Current Tab", grid ); gridlayout->addWidget( removeTab, 0, 1 ); - connect( removeTab, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) ); + connect( removeTab, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) ); mLeftButton = new TQCheckBox( "Show left button", grid ); gridlayout->addWidget( mLeftButton, 1, 0 ); - connect( mLeftButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftButton(bool) ) ); + connect( mLeftButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftButton(bool) ) ); mLeftButton->setChecked(true); TQCheckBox * leftPopup = new TQCheckBox( "Enable left popup", grid ); gridlayout->addWidget( leftPopup, 2, 0 ); - connect( leftPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleLeftPopup(bool) ) ); + connect( leftPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleLeftPopup(bool) ) ); leftPopup->setChecked(true); mRightButton = new TQCheckBox( "Show right button", grid ); gridlayout->addWidget( mRightButton, 1, 1 ); - connect( mRightButton, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightButton(bool) ) ); + connect( mRightButton, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightButton(bool) ) ); mRightButton->setChecked(true); TQCheckBox * rightPopup = new TQCheckBox( "Enable right popup", grid ); gridlayout->addWidget( rightPopup, 2, 1 ); - connect( rightPopup, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleRightPopup(bool) ) ); + connect( rightPopup, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleRightPopup(bool) ) ); rightPopup->setChecked(true); mTabsBottom = new TQCheckBox( "Show tabs at bottom", grid ); gridlayout->addWidget( mTabsBottom, 3, 0 ); - connect( mTabsBottom, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabPosition(bool) ) ); + connect( mTabsBottom, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabPosition(bool) ) ); TQCheckBox * tabshape = new TQCheckBox( "Triangular tab shape", grid ); gridlayout->addWidget( tabshape, 3, 1 ); - connect( tabshape, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleTabShape(bool) ) ); + connect( tabshape, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleTabShape(bool) ) ); TQCheckBox *tabClose = new TQCheckBox( "Close button on icon hover", grid ); gridlayout->addWidget( tabClose, 4, 0 ); - connect( tabClose, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( toggleCloseButtons(bool) ) ); + connect( tabClose, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( toggleCloseButtons(bool) ) ); tabClose->setChecked(true); TQCheckBox * showlabels = new TQCheckBox( "Show labels", grid ); gridlayout->addWidget( showlabels, 4, 1 ); - connect( showlabels, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT( toggleLabels(bool) ) ); + connect( showlabels, TQ_SIGNAL( toggled(bool) ), this, TQ_SLOT( toggleLabels(bool) ) ); } void Test::currentChanged(TQWidget* w) @@ -137,7 +137,7 @@ void Test::toggleLeftButton(bool state) if (state) { if (!mLeftWidget) { mLeftWidget = new TQToolButton( mWidget ); - connect( mLeftWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( addTab() ) ); + connect( mLeftWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( addTab() ) ); mLeftWidget->setIconSet( SmallIcon( "tab_new" ) ); mLeftWidget->setTextLabel("New"); mLeftWidget->setTextPosition(TQToolButton::Right); @@ -162,7 +162,7 @@ void Test::toggleLeftPopup(bool state) mLeftPopup->insertSeparator(); mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Button Tab", 1); mLeftPopup->insertItem(SmallIcon( "tab_new" ), "Label Tab", 2); - connect(mLeftPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(leftPopupActivated(int))); + connect(mLeftPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(leftPopupActivated(int))); } mLeftWidget->setPopup(mLeftPopup); } @@ -188,7 +188,7 @@ void Test::toggleRightButton(bool state) if (state) { if ( !mRightWidget) { mRightWidget = new TQToolButton( mWidget ); - TQObject::connect( mRightWidget, TQT_SIGNAL( clicked() ), TQT_SLOT( removeCurrentTab() ) ); + TQObject::connect( mRightWidget, TQ_SIGNAL( clicked() ), TQ_SLOT( removeCurrentTab() ) ); mRightWidget->setIconSet( SmallIcon( "tab_remove" ) ); mRightWidget->setTextLabel("Close"); mRightWidget->setTextPosition(TQToolButton::Right); @@ -212,7 +212,7 @@ void Test::toggleRightPopup(bool state) mRightPopup->insertSeparator(); mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Left Tab", 0); mRightPopup->insertItem(SmallIcon( "tab_remove" ), "Most Right Tab", 2); - connect(mRightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(rightPopupActivated(int))); + connect(mRightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(rightPopupActivated(int))); } mRightWidget->setPopup(mRightPopup); } @@ -264,7 +264,7 @@ void Test::contextMenu(TQWidget *w, const TQPoint &p) mContextPopup->insertSeparator(); mContextPopup->insertItem( mWidget->isTabEnabled(w) ? "Disable Tab" : "Enable Tab", 2); mContextPopup->insertItem( mWidget->tabToolTip(w).isEmpty() ? "Set Tooltip" : "Remove Tooltip", 3); - connect(mContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(contextMenuActivated(int))); + connect(mContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(contextMenuActivated(int))); mContextWidget = w; mContextPopup->popup(p); @@ -300,7 +300,7 @@ void Test::tabbarContextMenu(const TQPoint &p) mTabbarContextPopup->insertItem(SmallIcon( "tab_remove" ), mRightWidget->isVisible() ? "Hide \"Remove\" Button" : "Show \"Remove\" Button", 1); mTabbarContextPopup->insertSeparator(); mTabbarContextPopup->insertItem(mWidget->tabPosition()==TQTabWidget::Top ? "Put Tabbar to Bottom" : "Put Tabbar to Top", 2); - connect(mTabbarContextPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(tabbarContextMenuActivated(int))); + connect(mTabbarContextPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(tabbarContextMenuActivated(int))); mTabbarContextPopup->popup(p); } diff --git a/tdeui/tests/kunbalancedgrdtest.cpp b/tdeui/tests/kunbalancedgrdtest.cpp index cf76e7980..839a9c71a 100644 --- a/tdeui/tests/kunbalancedgrdtest.cpp +++ b/tdeui/tests/kunbalancedgrdtest.cpp @@ -138,8 +138,8 @@ myTopWidget::myTopWidget (TQWidget *parent, const char *name) ySlider = new TQSlider ( -200, 200, 1, 100, TQSlider::Horizontal, this); lay->addWidget(ySlider, 1, 2); - connect(xSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance())); - connect(ySlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(rebalance())); + connect(xSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance())); + connect(ySlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(rebalance())); rebalance(); diff --git a/tdeui/tests/kwizardtest.cpp b/tdeui/tests/kwizardtest.cpp index bbe028a1a..591e71d7e 100644 --- a/tdeui/tests/kwizardtest.cpp +++ b/tdeui/tests/kwizardtest.cpp @@ -27,10 +27,10 @@ int main(int argc, char **argv) { TDEApplication a(argc,argv,"kwizardtest"); KWizard *wiz = new KWizard(0, "kwizardtest", false); - TQObject::connect((TQObject*) wiz->cancelButton(), TQT_SIGNAL(clicked()), - &a, TQT_SLOT(quit())); - TQObject::connect((TQObject*) wiz->finishButton(), TQT_SIGNAL(clicked()), - &a, TQT_SLOT(quit())); + TQObject::connect((TQObject*) wiz->cancelButton(), TQ_SIGNAL(clicked()), + &a, TQ_SLOT(quit())); + TQObject::connect((TQObject*) wiz->finishButton(), TQ_SIGNAL(clicked()), + &a, TQ_SLOT(quit())); for(int i = 1; i < 11; i++) { TQWidget *p = new TQWidget; diff --git a/tdeui/tests/kxmlguitest.cpp b/tdeui/tests/kxmlguitest.cpp index 7c224db8d..d32593094 100644 --- a/tdeui/tests/kxmlguitest.cpp +++ b/tdeui/tests/kxmlguitest.cpp @@ -48,7 +48,7 @@ int main( int argc, char **argv ) Client *part = new Client; (void)new TDEAction( "decfont", "zoom-out", 0, 0, 0, part->actionCollection(), "decFontSizes" ); - (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQT_SLOT( slotSec() ), part->actionCollection(), "security" ); + (void)new TDEAction( "sec", "unlock", TQt::ALT + TQt::Key_1, part, TQ_SLOT( slotSec() ), part->actionCollection(), "security" ); part->setXMLFile( "./kxmlguitest_part.rc" ); diff --git a/tdeui/tests/qxembedtest.cpp b/tdeui/tests/qxembedtest.cpp index 2ee3d7907..fe6c9aef9 100644 --- a/tdeui/tests/qxembedtest.cpp +++ b/tdeui/tests/qxembedtest.cpp @@ -28,7 +28,7 @@ main(int argc, char**argv) TQWidget *main = new TQVBox(NULL,"main",TQt::WDestructiveClose); TQWidget *top = new TQHBox(main); TQPushButton *quit = new TQPushButton("Quit", top); - TQObject::connect( quit, TQT_SIGNAL(clicked()), main, TQT_SLOT(close()) ); + TQObject::connect( quit, TQ_SIGNAL(clicked()), main, TQ_SLOT(close()) ); TQLineEdit *edit = new TQLineEdit(top); edit->setText( "Just to see focus changes"); QXEmbed *embed = new QXEmbed(main); diff --git a/tdeui/tests/tdemainwindowtest.cpp b/tdeui/tests/tdemainwindowtest.cpp index bf92dc11c..ffaaa8862 100644 --- a/tdeui/tests/tdemainwindowtest.cpp +++ b/tdeui/tests/tdemainwindowtest.cpp @@ -9,7 +9,7 @@ MainWindow::MainWindow() { - TQTimer::singleShot( 2*1000, this, TQT_SLOT( showMessage() ) ); + TQTimer::singleShot( 2*1000, this, TQ_SLOT( showMessage() ) ); setCentralWidget( new TQLabel( "foo", this ) ); diff --git a/tdeui/tests/tdepopuptest.cpp b/tdeui/tests/tdepopuptest.cpp index f9a97bad4..637031443 100644 --- a/tdeui/tests/tdepopuptest.cpp +++ b/tdeui/tests/tdepopuptest.cpp @@ -24,7 +24,7 @@ public: menu->insertItem("Item1"); menu->insertItem("Item2"); menu->insertSeparator(); - menu->insertItem("Quit", tqApp, TQT_SLOT(quit())); + menu->insertItem("Quit", tqApp, TQ_SLOT(quit())); } }; diff --git a/tdeui/tests/twindowtest.cpp b/tdeui/tests/twindowtest.cpp index f826f13b0..8fd5170e0 100644 --- a/tdeui/tests/twindowtest.cpp +++ b/tdeui/tests/twindowtest.cpp @@ -56,13 +56,13 @@ setAutoSaveSettings(); // We insert item "Exit" with accelerator ALT-Q, and connect // it to application's exit-slot. fileMenu->insertItem ("&Exit", TDEApplication::kApplication(), - TQT_SLOT( quit() ), ALT + Key_Q ); + TQ_SLOT( quit() ), ALT + Key_Q ); // Another popup... toolBarMenu = new TQPopupMenu; menuBar->insertItem ("&Toolbars", toolBarMenu); - toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQT_SLOT(slotHide1())); - toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQT_SLOT(slotHide2())); + toolBarMenu->insertItem ("(Un)Hide tollbar 1", this, TQ_SLOT(slotHide1())); + toolBarMenu->insertItem ("(Un)Hide tollbar 2", this, TQ_SLOT(slotHide2())); itemsMenu = new TQPopupMenu; menuBar->insertItem ("&Items", itemsMenu); @@ -71,15 +71,15 @@ setAutoSaveSettings(); lineL = true; // Lined is enabled greenF = false; // Frame not inserted - itemsMenu->insertItem ("delete/insert exit button", this, TQT_SLOT(slotExit())); - itemsMenu->insertItem ("insert/delete green frame!", this, TQT_SLOT(slotFrame())); - itemsMenu->insertItem ("enable/disable Lined", this, TQT_SLOT(slotLined())); - itemsMenu->insertItem ("Toggle fileNew", this, TQT_SLOT(slotNew())); - itemsMenu->insertItem ("Clear comboBox", this, TQT_SLOT(slotClearCombo())); - itemsMenu->insertItem ("Insert List in Combo", this, TQT_SLOT(slotInsertListInCombo())); - itemsMenu->insertItem ("Make item 3 curent", this, TQT_SLOT(slotMakeItem3Current())); - //itemsMenu->insertItem ("Insert clock!", this, TQT_SLOT(slotInsertClock())); - itemsMenu->insertItem ("Important!", this, TQT_SLOT(slotImportant())); + itemsMenu->insertItem ("delete/insert exit button", this, TQ_SLOT(slotExit())); + itemsMenu->insertItem ("insert/delete green frame!", this, TQ_SLOT(slotFrame())); + itemsMenu->insertItem ("enable/disable Lined", this, TQ_SLOT(slotLined())); + itemsMenu->insertItem ("Toggle fileNew", this, TQ_SLOT(slotNew())); + itemsMenu->insertItem ("Clear comboBox", this, TQ_SLOT(slotClearCombo())); + itemsMenu->insertItem ("Insert List in Combo", this, TQ_SLOT(slotInsertListInCombo())); + itemsMenu->insertItem ("Make item 3 curent", this, TQ_SLOT(slotMakeItem3Current())); + //itemsMenu->insertItem ("Insert clock!", this, TQ_SLOT(slotInsertClock())); + itemsMenu->insertItem ("Important!", this, TQ_SLOT(slotImportant())); menuBar->insertSeparator(); helpMenu = new KHelpMenu(this, "KWindowTest was programmed by Sven Radej"); @@ -113,30 +113,30 @@ setAutoSaveSettings(); // First four buttons pix = BarIcon("document-new"); - itemId = tb->insertButton(pix, 0, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNew()), + itemId = tb->insertButton(pix, 0, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotNew()), true, "Create.. (toggles upper button)", 50); pix = BarIcon("document-open"); - tb->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), + tb->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()), false, "Open"); pix = BarIcon("filefloppy"); - tb->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()), + tb->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()), true, "Save (beep or delayed popup)"); tb->setDelayedPopup(2, itemsMenu); pix = BarIcon("document-print"); - tb->insertButton(pix, 3, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrint()), + tb->insertButton(pix, 3, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotPrint()), true, "Print (enables/disables open)"); // And a combobox // arguments: text (or strList), ID, writable, signal, object, slot, enabled, // tooltiptext, size - tb->insertCombo (TQString("one"), 4, true, TQT_SIGNAL(activated(const TQString&)), this, - TQT_SLOT(slotList(const TQString&)), true, "ComboBox", 150); + tb->insertCombo (TQString("one"), 4, true, TQ_SIGNAL(activated(const TQString&)), this, + TQ_SLOT(slotList(const TQString&)), true, "ComboBox", 150); // Then one line editor // arguments: text, id, signal, object (this), slot, enabled, tooltiptext, size - tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQT_SIGNAL(returnPressed()), this, - TQT_SLOT(slotReturn()), true, "Location", 200); + tb->insertLined ("ftp://ftp.kde.org/pub/kde", 5, TQ_SIGNAL(returnPressed()), this, + TQ_SLOT(slotReturn()), true, "Location", 200); // Set this Lined to auto size itself. Note that only one item (Lined or Combo) // Can be set to autosize; If you specify more of them only last (according to @@ -148,8 +148,8 @@ setAutoSaveSettings(); // Now add another button and align it right pix = BarIcon("system-log-out"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), - TQT_SLOT( quit() ), true, "Exit"); + tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(), + TQ_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); // Another toolbar @@ -159,16 +159,16 @@ setAutoSaveSettings(); pix = BarIcon("document-new"); tb1->insertButton(pix, 0, true, "Create new file2 (Toggle)"); tb1->setToggle(0); - tb1->addConnection (0, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggle(bool))); + tb1->addConnection (0, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotToggle(bool))); pix = BarIcon("document-open"); - tb1->insertButton(pix, 1, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOpen()), + tb1->insertButton(pix, 1, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOpen()), true, "Open (starts progres in sb)"); tb1->insertSeparator (); pix = BarIcon("filefloppy"); - tb1->insertButton(pix, 2, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSave()), + tb1->insertButton(pix, 2, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSave()), true, "Save file2 (autorepeat)"); tb1->setAutoRepeat(2); @@ -201,7 +201,7 @@ setAutoSaveSettings(); rg->addButton(6); rg->addButton(7); - connect (tb1, TQT_SIGNAL(toggled(int)), this, TQT_SLOT(slotToggled(int))); + connect (tb1, TQ_SIGNAL(toggled(int)), this, TQ_SLOT(slotToggled(int))); // Set caption for floating toolbars tb->setTitle ("Toolbar 1"); @@ -216,8 +216,8 @@ setAutoSaveSettings(); //addToolBar (tb1); //addToolBar (tb); - connect (tb, TQT_SIGNAL(highlighted(int,bool)), this, TQT_SLOT(slotMessage(int, bool))); - connect (tb1, TQT_SIGNAL(highlighted(int, bool)), this, TQT_SLOT(slotMessage(int, bool))); + connect (tb, TQ_SIGNAL(highlighted(int,bool)), this, TQ_SLOT(slotMessage(int, bool))); + connect (tb1, TQ_SIGNAL(highlighted(int, bool)), this, TQ_SLOT(slotMessage(int, bool))); // Floating is enabled by default, so you don't need this. // tb->enableFloating(true); @@ -243,7 +243,7 @@ setAutoSaveSettings(); completions->insertItem("/home/"); completions->insertItem("/vmlinuz :-)"); - connect (completions, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotCompletionsMenu(int))); + connect (completions, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotCompletionsMenu(int))); pr = 0; } /***********************************/ @@ -273,7 +273,7 @@ void testWindow::slotOpen() // statusBar->message(pr); timer = new TQTimer (pr); - connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotGoGoGoo())); + connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotGoGoGoo())); timer->start(100); } @@ -408,8 +408,8 @@ void testWindow::slotExit () { TQPixmap pix; pix = BarIcon("system-log-out"); - tb->insertButton(pix, 6, TQT_SIGNAL(clicked()), TDEApplication::kApplication(), - TQT_SLOT( quit() ), true, "Exit"); + tb->insertButton(pix, 6, TQ_SIGNAL(clicked()), TDEApplication::kApplication(), + TQ_SLOT( quit() ), true, "Exit"); tb->alignItemRight (6); exitB = true; } diff --git a/tdeui/twindowinfo.cpp b/tdeui/twindowinfo.cpp index 41e5691ea..d687efaac 100644 --- a/tdeui/twindowinfo.cpp +++ b/tdeui/twindowinfo.cpp @@ -67,7 +67,7 @@ void KWindowInfo::message( const TQString &text, const TQPixmap &pix, int timeou if ( timeout < 0 ) timeout = DEFAULT_MESSAGE_TIMEOUT; if ( timeout != 0 ) - TQTimer::singleShot( timeout, this, TQT_SLOT( restore() ) ); + TQTimer::singleShot( timeout, this, TQ_SLOT( restore() ) ); } void KWindowInfo::permanent( const TQString &text ) diff --git a/tdeui/twindowlistmenu.cpp b/tdeui/twindowlistmenu.cpp index 8e07dde71..fee6c2c05 100644 --- a/tdeui/twindowlistmenu.cpp +++ b/tdeui/twindowlistmenu.cpp @@ -87,7 +87,7 @@ KWindowListMenu::KWindowListMenu(TQWidget *parent, const char *name) { twin_module = new KWinModule(this); - connect(this, TQT_SIGNAL(activated(int)), TQT_SLOT(slotExec(int))); + connect(this, TQ_SIGNAL(activated(int)), TQ_SLOT(slotExec(int))); } KWindowListMenu::~KWindowListMenu() @@ -127,9 +127,9 @@ void KWindowListMenu::init() map.clear(); int unclutter = insertItem( i18n("Unclutter Windows"), - this, TQT_SLOT( slotUnclutterWindows() ) ); + this, TQ_SLOT( slotUnclutterWindows() ) ); int cascade = insertItem( i18n("Cascade Windows"), - this, TQT_SLOT( slotCascadeWindows() ) ); + this, TQ_SLOT( slotCascadeWindows() ) ); // if we only have one desktop we won't be showing titles, so put a separator in if (nd == 1) diff --git a/tdeunittest/tester.cpp b/tdeunittest/tester.cpp index 11a24e653..d168280be 100644 --- a/tdeunittest/tester.cpp +++ b/tdeunittest/tester.cpp @@ -40,10 +40,10 @@ namespace KUnitTest void SlotTester::invokeMember(const TQString &str) { - TQString slotname = TQString::number(TQSLOT_CODE) + str; - connect(this, TQT_SIGNAL(invoke()), this, slotname.ascii()); + TQString slotname = TQString::number(TQ_SLOT_CODE) + str; + connect(this, TQ_SIGNAL(invoke()), this, slotname.ascii()); emit invoke(); - disconnect(this, TQT_SIGNAL(invoke()), this, slotname.ascii()); + disconnect(this, TQ_SIGNAL(invoke()), this, slotname.ascii()); } void SlotTester::allTests() diff --git a/tdeutils/kcmultidialog.cpp b/tdeutils/kcmultidialog.cpp index 73f6c471c..3d4fd5556 100644 --- a/tdeutils/kcmultidialog.cpp +++ b/tdeutils/kcmultidialog.cpp @@ -89,11 +89,11 @@ KCMultiDialog::KCMultiDialog( int dialogFace, const KGuiItem &user2, inline void KCMultiDialog::init() { - connect( this, TQT_SIGNAL( finished()), TQT_SLOT( dialogClosed())); + connect( this, TQ_SIGNAL( finished()), TQ_SLOT( dialogClosed())); showButton( User1, false ); showButton( User2, false ); enableButton(Apply, false); - connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), this, TQT_SLOT(slotAboutToShow(TQWidget *))); + connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), this, TQ_SLOT(slotAboutToShow(TQWidget *))); setInitialSize(TQSize(640,480)); moduleParentComponents.setAutoDelete( true ); @@ -310,7 +310,7 @@ void KCMultiDialog::addModule(const TDECModuleInfo& moduleinfo, moduleParentComponents.insert( module, new TQStringList( parentComponents ) ); - connect(module, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(clientChanged(bool))); + connect(module, TQ_SIGNAL(changed(bool)), this, TQ_SLOT(clientChanged(bool))); if( m_modules.count() == 0 ) aboutToShowPage( page ); @@ -378,15 +378,15 @@ void KCMultiDialog::slotAboutToShow(TQWidget *page) enableButton( KDialogBase::Default, d->currentModule->buttons() & TDECModule::Default ); - disconnect( this, TQT_SIGNAL(user2Clicked()), 0, 0 ); + disconnect( this, TQ_SIGNAL(user2Clicked()), 0, 0 ); if (d->currentModule->moduleInfo().needsRootPrivileges()) { if ( !d->currentModule->rootMode() ) { /* Enable the Admin Mode button */ enableButton( User2, true ); - connect( this, TQT_SIGNAL(user2Clicked()), d->currentModule, TQT_SLOT( runAsRoot() )); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT( disableRModeButton() )); + connect( this, TQ_SIGNAL(user2Clicked()), d->currentModule, TQ_SLOT( runAsRoot() )); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT( disableRModeButton() )); } else enableButton( User2, false); @@ -401,7 +401,7 @@ void KCMultiDialog::rootExit() void KCMultiDialog::disableRModeButton() { enableButton( User2, false ); - connect ( d->currentModule, TQT_SIGNAL( childClosed() ), TQT_SLOT( rootExit() )); + connect ( d->currentModule, TQ_SIGNAL( childClosed() ), TQ_SLOT( rootExit() )); } void KCMultiDialog::dialogClosed() diff --git a/tdeutils/kfind.cpp b/tdeutils/kfind.cpp index 74fb46e9a..f306fa254 100644 --- a/tdeutils/kfind.cpp +++ b/tdeutils/kfind.cpp @@ -212,8 +212,8 @@ KDialogBase* KFind::findNextDialog( bool create ) if ( !m_dialog && create ) { m_dialog = new KFindNextDialog( m_pattern, parentWidget() ); - connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotFindNext() ) ); - connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); + connect( m_dialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotFindNext() ) ); + connect( m_dialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) ); } return m_dialog; } diff --git a/tdeutils/kfind.h b/tdeutils/kfind.h index 11ce20d83..c71f2a41e 100644 --- a/tdeutils/kfind.h +++ b/tdeutils/kfind.h @@ -50,11 +50,11 @@ * * // Connect highlight signal to code which handles highlighting * // of found text. - * connect( m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - * this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); + * connect( m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + * this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); * // Connect findNext signal - called when pressing the button in the dialog - * connect( m_find, TQT_SIGNAL( findNext() ), - * this, TQT_SLOT( slotFindNext() ) ); + * connect( m_find, TQ_SIGNAL( findNext() ), + * this, TQ_SLOT( slotFindNext() ) ); * \endcode * * If you are using a non-modal find dialog (the recommended new way diff --git a/tdeutils/kfinddialog.cpp b/tdeutils/kfinddialog.cpp index 9162d0ffc..529043a16 100644 --- a/tdeutils/kfinddialog.cpp +++ b/tdeutils/kfinddialog.cpp @@ -193,13 +193,13 @@ void KFindDialog::init(bool forReplace, const TQStringList &findStrings, bool ha m_placeholders = 0L; // signals and slots connections - connect(m_selectedText, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSelectedTextToggled(bool))); - connect(m_regExp, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotRegexCheckBoxToggled(bool))); - connect(m_backRef, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotPlaceholdersCheckBoxToggled(bool))); - connect(m_regExpItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPatterns())); - connect(m_backRefItem, TQT_SIGNAL(clicked()), this, TQT_SLOT(showPlaceholders())); + connect(m_selectedText, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotSelectedTextToggled(bool))); + connect(m_regExp, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotRegexCheckBoxToggled(bool))); + connect(m_backRef, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotPlaceholdersCheckBoxToggled(bool))); + connect(m_regExpItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPatterns())); + connect(m_backRefItem, TQ_SIGNAL(clicked()), this, TQ_SLOT(showPlaceholders())); - connect(m_find, TQT_SIGNAL(textChanged ( const TQString & )),this, TQT_SLOT(textSearchChanged( const TQString & ))); + connect(m_find, TQ_SIGNAL(textChanged ( const TQString & )),this, TQ_SLOT(textSearchChanged( const TQString & ))); // tab order setTabOrder(m_find, m_regExp); @@ -508,7 +508,7 @@ void KFindDialog::showPlaceholders() if (!m_placeholders) { m_placeholders = new TQPopupMenu(this); - connect( m_placeholders, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPlaceholdersAboutToShow()) ); + connect( m_placeholders, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPlaceholdersAboutToShow()) ); } // Insert the selection into the edit control. diff --git a/tdeutils/kfinddialog.h b/tdeutils/kfinddialog.h index 0494f7861..35710d72d 100644 --- a/tdeutils/kfinddialog.h +++ b/tdeutils/kfinddialog.h @@ -62,7 +62,7 @@ class TQCheckBox; * else * { * m_findDia = new KFindDialog(false,...); - * connect( m_findDia, TQT_SIGNAL(okClicked()), this, TQT_SLOT(findTextNext()) ); + * connect( m_findDia, TQ_SIGNAL(okClicked()), this, TQ_SLOT(findTextNext()) ); * } * \endcode * Don't forget to delete and reset m_findDia when closed. diff --git a/tdeutils/kpluginselector.cpp b/tdeutils/kpluginselector.cpp index fe7bda75a..af771bd8f 100644 --- a/tdeutils/kpluginselector.cpp +++ b/tdeutils/kpluginselector.cpp @@ -184,14 +184,14 @@ void KPluginSelectionWidget::init( const TQValueList & plugininfos ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); TDEListView * listview = new TDEListView( this ); d->tooltip = new KPluginListViewToolTip( listview->viewport(), listview ); - connect( listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( listview, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( listview, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( pressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); listview->setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred ); listview->setAcceptDrops( false ); listview->setFullWidth( true ); @@ -256,7 +256,7 @@ TQWidget * KPluginSelectionWidget::insertKCM( TQWidget * parent, moduleinfo.service()->property( "X-TDE-ParentComponents" ).toStringList() ); d->moduleParentComponents.insert( module, parentComponents ); - connect( module, TQT_SIGNAL( changed( bool ) ), TQT_SLOT( clientChanged( bool ) ) ); + connect( module, TQ_SIGNAL( changed( bool ) ), TQ_SLOT( clientChanged( bool ) ) ); return module; } @@ -564,8 +564,8 @@ void KPluginSelector::checkNeedForTabWidget() "KPluginSelector TabWidget" ); w->reparent( d->tabwidget, TQPoint( 0, 0 ) ); d->tabwidget->addTab( w, w->catName() ); - connect( d->tabwidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), w, - TQT_SLOT( tabWidgetChanged( TQWidget * ) ) ); + connect( d->tabwidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), w, + TQ_SLOT( tabWidgetChanged( TQWidget * ) ) ); } } } @@ -605,16 +605,16 @@ void KPluginSelector::addPluginsInternal( const TQValueList plugin w = new KPluginSelectionWidget( plugininfos, this, d->tabwidget, catname, category, cfgGroup ); d->tabwidget->addTab( w, catname ); - connect( d->tabwidget, TQT_SIGNAL( currentChanged( TQWidget * ) ), w, - TQT_SLOT( tabWidgetChanged( TQWidget * ) ) ); + connect( d->tabwidget, TQ_SIGNAL( currentChanged( TQWidget * ) ), w, + TQ_SLOT( tabWidgetChanged( TQWidget * ) ) ); } else w = new KPluginSelectionWidget( plugininfos, this, d->frame, catname, category, cfgGroup ); w->setMinimumSize( 200, 200 ); - connect( w, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); - connect( w, TQT_SIGNAL( configCommitted( const TQCString & ) ), this, - TQT_SIGNAL( configCommitted( const TQCString & ) ) ); + connect( w, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); + connect( w, TQ_SIGNAL( configCommitted( const TQCString & ) ), this, + TQ_SIGNAL( configCommitted( const TQCString & ) ) ); d->pswidgets += w; } diff --git a/tdeutils/kreplace.cpp b/tdeutils/kreplace.cpp index 98e3ce93c..9540d2d7a 100644 --- a/tdeutils/kreplace.cpp +++ b/tdeutils/kreplace.cpp @@ -91,10 +91,10 @@ KReplaceNextDialog* KReplace::dialog() if ( !m_dialog ) { m_dialog = new KReplaceNextDialog( parentWidget() ); - connect( m_dialog, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( slotReplaceAll() ) ); - connect( m_dialog, TQT_SIGNAL( user2Clicked() ), this, TQT_SLOT( slotSkip() ) ); - connect( m_dialog, TQT_SIGNAL( user3Clicked() ), this, TQT_SLOT( slotReplace() ) ); - connect( m_dialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) ); + connect( m_dialog, TQ_SIGNAL( user1Clicked() ), this, TQ_SLOT( slotReplaceAll() ) ); + connect( m_dialog, TQ_SIGNAL( user2Clicked() ), this, TQ_SLOT( slotSkip() ) ); + connect( m_dialog, TQ_SIGNAL( user3Clicked() ), this, TQ_SLOT( slotReplace() ) ); + connect( m_dialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) ); } return static_cast(m_dialog); } diff --git a/tdeutils/kreplace.h b/tdeutils/kreplace.h index 2ecbd3990..f14887e25 100644 --- a/tdeutils/kreplace.h +++ b/tdeutils/kreplace.h @@ -50,14 +50,14 @@ class KReplaceNextDialog; * * // Connect signals to code which handles highlighting * // of found text, and on-the-fly replacement. - * connect( m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - * this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); + * connect( m_replace, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + * this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); * // Connect findNext signal - called when pressing the button in the dialog - * connect( m_replace, TQT_SIGNAL( findNext() ), - * this, TQT_SLOT( slotReplaceNext() ) ); + * connect( m_replace, TQ_SIGNAL( findNext() ), + * this, TQ_SLOT( slotReplaceNext() ) ); * // Connect replace signal - called when doing a replacement - * connect( m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ), - * this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) ); + * connect( m_replace, TQ_SIGNAL( replace(const TQString &, int, int, int) ), + * this, TQ_SLOT( slotReplace(const TQString &, int, int, int) ) ); * \endcode * Then initialize the variables determining the "current position" * (to the cursor, if the option FromCursor is set, diff --git a/tdeutils/ksettings/README.dox b/tdeutils/ksettings/README.dox index faedcd2d3..83a71767e 100644 --- a/tdeutils/ksettings/README.dox +++ b/tdeutils/ksettings/README.dox @@ -15,7 +15,7 @@ the following: create the 'Configure MyApp' StdAction like this: \code -KStdAction::preferences( this, SLOT( showConfigDialog() ), actionCollection ); +KStdAction::preferences( this, TQ_SLOT( showConfigDialog() ), actionCollection ); \endcode and the slot looks like this: diff --git a/tdeutils/ksettings/componentsdialog.cpp b/tdeutils/ksettings/componentsdialog.cpp index ad3fa81cc..164ea19a5 100644 --- a/tdeutils/ksettings/componentsdialog.cpp +++ b/tdeutils/ksettings/componentsdialog.cpp @@ -71,14 +71,14 @@ ComponentsDialog::ComponentsDialog( TQWidget * parent, const char * name ) d->listview->setSelectionModeExt( TDEListView::Single ); d->listview->setAllColumnsShowFocus( true ); - connect( d->listview, TQT_SIGNAL( pressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( d->listview, TQT_SIGNAL( spacePressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( d->listview, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); - connect( d->listview, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this, - TQT_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( pressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( spacePressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); + connect( d->listview, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), this, + TQ_SLOT( executed( TQListViewItem * ) ) ); } ComponentsDialog::~ComponentsDialog() diff --git a/tdeutils/ksettings/dialog.cpp b/tdeutils/ksettings/dialog.cpp index 83af48fcb..609d8cb16 100644 --- a/tdeutils/ksettings/dialog.cpp +++ b/tdeutils/ksettings/dialog.cpp @@ -588,14 +588,14 @@ void Dialog::createDialogFromServices() if( ! d->staticlistview ) d->dlg->addButtonBelowList( i18n( "Select Components..." ), this, - TQT_SLOT( configureTree() ) ); + TQ_SLOT( configureTree() ) ); - connect( d->dlg, TQT_SIGNAL( okClicked() ), Dispatcher::self(), - TQT_SLOT( syncConfiguration() ) ); - connect( d->dlg, TQT_SIGNAL( applyClicked() ), Dispatcher::self(), - TQT_SLOT( syncConfiguration() ) ); - connect( d->dlg, TQT_SIGNAL( configCommitted( const TQCString & ) ), - Dispatcher::self(), TQT_SLOT( reparseConfiguration( const TQCString & ) ) ); + connect( d->dlg, TQ_SIGNAL( okClicked() ), Dispatcher::self(), + TQ_SLOT( syncConfiguration() ) ); + connect( d->dlg, TQ_SIGNAL( applyClicked() ), Dispatcher::self(), + TQ_SLOT( syncConfiguration() ) ); + connect( d->dlg, TQ_SIGNAL( configCommitted( const TQCString & ) ), + Dispatcher::self(), TQ_SLOT( reparseConfiguration( const TQCString & ) ) ); d->pagetree.addToDialog( d->dlg ); @@ -609,13 +609,13 @@ void Dialog::configureTree() ComponentsDialog * subdlg = new ComponentsDialog( d->dlg ); subdlg->setPluginInfos( d->plugininfomap ); subdlg->show(); - connect( subdlg, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( updateTreeList() ) ); - connect( subdlg, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( updateTreeList() ) ); - connect( subdlg, TQT_SIGNAL( okClicked() ), this, - TQT_SIGNAL( pluginSelectionChanged() ) ); - connect( subdlg, TQT_SIGNAL( applyClicked() ), this, - TQT_SIGNAL( pluginSelectionChanged() ) ); - connect( subdlg, TQT_SIGNAL( finished() ), subdlg, TQT_SLOT( delayedDestruct() ) ); + connect( subdlg, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( updateTreeList() ) ); + connect( subdlg, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( updateTreeList() ) ); + connect( subdlg, TQ_SIGNAL( okClicked() ), this, + TQ_SIGNAL( pluginSelectionChanged() ) ); + connect( subdlg, TQ_SIGNAL( applyClicked() ), this, + TQ_SIGNAL( pluginSelectionChanged() ) ); + connect( subdlg, TQ_SIGNAL( finished() ), subdlg, TQ_SLOT( delayedDestruct() ) ); } void Dialog::updateTreeList() diff --git a/tdeutils/ksettings/dialog.h b/tdeutils/ksettings/dialog.h index 7f87b861b..619c05749 100644 --- a/tdeutils/ksettings/dialog.h +++ b/tdeutils/ksettings/dialog.h @@ -59,7 +59,7 @@ namespace KSettings * \endcode * and the action for the config dialog is connected to the show slot: * \code - * KStdAction::preferences( m_cfgdlg, TQT_SLOT( show() ), actionCollection() ); + * KStdAction::preferences( m_cfgdlg, TQ_SLOT( show() ), actionCollection() ); * \endcode * * If you need to be informed when the config was changed and applied in the diff --git a/tdeutils/ksettings/dispatcher.cpp b/tdeutils/ksettings/dispatcher.cpp index 6d87e4cde..5cd5a4208 100644 --- a/tdeutils/ksettings/dispatcher.cpp +++ b/tdeutils/ksettings/dispatcher.cpp @@ -80,7 +80,7 @@ void Dispatcher::registerInstance( TDEInstance * instance, TQObject * recv, cons sig->connect( recv, slot ); ++m_instanceInfo[ instanceName ].count; - connect( recv, TQT_SIGNAL( destroyed( TQObject * ) ), this, TQT_SLOT( unregisterInstance( TQObject * ) ) ); + connect( recv, TQ_SIGNAL( destroyed( TQObject * ) ), this, TQ_SLOT( unregisterInstance( TQObject * ) ) ); } TDEConfig * Dispatcher::configForInstanceName( const TQCString & instanceName ) diff --git a/tdeutils/ksettings/dispatcher.h b/tdeutils/ksettings/dispatcher.h index aa3b50c41..2cb0cdc2a 100644 --- a/tdeutils/ksettings/dispatcher.h +++ b/tdeutils/ksettings/dispatcher.h @@ -42,7 +42,7 @@ namespace KSettings * into the TDEConfigureDialog you need a way to get notified. This is what you * do: * \code - * Dispatcher::self()->registerInstance( instance(), this, TQT_SLOT( loadSettings() ) ); + * Dispatcher::self()->registerInstance( instance(), this, TQ_SLOT( loadSettings() ) ); * \endcode * * @author Matthias Kretz @@ -69,7 +69,7 @@ class TDEUTILS_EXPORT Dispatcher : public TQObject * * @param instance The TDEInstance object * @param recv The object that should receive the signal - * @param slot The slot to be called: TQT_SLOT( slotName() ) + * @param slot The slot to be called: TQ_SLOT( slotName() ) */ void registerInstance( TDEInstance * instance, TQObject * recv, const char * slot ); diff --git a/tdeutils/ksettings/pluginpage.cpp b/tdeutils/ksettings/pluginpage.cpp index ddb58fb03..39af821e7 100644 --- a/tdeutils/ksettings/pluginpage.cpp +++ b/tdeutils/ksettings/pluginpage.cpp @@ -43,7 +43,7 @@ class PluginPage::PluginPagePrivate { ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); d->selwid = new KPluginSelector( this ); - connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); + connect( d->selwid, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); } PluginPage::PluginPage( TDEInstance * instance, TQWidget * parent, const TQStringList & args ) @@ -52,9 +52,9 @@ class PluginPage::PluginPagePrivate { ( new TQVBoxLayout( this, 0, KDialog::spacingHint() ) )->setAutoAdd( true ); d->selwid = new KPluginSelector( this ); - connect( d->selwid, TQT_SIGNAL( changed( bool ) ), this, TQT_SIGNAL( changed( bool ) ) ); - connect( d->selwid, TQT_SIGNAL( configCommitted( const TQCString & ) ), - Dispatcher::self(), TQT_SLOT( reparseConfiguration( const TQCString & ) ) ); + connect( d->selwid, TQ_SIGNAL( changed( bool ) ), this, TQ_SIGNAL( changed( bool ) ) ); + connect( d->selwid, TQ_SIGNAL( configCommitted( const TQCString & ) ), + Dispatcher::self(), TQ_SLOT( reparseConfiguration( const TQCString & ) ) ); } PluginPage::~PluginPage() diff --git a/tdeutils/tdecmodulecontainer.cpp b/tdeutils/tdecmodulecontainer.cpp index 2df7a0421..7a0337615 100644 --- a/tdeutils/tdecmodulecontainer.cpp +++ b/tdeutils/tdecmodulecontainer.cpp @@ -91,7 +91,7 @@ void TDECModuleContainer::init() d->topLayout = new TQVBoxLayout( this, 0, KDialog::spacingHint(), "topLayout" ); d->tabWidget = new TQTabWidget(this, "tabWidget"); d->tabWidget->setMargin(KDialog::marginHint()); - connect( d->tabWidget, TQT_SIGNAL( currentChanged( TQWidget* ) ), TQT_SLOT( tabSwitched( TQWidget* ) )); + connect( d->tabWidget, TQ_SIGNAL( currentChanged( TQWidget* ) ), TQ_SLOT( tabSwitched( TQWidget* ) )); d->topLayout->addWidget( d->tabWidget ); if ( !d->modules.isEmpty() ) @@ -152,7 +152,7 @@ void TDECModuleContainer::addModule( const TQString& module ) d->tabWidget->setTabToolTip( proxy, proxy->moduleInfo().comment() ); - connect( proxy, TQT_SIGNAL(changed(TDECModuleProxy *)), TQT_SLOT(moduleChanged(TDECModuleProxy *))); + connect( proxy, TQ_SIGNAL(changed(TDECModuleProxy *)), TQ_SLOT(moduleChanged(TDECModuleProxy *))); /* Collect our buttons - we go for the common deliminator */ d->buttons = d->buttons | proxy->realModule()->buttons(); @@ -178,10 +178,10 @@ void TDECModuleContainer::tabSwitched( TQWidget * module ) if ( mod->moduleInfo().needsRootPrivileges() && !mod->rootMode() ) { d->btnRootMode->setEnabled( true ); - connect( d->btnRootMode, TQT_SIGNAL( clicked() ), - TQT_SLOT( runAsRoot() )); - connect( mod, TQT_SIGNAL( childClosed() ), - TQT_SLOT ( rootExited() )); + connect( d->btnRootMode, TQ_SIGNAL( clicked() ), + TQ_SLOT( runAsRoot() )); + connect( mod, TQ_SIGNAL( childClosed() ), + TQ_SLOT ( rootExited() )); } else { d->btnRootMode->setEnabled( false ); @@ -205,7 +205,7 @@ void TDECModuleContainer::runAsRoot() void TDECModuleContainer::rootExited() { - connect( d->btnRootMode, TQT_SIGNAL( clicked() ), TQT_SLOT( runAsRoot() )); + connect( d->btnRootMode, TQ_SIGNAL( clicked() ), TQ_SLOT( runAsRoot() )); d->btnRootMode->setEnabled( true ); } diff --git a/tdeutils/tdecmoduleproxy.cpp b/tdeutils/tdecmoduleproxy.cpp index c2c2ca372..b79e774cd 100644 --- a/tdeutils/tdecmoduleproxy.cpp +++ b/tdeutils/tdecmoduleproxy.cpp @@ -185,12 +185,12 @@ TDECModule * TDECModuleProxy::realModule() const d->kcm = TDECModuleLoader::loadModule( moduleInfo(), TDECModuleLoader::Inline, d->withFallback, that, name(), d->args ); - connect( d->kcm, TQT_SIGNAL( changed( bool ) ), - TQT_SLOT(moduleChanged(bool)) ); - connect( d->kcm, TQT_SIGNAL( destroyed() ), - TQT_SLOT( moduleDestroyed() ) ); - connect( d->kcm, TQT_SIGNAL(quickHelpChanged()), - TQT_SIGNAL(quickHelpChanged())); + connect( d->kcm, TQ_SIGNAL( changed( bool ) ), + TQ_SLOT(moduleChanged(bool)) ); + connect( d->kcm, TQ_SIGNAL( destroyed() ), + TQ_SLOT( moduleDestroyed() ) ); + connect( d->kcm, TQ_SIGNAL(quickHelpChanged()), + TQ_SIGNAL(quickHelpChanged())); TQWhatsThis::add( that, d->kcm->quickHelp() ); d->topLayout->addWidget( d->kcm ); @@ -234,8 +234,8 @@ TDECModule * TDECModuleProxy::realModule() const d->dcopClient->attach(); d->dcopClient->setNotifications( true ); - connect( d->dcopClient, TQT_SIGNAL( applicationRemoved( const TQCString& )), - TQT_SLOT( applicationRemoved( const TQCString& ))); + connect( d->dcopClient, TQ_SIGNAL( applicationRemoved( const TQCString& )), + TQ_SLOT( applicationRemoved( const TQCString& ))); /* Figure out the name of where the module is already loaded */ TQByteArray replyData, data; @@ -367,7 +367,7 @@ void TDECModuleProxy::runAsRoot() *d->rootProcess << TQString("%1 %2 --embed-proxy %3 --lang %4").arg(locate("exe", "tdecmshell")) .arg(cmd).arg(d->embedWidget->winId()).arg(TDEGlobal::locale()->language()); - connect(d->rootProcess, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(rootExited())); + connect(d->rootProcess, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(rootExited())); if ( !d->rootProcess->start( TDEProcess::NotifyOnExit )) { diff --git a/tdeutils/tdecmoduleproxyIfaceImpl.cpp b/tdeutils/tdecmoduleproxyIfaceImpl.cpp index 5b1bcc339..6e6f1b286 100644 --- a/tdeutils/tdecmoduleproxyIfaceImpl.cpp +++ b/tdeutils/tdecmoduleproxyIfaceImpl.cpp @@ -35,10 +35,10 @@ TDECModuleProxyIfaceImpl::TDECModuleProxyIfaceImpl( const TQCString& name, : DCOPObject( name ), TQObject( 0, name ), p( const_cast( client )) { - connect( p, TQT_SIGNAL( changed(bool)), - TQT_SLOT( changedRelay(bool))); - connect( p, TQT_SIGNAL( quickHelpChanged()), - TQT_SLOT( quickHelpRelay())); + connect( p, TQ_SIGNAL( changed(bool)), + TQ_SLOT( changedRelay(bool))); + connect( p, TQ_SIGNAL( quickHelpChanged()), + TQ_SLOT( quickHelpRelay())); } void TDECModuleProxyIfaceImpl::save() diff --git a/tdeutils/tdemultitabbar.cpp b/tdeutils/tdemultitabbar.cpp index 2661893d6..6ffb8e00a 100644 --- a/tdeutils/tdemultitabbar.cpp +++ b/tdeutils/tdemultitabbar.cpp @@ -394,7 +394,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, @@ -409,7 +409,7 @@ KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup, setFixedWidth(24); m_id=id; TQToolTip::add(this,text); - connect(this,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotClicked())); + connect(this,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotClicked())); } KMultiTabBarButton::~KMultiTabBarButton() { diff --git a/tdeutils/tests/kfindtest.cpp b/tdeutils/tests/kfindtest.cpp index c913e5ec6..6a724d6a3 100644 --- a/tdeutils/tests/kfindtest.cpp +++ b/tdeutils/tests/kfindtest.cpp @@ -59,10 +59,10 @@ void KFindTest::find(const TQString &pattern, long options) delete m_find; m_find = new KFind(pattern, options, 0); - connect(m_find, TQT_SIGNAL(highlight(const TQString &, int, int)), - TQT_SLOT(slotHighlight(const TQString &, int, int))); - connect(m_find, TQT_SIGNAL(highlight(int, int, int)), - TQT_SLOT(slotHighlight(int, int, int))); + connect(m_find, TQ_SIGNAL(highlight(const TQString &, int, int)), + TQ_SLOT(slotHighlight(const TQString &, int, int))); + connect(m_find, TQ_SIGNAL(highlight(int, int, int)), + TQ_SLOT(slotHighlight(int, int, int))); m_line = 0; KFind::Result result = KFind::NoMatch; diff --git a/tdeutils/tests/kreplacetest.cpp b/tdeutils/tests/kreplacetest.cpp index 19ead8e77..df21d0c81 100644 --- a/tdeutils/tests/kreplacetest.cpp +++ b/tdeutils/tests/kreplacetest.cpp @@ -38,14 +38,14 @@ void KReplaceTest::replace( const TQString &pattern, const TQString &replacement // Connect highlight signal to code which handles highlighting // of found text. - connect(m_replace, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( slotHighlight( const TQString &, int, int ) ) ); + connect(m_replace, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( slotHighlight( const TQString &, int, int ) ) ); // Connect findNext signal - called when pressing the button in the dialog - connect(m_replace, TQT_SIGNAL( findNext() ), - this, TQT_SLOT( slotReplaceNext() ) ); + connect(m_replace, TQ_SIGNAL( findNext() ), + this, TQ_SLOT( slotReplaceNext() ) ); // Connect replace signal - called when doing a replacement - connect(m_replace, TQT_SIGNAL( replace(const TQString &, int, int, int) ), - this, TQT_SLOT( slotReplace(const TQString &, int, int, int) ) ); + connect(m_replace, TQ_SIGNAL( replace(const TQString &, int, int, int) ), + this, TQ_SLOT( slotReplace(const TQString &, int, int, int) ) ); // Go to initial position if ( (options & KReplaceDialog::FromCursor) == 0 ) diff --git a/tdewallet/client/tdewallet.cpp b/tdewallet/client/tdewallet.cpp index 85205d7e3..9785472ed 100644 --- a/tdewallet/client/tdewallet.cpp +++ b/tdewallet/client/tdewallet.cpp @@ -79,9 +79,9 @@ Wallet::Wallet(int handle, const TQString& name) _dcopRef->dcopClient()->setNotifications(true); connect(_dcopRef->dcopClient(), - TQT_SIGNAL(applicationRemoved(const TQCString&)), + TQ_SIGNAL(applicationRemoved(const TQCString&)), this, - TQT_SLOT(slotAppUnregistered(const TQCString&))); + TQ_SLOT(slotAppUnregistered(const TQCString&))); connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "walletClosed(int)", "slotWalletClosed(int)", false); connectDCOPSignal(_dcopRef->app(), _dcopRef->obj(), "folderListUpdated(TQString)", "slotFolderListUpdated(TQString)", false); diff --git a/tdewallet/tests/tdewalletasync.cpp b/tdewallet/tests/tdewalletasync.cpp index 57571bebb..54e618b70 100644 --- a/tdewallet/tests/tdewalletasync.cpp +++ b/tdewallet/tests/tdewalletasync.cpp @@ -22,11 +22,11 @@ void openWallet() TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous ); WalletReceiver r; - r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) ); + r.connect( wallet, TQ_SIGNAL( walletOpened(bool) ), TQ_SLOT( walletOpened(bool) ) ); _out << "About to start 30 second event loop" << endl; - TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) ); + TQTimer::singleShot( 30000, tqApp, TQ_SLOT( quit() ) ); int ret = tqApp->exec(); if ( ret == 0 ) diff --git a/tdewallet/tests/tdewalletboth.cpp b/tdewallet/tests/tdewalletboth.cpp index cc2819e0b..bdfc73f8f 100644 --- a/tdewallet/tests/tdewalletboth.cpp +++ b/tdewallet/tests/tdewalletboth.cpp @@ -22,7 +22,7 @@ void openWallet() TDEWallet::Wallet *wallet = TDEWallet::Wallet::openWallet( TDEWallet::Wallet::NetworkWallet(), 0, TDEWallet::Wallet::Asynchronous ); WalletReceiver r; - r.connect( wallet, TQT_SIGNAL( walletOpened(bool) ), TQT_SLOT( walletOpened(bool) ) ); + r.connect( wallet, TQ_SIGNAL( walletOpened(bool) ), TQ_SLOT( walletOpened(bool) ) ); _out << "About to ask for wallet sync" << endl; @@ -31,7 +31,7 @@ void openWallet() _out << "Got sync wallet: " << (wallet != 0) << endl; _out << "About to start 30 second event loop" << endl; - TQTimer::singleShot( 30000, tqApp, TQT_SLOT( quit() ) ); + TQTimer::singleShot( 30000, tqApp, TQ_SLOT( quit() ) ); int ret = tqApp->exec(); -- cgit v1.2.1